Merge branch 'develop_1'

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

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

@@ -8,6 +8,8 @@ public class DemoApplication {
 
 	public static void main(String[] args) {
 		System.out.println("Start application developp_2");
+		System.out.println("Start application");
+		System.out.println("Start application 2");
 		SpringApplication.run(DemoApplication.class, args);
 	}
 

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

@@ -1,14 +0,0 @@
-package com.example.demo;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class DemoApplication {
-
-	public static void main(String[] args) {
-		System.out.println("Start application");
-		SpringApplication.run(DemoApplication.class, args);
-	}
-
-}

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

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