Merge branch 'develop_3'

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

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

@@ -12,6 +12,7 @@ public class DemoApplication {
 		SpringApplication.run(DemoApplication.class, args);
 		System.out.println("App running");
 		System.out.println("add message in master");
+		System.out.println("add message from develop_3 branch");
 		UserEntity.showUserEntityMessage();
 	}