地図の挙動を修正
Merge branch 'master' into gh-pages

Conflicts:
	src/ts/controller/gourmap-controller.ts
	src/ts/factory.ts