Merge branch 'master' of https://github.com/cosmocommerce/magento-chinese-edition
Merge branch 'master' of https://github.com/cosmocommerce/magento-chinese-edition