Play 2.2.1 upgrade
Removing bak files
Merge branch '1' into develop