Merge pull request #70 from trypton/release/editor_v1

Merged editor_v2 into editor_v1
EDT-668 Add menu item to merge cells
Revert "EDT-668 Add menu item to merge cells"

This reverts commit 946481f3f1005b46e9bb5e56a879168b3031dda4.
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