fixed cache conflict with edit mode -- edit mode scenes are moved into their own partial
Merge branch 'master' into release