Initial commit
Merge mywebapplication/develop into develop
Merge mywebapplication/master
Merge javamaster/develop
Merge javamaster/master

Conflicts:
	README.md