Merge branch 'master' of ssh://git@github.com/y3shop/jmall.git

Conflicts:
	jmall-common/pom.xml
	jmall-web/pom.xml