Code cleanup
Merge branch 'V3.1' of https://github.com/maydesk/echo3.git into V3.1

Conflicts:
	src/server-java/webcontainer/nextapp/echo/webcontainer/WebContainerServlet.java