fix locales
add margin to text
update rails version
fix bug
view of users admin
Merge branch 'feature/decriminate_admin_users' into develop

* feature/decriminate_admin_users:
  view of users admin
  fix bug
  update rails version
  add margin to text
  fix locales
Merge branch 'release/1.8.2'

* release/1.8.2:
  view of users admin
  fix bug
  update rails version
  add margin to text
  fix locales