jar
Merge remote-tracking branch 'origin/master' into brach

Conflicts:
	Test2/WebContent/WEB-INF/web.xml