m
Merge branch 'master' of https://github.com/guodong/mallschool-web

Conflicts:
	static/js/tpl/sell.html