as
Merge branch 'clw' of https://github.com/thrblock/wdtp into clw

Conflicts:
	GYUploadDemo/src/main/java/cn/gyyx/wdtp/HomeController.java
	GYUploadDemo/target/m2e-wtp/web-resources/META-INF/maven/cn.gyyx/wd/pom.properties
 s