java updates and 4 point game logic kaos added
Merge branch 'master' of https://github.com/Toerq/OSM-Project