Added secondary render option
removed garbage
Fixed build, the render changes will come on merge with editor
Merge remote-tracking branch 'upstream/develop' into develop