Merge with develop_4

src/main/java/com/example/demo/DemoApplication.java

@@ -9,7 +9,11 @@ public class DemoApplication {
 	public static void main(String[] args) {
 		System.out.println("Start application");
 		System.out.println("Second line added");
+<<<<<<< HEAD
 		System.out.println("Hello world!");
+=======
+		System.out.println("Third line added");
+>>>>>>> develop_4
 		SpringApplication.run(DemoApplication.class, args);
 	}