Upgrade to play 2.2.0

This reverts commit 339c1fb8f01860fd9ffce936b4dcf5660ff46c2b.

Conflicts:
	app/controllers/Application.scala
	project/plugins.sbt