Merge branch 'master' into development

* master:
  updated "Offices"
  adding cool
more changes
Merge branch 'hotfix-006' into development

* hotfix-006:
  more changes
  adding cool
accept the conflict to master