commit
Merge branch 'master' of https://github.com/passion1014/blueOneMall

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.blueone/mall/pom.properties