singularize EmailPreferences
Merge branch 'feature/activity-email' of https://github.com/loomio/loomio into feature/activity-email

Conflicts:
	app/models/user.rb