Moved to Play Security Authentication
Merge branch 'play_authenticated'

Conflicts:
	app/controllers/Users.scala
	app/models/user.scala