New play version
Merge branch 'master' of github.com:tuxBurner/play-jsannotations

Conflicts:
	build.sbt
Merge branch 'master' of github.com:tuxBurner/play-jsannotations
Now scala 2.11 compatible