Constants updated
Game Control updated
Merge origin/master
Constants updated