upgrade: playframework version to 2.2.0
add: upgrade sbt-plugin 2.2.1 after playframework 2.2.0
Merge branch 'master' into play220

Conflicts:
	project/plugins.sbt