Merged branch develop_1 with master; resolved conflicts for develop_1

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

@@ -7,6 +7,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class DemoApplication {
 
 	public static void main(String[] args) {
+		System.out.print("Start application");
+        System.out.print("Continue application");
 		System.out.println("Start application");
 		System.out.println("Proceed with application");
 		SpringApplication.run(DemoApplication.class, args);

src/main/java/controller/UserController.java

@@ -0,0 +1,4 @@
+package controller;
+
+public class UserController {
+}