ssl redirect
debug messages added
forwarding disabled
ssl forwarding
ldap
Merge branch 'development'
recover with empty form
make things appear
markup repaired
fixed missing form
Merge branch 'development'

Conflicts:
	app/views/firstTimeInputStudents.scala.html
	app/views/firstTimeInputUser.scala.html
Exception caught