commit some files
Merge branch 'master' of https://github.com/mikeblum/villagePulseWeb

Conflicts:
	app/index.html
	app/scripts/views/map.js