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
fixed coding style
EDT-663 Header tags are being added to normal text below the header
fixed code style
EDT-676 Table handlers overlap the editor
disabled magic line
Merge pull request #78 from trypton/edt-676

EDT-676 Table handlers overlap the editor
Merge pull request #79 from trypton/magic_line

disabled magic line
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
Merge pull request #77 from trypton/edt-663

EDT-663 Header tags are being added to normal text below the header
EDT-652 Changing from Pre-Format to None doesn't work w/ Syntax Highlighter
Merge pull request #82 from trypton/edt-652

EDT-652 Changing from Pre-Format to None doesn't work w/ Syntax Highlighter
Block default actions of undo/redo keystrokes only in wysiwyg mode.
Split equals to equalsContent and equalsSelection.