Merge branch 'hotfix/fix_notifications_and_price_lists'

* hotfix/fix_notifications_and_price_lists:
  add user id for notifications
Merge branch 'release/1.1'

* release/1.1:
  make up for admin users
  fix users edit
  fix admin/users controller
  add users controller
  add admin/users
Merge branch 'release/1.1.1'

* release/1.1.1:
  add company to admin
  add company to user
locales
Merge branch 'hotfix/company_locales' into develop

* hotfix/company_locales:
  locales