up
Merge branch 'master' of https://github.com/zhoukekestar/MobileLife

Conflicts:
	MobileLifeJava/target/m2e-wtp/web-resources/META-INF/maven/MobileLifeJava/MobileLifeJava/pom.properties