2nd try
Merge branch '1.0.0' of https://github.com/gittest12/demo into 1.0.0

Conflicts:
	demo/src/main/java/demo/Application.java