update:confict
11111
Merge branch 'master' of github.com:YuanZhencai/example

Conflicts:
	pom.xml
	src/main/java/com/wcs/compress/util/CompressUtil.java
	src/main/webapp/template/template.xhtml