attribute 指定の bug fix
Merge branch 'master' of https://github.com/ryoogata/eccube

Conflicts:
	recipes/default.rb