mailer specs
Merge remote-tracking branch 'origin/Mail-Specs' into develop

Conflicts:
	spec/mailers/mailer_spec.rb