controllerのラッパー追加
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	view/tmp/top.html