fix some map bug
change service location
wrong
Merge branch 'master' of https://github.com/picnii/taicome

Conflicts:
	js/Controller.js
merge with n note