Fixed the scene and changed settings to make it ready for building
Merge branch 'master' into Matt's_Branch