Merged editor_v2 into editor_v1

- enabled magic line plugin
- merged editor_v2