Merge origin/master

Conflicts:
	manager.cpp
	nbproject/Makefile-Debug.mk
	nbproject/Makefile-Release.mk
	nbproject/Makefile-impl.mk
	nbproject/Makefile-variables.mk
	nbproject/Package-Debug.bash
	nbproject/Package-Release.bash
	nbproject/private/private.xml