Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	web/index.xhtml