Updated scene
Merge branch 'dev' of github.com:fhacktory/Rendermen into dev