save
Merge branch 'feature/notifications' into new_staging

* feature/notifications:
  save
  save

Conflicts:
	app/mailers/event_notification_mailer.rb