Moved DiagServer into nr::diag
DiagServer is now compatible with normal g++.
Merge branch 'brandon' into alex

Conflicts:
	diagserver.cpp