nothing
Merge branch 'master' of https://github.com/T1m1/hello-play-java.git

Conflicts:
	app/assets/js/welcome.js