競合するところがありそうなため。
Merge branch 'master' of https://github.com/erevista/manecom

Conflicts:
	manecom.com/app/Config/routes.php
	manecom.com/app/Controller/CompaniesController.php
	manecom.com/app/Model/Company.php
	manecom.com/app/View/Companies/index.ctp