Merge branch 'WIP_User_Management' of https://github.com/lichtsprung/lwm into WIP_User_Management

Conflicts:
	.gitignore
	app/controllers/Application.scala
	app/views/index.scala.html
	build.sbt
Merge branch 'WIP_User_Management' of https://github.com/AvramRobert/lwm into login

Conflicts:
	.gitignore
	app/views/index.scala.html
	build.sbt