add company.location
Merge branch 'master' of github.com:ronnywang/sandbox