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
Fix cell merging to not result unneeded white spaces
Fix the loss of U-tags, when these are allowed.
Added an enhancement in transformFormattings
[maven-release-plugin] prepare for next development iteration
Fix issue with empty tabs contents on toolbar

The algorithm must be enhanced, search for buttons
except with class aloha-multisplit-toggle, more info
on the code
Avoid the duplicates id in extra/headerids
Merge pull request #926 from danyg/Branch_commercial-hotfix-empty-cells

Fix issue with empty tabs contents on toolbar
Remove trailing whitespaces in code introduced from pull request
Merge remote-tracking branch 'daniel/commercial-hotfix-batu-fr1' into commercial-hotfix-batu-fr1

Conflicts:
	build/hotfix-changelog.md
Separate the whitespace from ZERO_WIDTH_CHARACTERS in trimWhitespaceCharacters