Adding on more location stuff
Merge branch 'master' of https://github.com/heierj/ChatterSpot
Merge branch 'master' of https://github.com/heierj/ChatterSpot