Merge pull request #1010 from jonboulle/1010_separate_ports

separate ports used for client/server communication
main: switch back to default ports
Merge pull request #1091 from jonboulle/993_default_port

main: switch back to default ports for now
main: listen for client requests on multiple sockets