CF 対応。
Merge branch 'master' of https://github.com/yuanying/poilot

Conflicts:
	app.js