Merge remote-tracking branch 'source/master'

Conflicts:
	framework/project/Build.scala
	framework/project/Dependencies.scala
Merge branch 'master' of github.com:ancientrock/playframework

Conflicts:
	framework/project/Build.scala
	framework/project/Dependencies.scala