started netstatus refactoring
netstatus refactoring
finished up NetStatus refactoring
merging ServerDescriptor with demo/master; fixed merged conflicts