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 'hotfix' of github.com:alohaeditor/Aloha-Editor into commercial-release-jakarta-fr2