First creation of SCENE_SIMPLE, tested and working
rename to SCENE_BUILD and performed some code cleanup
Merge remote-tracking branch 'origin/scene_simple' into running