update
Merge branch 'master' of github.com:mooing/wss

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.mooing.wss/wss/pom.properties
Merge branch 'master' of github.com:mooing/wss

Conflicts:
	target/classes/applicationContext.xml
	target/classes/com/mooing/wss/system/controller/SystemController.class
	target/classes/com/mooing/wss/system/service/UserService.class
	target/m2e-wtp/web-resources/META-INF/maven/com.mooing.wss/wss/pom.properties
	target/m2e-wtp/web-resources/META-INF/maven/com.mooing.wss/wss/pom.xml