Editor gets it's controller back.
Merge branch 'master' of https://github.com/voidcase/XL
Merge branch 'master' of https://github.com/voidcase/XL
Merge branch 'master' of https://github.com/voidcase/XL