ok
ok
ok
ok
ok
ok
Merge remote-tracking branch 'origin/master_new'

Conflicts:

	weichg_cart/public/admin/view/javascript/jquery/ui/i18n/jquery.ui.datepicker-zh-CN.js
	weichg_cart/public/admin/view/template/catalog/product_list.tpl
Merge branch 'master' of https://github.com/weichg/weichg_cart

Conflicts:
	weichg_cart/public/admin/view/template/catalog/product_list.tpl