Added some JavaDoc and did some optimization
Merge remote-tracking branch 'origin/gui-sprint3' into gamelogic-sprint3
Merge remote-tracking branch 'origin/gamelogic-sprint3' into gui-sprint3