Merge pull request #81 from trypton/release/editor_v2

Merged editor_v1 into editor_v2
disabled magic line by default