added a server dialog box
Merged conflicts with server.cpp