Lots of work done on server
Javadoc
Merge pull request #276 from HoltMaki/master

netplay