Fix resize check and reset in image plugin
Fix resetting images and enhance cropping

Conflicts:
	build/hotfix-changelog.md
Merge pull request #989 from maschonber/hotfix-reset-resize

A number of fixes affecting image resizing/cropping/resetting
Table headers resizable
Table Draggable

Table Draggable

Table Draggable
Table Draggable
Table Draggable
Table colspan/rowspan for IE9
Merge/Split button didn't disabled properly

Merge/Split button didn't disabled properly
Table span ie7
Table colSpan/rowSpan IE7 problem
Merge pull request #1008 from najor/hotfix-merge-split-enable-ie9

Merge/Split button didn't disabled properly
Merge pull request #1007 from najor/hotfix-table-colspan-ie9

Hotfix table colspan ie9
Merge pull request #1006 from najor/hotfix-table-draggable-fixes

Table Draggable
Merge pull request #1003 from najor/hotfix-table-headers-rt54442

Hotfix table headers rt54442
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into release

Conflicts:
	build/hotfix-changelog.md
Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into release-tangerang

Conflicts:
	CHANGELOG.md
	src/plugins/common/block/lib/blockmanager.js