location list, a few tweaks to labels.
Merge branch 'master' of https://github.com/fatoki09/FusionTable-Map-Template-Heroku

Conflicts:
	views/index.haml