1
Merge branch 'master' of https://github.com/shenzhang/jettydemonew.git

Conflicts:
	src/main/java/com/ruite/jetty/JettyMain.java