Updated the makefile for Java

Now Java will explicitly compile on the Linux server. Doesn't work on
Unix, but I do not believe that is our fault.
got rid of compile warnings for GUIClient
Merge branch 'master' into GUIclient-sockets