fixes
Merge remote-tracking branch 'remotes/origin/dev-lena-bn' into Emil-Dev-CS
#CEXT-134
 fixes
ver fixed
Merge remote-tracking branch 'remotes/origin/Emil-Dev-CS' into dev-lena-bn

Conflicts:
	Simplanum Extension/content/editor/editorView.js