Tasks are sorted per Event not globally
Merge branch 'Axolotl' into A/feature/#52
Update E-Mail configuration for production environment
Merge branch 'Axolotl' into dev

Conflicts:
	config/environments/production.rb