Merge origin/master

Conflicts:
	src/main/webapp/META-INF/context.xml
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/index.xhtml