adding server classes for network discovery and new user connections
Merge remote-tracking branch 'origin/master'