update play framework 2.2.2

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#	modified:   app/views/index.scala.html
#	modified:   app/views/main.scala.html
#	modified:   app/views/pages/links.scala.html
#
Merge remote-tracking branch 'origin/master'