Email content editing
Merge branch 'staging' into mailer-edits
refactoring on controllers for restaurant and orders
Merge branch 'staging' of https://github.com/pzula/fourth_meal into refactors
Updates restaurant emails
Merge branch 'mailer-edits' into staging