Merge remote-tracking branch 'origin/dev' into huntercen

Conflicts:
	WebContent/WEB-INF/web.xml
erer
Merge remote-tracking branch 'origin/huntercen' into dev