Merge origin/master

Conflicts:
	src/main/setup/glassfish-resources.xml
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/home.xhtml
	src/main/webapp/login.xhtml