Add mail delivery when making a reservation
Merge branch 'development'

Conflicts:
	app/controllers/reservations_controller.rb