ADD/EDIT: GameControl
ADD/EDIT: GameControl - createLocation
Merge origin/master
Merge origin/master