Changed version name to: master-play-2.2.x-SNAPSHOT
Use Common.version value in dependencies
migrate testkit and scala sample
upgrade PGP plugin
Merge commit '9de98a22e76dcb78fd27cc04920e4ebbd535d9cf'

Conflicts:
	project/Common.scala
	samples/java/demo/javaDemo.sbt
	samples/scala/demo/scalaDemo.sbt
	securesocial.sbt