Merge Server/master

Conflicts:
	.gitignore
	nbproject/build-impl.xml
	nbproject/genfiles.properties