Updated for play 2.1.1
Upgraded plugin versions

updated sbt version to the new one so that the projects compile with play 2.2.3
Merge branch 'master' into zipversion