Upgrade to Play 2.2.0.
Merge branch 'master' into play2.2

Conflicts:
	admin/app/controllers/SwitchboardController.scala
Merge pull request #1749 from guardian/play2.2

Upgrade to Play 2.2.0.