Merge pull request #81 from trypton/release/editor_v2

Merged editor_v1 into editor_v2
disabled magic line by default
Merge pull request #100 from trypton/release/editor_v2

disabled magic line by default
Merge pull request #99 from trypton/release/editor_v1

disabled magic line by default
EDT-668 Add menu item to merge cells
  * unmerge cell
Merge pull request #101 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

Conflicts:
	plugins/mindtouch/table/plugin.js
Merge pull request #102 from trypton/release/editor_v2

Merged editor_v1 into editor_v2