Merge branch 'release' of github.com:alohaeditor/Aloha-Editor

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/release-tangerang'

Conflicts:
	pom.xml
Merge branch 'release-tangerang' of github.com:alohaeditor/Aloha-Editor

Conflicts:
	pom.xml
Merge branch 'release-tangerang' of github.com:alohaeditor/Aloha-Editor

Conflicts:
	pom.xml
Merge branch 'master' of github.com:alohaeditor/Aloha-Editor

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/release'

Conflicts:
	pom.xml
Merge branch 'release' of github.com:alohaeditor/Aloha-Editor
Removed links to non-existing plugin documentation; added links to source code
Sanitizes headerid names with a pre-defined set of characters
replacements.
Improve feature description in changelog
Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into dev

Conflicts:
	doc/guides/source/plugins.textile