Merge pull request #69 from trypton/release/editor_v2

Merged editor_v1 into editor_v2
EDT-668 Add menu item to merge cells
Merge pull request #73 from trypton/edt-668_editor_v2

EDT-668 Add menu item to merge cells
Merge remote branch 'upstream/release/editor_v1' into release/editor_v2
Merge pull request #76 from trypton/release/editor_v2

Merged editor_v1 into editor_v2
enabled magic line
Merge remote branch 'upstream/release/editor_v2' into release/editor_v1
Merge pull request #80 from trypton/release/editor_v1

Merged editor_v2 into editor_v1