Merge branch 'hotfix-0.20.x' of git://github.com/alohaeditor/Aloha-Editor into mergehotfix
fixed sanitizing in IE7. we sanitize everything but ignore style attributes, because this leads to errors in IE7
Updated the changelog with the fixes/enhancements
Fixed two browser switches.
Merge branch 'hotfix-0.20.x' of github.com:alohaeditor/Aloha-Editor into hotfix-0.20.x
Updated artifact version
Fixes IE7 paragraph margin-top
Merge branch 'hotfix-0.20.x' of ssh://github.com/alohaeditor/Aloha-Editor into hotfix-0.20.x
added info about getContents contenthandler settings
added info about Aloha.settings.contentHandler.handler.generic.transformFormattings settings
removed demo/test.html -- was never planned to be a demo...
Merge branch 'mergehotfix' of git://github.com/csupnig/Aloha-Editor into hotfix-0.20.x

Conflicts:
	src/plugins/common/contenthandler/lib/sanitizecontenthandler.js
Makes build output smaller
Merge branch 'hotfix-0.21.x' of ssh://github.com/alohaeditor/Aloha-Editor into hotfix-0.21.x
Removes unused folder
Adds documentation for block-activate and block-deactivate
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev
Merge remote-tracking branch 'laktek/blocks-dragdrop' into dev-blocks-dragdrop

Conflicts:
	src/plugins/common/ui/lib/settings.js
Removing guards around console.log invocations since they are not needed.
Fixes markdown syntax in changelog