Syntax error
Production errors
Merge branch 'dev'
Mailer confirmation updates
Fine tuning vehicle emails
Merge branch 'master' of heroku.com:motor-car-export

Conflicts:
	app/views/layouts/application.html.erb