Json object and location
Merge branch 'master' of https://github.com/dgaddy/TIC