Important hotfix to make sure that emailService doesn't throw errors
when sending emails
Updated Version 3.2.015
Merge branch 'master' into develop

Conflicts:
	version.txt