Fixed ServerProxy and ServerProxy tests.
Merge branch 'master' of https://github.com/255/catan