Merge pull request #512 from guardian/play-release

Upgrade to Play 2.1
Merge branch 'master' of github.com:guardian/frontend into play-release