Reset
Merge branch 'develop'

Conflicts:
	application/email_helpers.py
Merge tag 'merge_to_master' into develop

hotfix for merging with git flow
ah main ah