Merge only relevant changes from update branch

All changes from update have been compressed into a single commit.

Changes to .mat, .meta and .prefab have all been dropped.