Merge from develop - mainly big refact "GameLogic instead of Controller"