Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix
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
Add a new drag behavior for block elements

Avoid the problems with the sortable, and now you can drag and drop BlockElements between cells and li elements. You can share block elements between editables and arrange the block element before or after P element in every level of nest
Merge branch 'master' of github.com:alohaeditor/Aloha-Editor into hotfix
Have sanitize contenthandler user the passed editable
Disable hotkeys for disallowed formatting
Make it possible to configure toolbar to never float
Remove unused function handleHotkey
Don't reposition the toolbar if floating is disabled
Permit selection-changed event for editables in standalone Empty blocks
Add missing changelog entries
(headerids) Fixed generation of invalid HTML ID's
Introduce Aloha.Editable.registerEvents()
Update changelog