App upgrade + mail html
Merge branch 'master' of https://github.com/SimonWimha/totemAppGeneral

Conflicts:
	app/controllers/Application.java
	app/views/index_screens/form_section.scala.html