Added game variable to getLocation view
Merge origin/master