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
Fix table plugin losing the drag handle upon getContents() of the editable (e.g. in smart content change).
To fix this, the makeClean() method does not deactivate the tables in the given DOM structure any more, because this would unblockify the table in the editable.
Instead, aloha/ephemera is used to mark all DOM elements, classes and attributes that are added to the table for making it editable.
Merge branch 'commercial-hotfix' of github.com:alohaeditor/Aloha-Editor into commercial-hotfix
Fix several issues with the cite-plugin (handling blockquotes).
Pressing backspace in blockquotes will no longer wrap the blockquote into a div.
Pressing enter at the end of a blockquote multiple times will now create a new paragraph after the blockquote (similar to lists).
When blockquotes and quotes are nested the controls will now show the correct status.
Merge pull request #972 from npomaroli/commercial-hotfix

Fix table plugin losing the drag handle upon getContents() of the editable (e.g. in smart content change).
Merge pull request #973 from npomaroli/cite-plugin-54808

Fix several issues with the cite-plugin (blockquotes)
jslinted markup.js
Fix i18n of repository browser to use the language configured in Aloha.settings.locale
Fix jslint errors.
(cherry picked from commit aa70246c664f5a238cbd65ea074b48a490632b8a)
Make table cell selection more coherent

Browser selection will be set on contents of the anchor text of the virtual
table cell selection.