add company to user
add company to admin
Merge branch 'feature/add_company_to_users' into develop

* feature/add_company_to_users:
  add company to admin
  add company to user
Merge branch 'release/1.1.1'

* release/1.1.1:
  add company to admin
  add company to user