update
update
Merge branch 'master' of https://github.com/Joyguo0/magento1810

Conflicts:
	skin/frontend/bootstrapped/default/css/mintai.css
Merge branch 'master' of https://github.com/Joyguo0/magento1810
6.6css修改