trying to get email errors working
Merge branch 'master' of https://github.com/jaruesink/greek-app

Conflicts:
	controller.pyc
	js/main.js