Added JavaDoc and TODOs
Merge remote-tracking branch 'origin/gamelogic-sprint2' into gui-sprint2