Merge remote-tracking branch 'origin/gui-sprint4' into gamelogic-sprint4
Merge remote-tracking branch 'origin/gamelogic-sprint4' into gui-sprint4