fix accidental opportunity deletion
notifications
Merge branch 'master' into production

Conflicts:
	app/mailers/notifications.rb