Fixes compilation error due to trailing comma in array literal
Merge branch 'hotfix' of ssh://github.com/alohaeditor/Aloha-Editor into hotfix
Refactors the dom-to-xhtml plugin documentation
Fixed a fix for IE7, where check for browser was wrong (fixes IE7 crash)
Fixed javascript errors on IE7 when adding block level elements that need an "end break" inserted into them (like when pressing Enter at the end of a paragraph several times)
Added changelog entries for fixes
Changed ae version within hotfix branch to 0.20.13-hotfix-SNAPSHOT
Changed release version to 0.20.13-SNAPSHOT
Fixed recalculation of modified range when cleanup operation is done, if more than two subsequent text nodes are merged.
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix
Fixed possible browser hang when using command 'inserthtml' to insert disallowed content into an editable span (e.g. a h1)
Fixed updating the range after handling special case in fixDisallowedAncestors
Merge branch 'hotfix' into dev

Conflicts:
	doc/guides/guides.yml
	doc/guides/output/advancedconfiguration.html
	doc/guides/output/api.html
	doc/guides/output/components.html
	doc/guides/output/componenttypes.html
	doc/guides/output/configure_aloha.html
	doc/guides/output/core.html
	doc/guides/output/credits.html
	doc/guides/output/develop_aloha.html
	doc/guides/output/documentation_guidelines.html
	doc/guides/output/example_aloha_php.html
	doc/guides/output/guide_editor.html
	doc/guides/output/index.html
	doc/guides/output/plugin_abbr.html
	doc/guides/output/plugin_align.html
	doc/guides/output/plugin_block.html
	doc/guides/output/plugin_browser.html
	doc/guides/output/plugin_characterpicker.html
	doc/guides/output/plugin_contenthandler.html
	doc/guides/output/plugin_dom_to_xhtml.html
	doc/guides/output/plugin_format.html
	doc/guides/output/plugin_formatlesspaste.html
	doc/guides/output/plugin_formatlesspaste_test.html
	doc/guides/output/plugin_horizontalruler.html
	doc/guides/output/plugin_image.html
	doc/guides/output/plugin_link.html
	doc/guides/output/plugin_list.html
	doc/guides/output/plugin_paste.html
	doc/guides/output/plugin_table.html
	doc/guides/output/plugin_toc.html
	doc/guides/output/plugin_undo.html
	doc/guides/output/plugin_zemanta.html
	doc/guides/output/plugins.html
	doc/guides/output/releasing.html
	doc/guides/output/repository.html
	doc/guides/output/require.html
	doc/guides/output/sidebar.html
	doc/guides/output/style_guide.html
	doc/guides/output/toolbar.html
	doc/guides/output/ui.html
	doc/guides/output/using_aloha.html
	doc/guides/output/using_commands.html
	doc/guides/output/writing_plugins.html
	doc/guides/source/plugin_abbr.textile
	doc/guides/source/plugin_align.textile
	doc/guides/source/plugin_characterpicker.textile
	doc/guides/source/plugin_contenthandler.textile
	doc/guides/source/plugin_dom_to_xhtml.textile
	doc/guides/source/plugin_format.textile
	doc/guides/source/plugin_image.textile
	doc/guides/source/plugin_link.textile
	doc/guides/source/plugin_list.textile
	doc/guides/source/plugin_table.textile
	doc/guides/source/plugins.textile
	pom.xml
	src/demo/boilerplate/index.html
tmp commit of hotfix-changelog for pull
tmp commit
Removes obsolete ui-browser
Removes obsolete ext-alohatreeloader
configs per editable
Merge remote-tracking branch 'evo42/hotfix' into hotfix-editablesconfig

Conflicts:
	build/hotfix-changelog.md
Made generic contenthandler more restrictive on spans, divs and font tags, which fixes problems when copy&pasting inside editable span tags