big RESET and fix
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	pom.xml
	template-web/src/main/webapp/WEB-INF/web.xml
	template-web/src/main/webapp/index.xhtml