Screwing around with Netbeans project files.
More screwing around with Netbeans project files.
Merge origin/master

Conflicts:
	nbproject/Makefile-Debug-MacOSX.mk
	nbproject/Makefile-impl.mk
	nbproject/Makefile-variables.mk
	nbproject/configurations.xml
	nbproject/project.xml
Changed std::exit(-1) to exit(-1) for compatibility with MinGW.