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

Conflicts:
	.gitignore
	app/assets/js/main.js
	app/controllers/Application.java
	app/views/main.scala.html