Commit Tests user_mailer  refs #303
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/models/auth_method.rb