test
Merge branch 'master' of
https://github.com/shanghaishule/wxshoppingmall.git

Conflicts:
	SRC/weTall/static/js/jQuery-shopping.js