translation
Merge branch 'Develop' of https://github.com/azhangGuidance/magento into Develop

Conflicts:
	app/design/frontend/default/f001/locale/zh_CN/translate.csv