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

Conflicts:
	app/design/frontend/bootstrapped/default/template/page/html/header.phtml
样式修改及样式添加