fix user blocked emails
Merge branch 'master' into version_4_0

Conflicts:
	app/models/user_alert.rb