Merge origin/master

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