merge
Merge branch 'master' of git@github.com:teamyamaki/latmeter.git

Conflicts:
	models/geoLocation.js
	models/taxi.js