committing all changes from master to new GameLogic branch