css调整
Merge branch 'master' of github.com:chenlihua/magento1810

Conflicts:
	app/design/frontend/bootstrapped/default/template/page/html/head.phtml