commit again
Revert "commit again"

This reverts commit 17898ff418b1de1fc7cdd613f2a7998cf8487e64.
Merge branch 'master' of https://github.com/morningintern/test_eccube

Conflicts:
	data/logs/admin.log