Minor Changes
Merge branch 'master' of https://github.com/kimini507/checkin-saster

Conflicts:
	js/maps.js