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

Conflicts:

MobileLifeJava/target/m2e-wtp/web-resources/META-INF/maven/MobileLifeJav
a/MobileLifeJava/pom.properties