new editor work in progress
New Editor (probably still things to fix... i'm not that good)
Merge pull request #1820 from diegosarmentero/master

New Editor (probably still things to fix... i'm not that good)