Merge remote-tracking branch 'tbibb/master'
Pushed more GameUI changes
test
test2
test3...
The Gem is now Hot -- login jokeyishness
Merge remote-tracking branch 'aroth4/master'