change gmap.
Merge branch 'master' of https://github.com/kayhide/reatech

Conflicts:
	app/assets/javascripts/application.js