もろもろ
Merge branch 'master' of https://github.com/erevista/manecom

Conflicts:
	manecom.com/app/View/Elements/header.ctp