Rozas text fixes
Working on the problem with the user_permissions
User permission with migration file
Merge remote-tracking branch 'origin/user_permissions' into socialcoffee

* origin/user_permissions:
  User permission with migration file
  Working on the problem with the user_permissions
  Rozas text fixes