Merge branch 'master' of https://github.com/porthis77/hzdemo-web

Conflicts:
	src/main/java/com/hzdemo/web/App.java