Manual merge

manually merging editor and master