Adding my scene loading work.
Fixed merge conflict and fixed the camera script.
Merge remote-tracking branch 'origin/development' into development