Cleaned up Java Server code, put in comments etc
Android client updates