GSoC disney editor

My merge tool (meld) acted really strange on this files.