Merge origin/master

Conflicts:
	HelloWebJSPMaven/src/main/webapp/META-INF/context.xml
Merge origin/master

Conflicts:
	HelloWebJSPMaven/src/main/webapp/META-INF/context.xml
Merge origin/master