Update to 2.3(M1) and fix compilation errors. Tests still failing
Change SimpleResult => Result as per deprecation warnings
More deprecation fixes
Update play 2 auth to test version
Start of 2.3-RC1 support. Doesn't fully compile yet.
Caching fixes and template renaming to avoid bizarre SBT error
Merge master and update asset paths so they can at least be found.

Lots of work still to do on asset optimisation.

Conflicts:
	modules/core/app/controllers/core/PersonaLoginHandler.scala
	modules/core/app/controllers/core/auth/openid/OpenIDLoginHandler.scala
Fix various deprecation warnings, set scalaVersion to 2.11
Some deps aren't ready for 2.11 yet
Stick code in place for using newer server runner, not working yet
Merge branch 'master' into play-2.3rc1

Conflicts:
	modules/core/app/backend/rest/gremlin/GremlinDAO.scala
	modules/core/app/controllers/generic/Read.scala
	project/Build.scala
	project/plugins.sbt
Merge branch 'master' into play-2.3rc1
Tweaks to avoid compile and/or staging errors
Tweak play2-auth version
Closer to a working stage. RJS still not active
Merge branch 'master' into play-2.3rc1

Conflicts:
	project/Build.scala
Delete dup main.js
Update to RC2
Add a placeholder RJS file
Merge branch 'master' into play-2.3rc2

Conflicts:
	modules/linking/app/controllers/generic/Linking.scala
	modules/portal/app/views/p/layout/portalLayout.scala.html
	project/Build.scala