Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix
Sidebar: Added missing changelog entry for fix
Fixed some style, escaping & indentation problems
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix
Updated Aloha Editor Blocks Guide: fixed intro and naming
Merge pull request #891 from evo42/hotfix

Updated Aloha Editor Blocks Guide: fixed intro and naming
Merge branch 'commercial-hotfix-batu-fr1' of github.com:alohaeditor/Aloha-Editor into hotfix

Conflicts:
	CHANGELOG.md
Merge branch 'commercial-hotfix-batu-fr1' of github.com:alohaeditor/Aloha-Editor into hotfix
Merge branch 'commercial-hotfix-batu-fr1' of github.com:alohaeditor/Aloha-Editor into hotfix
Merge branch 'master' of github.com:alohaeditor/Aloha-Editor into hotfix
Prevent moving the selection into a hr by clicking on it in FF.
handling the up key as well as the down key in the first or last table cell will now lead to movingt to the position right before or after the table
handling the up key as well as the down key in the first or last table cell will now lead to movingt to the position right before or after the table
Merge branch 'commercial-hotfix' of github.com:cprerovsky/Aloha-Editor into commercial-hotfix

Conflicts:
	src/lib/aloha/markup.js
Prevent textcolor button from being overwritten

Amend previous fix for the same issue by adjusting the css.
Merge pull request #968 from maschonber/commercial-hotfix

Prevent textcolor button from being overwritten
last fixes for table cursor positioning
Merge branch 'commercial-hotfix' of github.com:alohaeditor/Aloha-Editor into commercial-hotfix
Merge branch 'commercial-hotfix' of github.com:alohaeditor/Aloha-Editor into commercial-hotfix

Conflicts:
	build/hotfix-changelog.md