Location should display cityname
Merge pull request #331 from cchan5/master

Location should display cityname
Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev