commit from a
Merge branch 'master' of https://github.com/tautera/demo.git

Conflicts:
	src/main/java/demo/Application.java
bug fix
Merge remote-tracking branch 'origin/master' into version2