Corrected server port
Merge branch 'master' into new-menus