Fixes occasional issue with admin mailer where the fixture was not able to be found
Merge branch 'Database-cleaner' into make-all-tests-green

Conflicts:
	spec/mailers/admin_mailer_spec.rb