Merge pull request #41 from chenlihua/master

css调整
update ico
Merge pull request #42 from chenlihua/master

css调整
Merge branch 'master' of https://github.com/Joyguo0/magento1810
update
update
update
update
Merge pull request #43 from chenlihua/master

css修改
Merge pull request #44 from chenlihua/master

6.11 css及js调整
update
Merge branch 'master' of https://github.com/Joyguo0/magento1810
update
Merge branch 'master' of github.com:chenlihua/magento1810

Conflicts:
	app/design/frontend/bootstrapped/default/template/page/html/head.phtml
css与后台Html的修改