working on getting mandrill working
Merge branch 'master' of https://github.com/jaruesink/greek-app

Conflicts:
	Static/uploadprofilepicture.html