Disable mail delivery errors
Update E-Mail configuration for production environment
Merge branch 'Axolotl' into dev

Conflicts:
	config/environments/production.rb