Merge: from merge_with_atlas - General improvements to editor workflow - Fixing outstanding bugs and TODOs - Updated all assets again to catch up with atlas work Tests: navigated through the store and inventory while taking memory snapshots