Editor updates.
Merge branch 'master' of github.com:Excel/PerkinitesArt