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

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.mooing.wss/wss/pom.properties