setting up of play 2.2.1
Merge branch 'master' into play2.2.1
Migration to Play 2.2.1