Merge branch 'develop_1'

# Conflicts:
#	src/main/java/com/example/demo/DemoApplication.java

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

@@ -8,7 +8,7 @@ public class DemoApplication {
 	
 	public static void main(String[] args) {
 		System.out.println("Start application");
-		System.out.println("Another comment");
+		System.out.println("The second comment");
 		SpringApplication.run(DemoApplication.class, args);
 	}
 

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

@@ -0,0 +1,4 @@
+package com.example.demo;
+
+public class User {
+}

src/main/java/com/example/demo/controller/UserController.java

@@ -0,0 +1,4 @@
+package com.example.demo.controller;
+
+public class UserController {
+}