Added command line argument to change server port.
Merge branch 'master' into redesign-stream
Shit happened to Server :(