email conf
Merge branch 'Paseo' of https://github.com/SimonWimha/totemAppWimha into Paseo

Conflicts:
	app/controllers/Application.java