upgrading to play 2.3-M1
Using custom version of SecureSocial for Play 2.3-M1
fixed typo
source compiles now
Merge branch 'master' into play_2.3

Conflicts:
	.dir-locals.el
	.projectile
	app/org/biobank/controllers/WebComponent.scala
	conf/reference.conf
	project/Build.scala
	project/plugins.sbt
	test/org/biobank/fixture/StudyQueryFixture.scala
	test/org/biobank/fixture/TestFixture.scala
	test/org/biobank/query/StudyQuerySpec.scala
	test/org/biobank/service/StudyServiceSpec.scala
removed bootstrap, it is a plugin now
fix for initialization
web app works now using play 2.3-M1
web app works again, tests don't