Merge branch 'feature/gamecontroller'