Placate jslint
Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into hotfix

Conflicts:
	src/lib/util/dom.js
	src/lib/util/range.js
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix-tangerang