update

Conflicts:

	StandardWebAppByServlet/build/app-to-deploy/META-INF/application.xml
	StandardWebAppByServlet/build/app-to-deploy/StandardWebApp/WEB-INF/web.xml
	StandardWebAppByServlet/build/build.properties