WIP: Partial migration of test-app to Play 2.2.
Merge pull request #121 from smola/2_2-WIP

WIP: Partial migration of test-app to Play 2.2.