new scene setup compelted
Merge branch 'master' into johannes