updates
Merge remote-tracking branch 'nlay/master'
Merge branch 'master' of git@github.com:tbibb/HeatGem.git
stuff
Merge remote-tracking branch 'tbibb/master'
Pushed more GameUI changes