merge
Merge fixes
Work in progress on Scene, GameObject and Components.