week end commit
Merge branch 'master' of https://github.com/liuhann/slidecm

Conflicts:
	qianggou.main/src/com/ever365/qiang/SellerService.java