Committing Sam's work with other graphics stuff

Fixed the merge into Master/Rollback
Merge branch 'PlayerRender' into Graphics