case wimha down
Merge branch 'master' of https://github.com/SimonWimha/totemAppGeneral

Conflicts:
	app/views/resend_mail.scala.html