GSoC disney editor

From there on it appears you are reverting Esteban's and my latest changes. Maybe you haven't pulled them before doing the PR?