Update to Play 2.1.0
Merge branch 'master' of github.com:leon/play-salat.g8

Conflicts:
	src/main/g8/$application_name$/project/build.properties
	src/main/g8/default.properties