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

Conflicts:
	app/controllers/Application.java
minor change, json parser needs to be implemented