Add framework.
Up
Merge branch 'master' of https://github.com/zhoukekestar/MobileLife

Conflicts:
	MobileLifeJava/.classpath
	MobileLifeJava/.settings/org.eclipse.wst.common.component
	MobileLifeJava/resources/log4j.properties
	MobileLifeJava/server/com/zkk/mobile/server/config/ServerConfig.java
	MobileLifeJava/target/m2e-wtp/web-resources/META-INF/maven/MobileLifeJava/MobileLifeJava/pom.properties
	MobileLifeJava/web/com/zkk/mobile/model/BaseCtrl.java
	MobileLifeJava/web/com/zkk/mobile/model/BaseMap.java
	MobileLifeJava/web/com/zkk/mobile/model/LedCtrl.java
	MobileLifeJava/web/com/zkk/mobile/model/PmwCtrl.java
	MobileLifeJava/web/com/zkk/mobile/servlet/Info.java