java updates
Merge branch 'master' of github.com:futjikato/HAW-VS-TDMA