comit
Merge branch 'master' of https://github.com/hjra/may5.git

Conflicts:
	CShop/target/m2e-wtp/web-resources/META-INF/maven/net.may5/CShop/pom.properties