factory
Merge branch 'master' into gh-pages

Conflicts:
	src/ts/app.ts
	src/ts/controller/gourmap-controller.ts
	src/ts/service/api.ts