finishing up gamescreen/gamerenderer
Merge remote-tracking branch 'origin/master' into devjason