Merge branch 'hotfix/fix_notifications_and_price_lists' into develop

* hotfix/fix_notifications_and_price_lists:
  add user id for notifications
add admin/users
add users controller
fix admin/users controller
fix users edit
make up for admin users
Merge branch 'feature/users_to_admin' into develop

* feature/users_to_admin:
  make up for admin users
  fix users edit
  fix admin/users controller
  add users controller
  add admin/users
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