fixed something dan said to fix and the editor
Merge branch 'master' into render_status
Merge pull request #168 from dbcfoxes2014/render_status

Render status