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

Conflicts:
	app/design/frontend/bootstrapped/default/template/page/html/header.phtml
样式修改及样式添加
Merge branch 'master' of https://github.com/Joyguo0/magento1810
样式修改及代码修改
Merge pull request #39 from chenlihua/master

	样式修改及代码修改