more commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/java/com/hzdemo/web/App.java
more commit