Merge branch 'hotfix/confirmation-emails'
Merge branch 'refs/heads/develop'
Merge branch 'release/v1.1.3'
Merge remote-tracking branch 'origin/develop'
Merge branch 'release/v1.1.4'

Conflicts:
	VERSION
Merge branch 'refs/heads/develop'
Merge branch 'release/v1.1.5'

Conflicts:
	VERSION
Hotfix for event updates
Merge branch 'hotfix/event-update' into develop
Version 1.2, not 1.1.5
Merge branch 'release/v1.2' into develop