added email field into profile/edit [12363818]
now we are using policies, so we don't need anymore to use attr_accessible [12363818]
moved all activerecord locales to a single file
Merge pull request #671 from devton/channel_email_field

Added email field into channels profile/edit and removed attr_accessible from channels
Merge pull request #672 from diogob/refactor_activerecord_locales

moved all activerecord locales to a single file
moved bad_browser locales to separate file
solved conflict