sorting locations by state and city
sorting locations by state and city
Merge branch 'master' into gh-pages