Merge remote-tracking branch 'remotes/origin/Emil-Dev-CS' into dev-lena-bn

Conflicts:
	Simplanum Extension/content/editor/editorView.js
merged with dev-lena
#CEXT-101 #comment -
#CEXT-101 #comment -
#CEXT-144 #comment - сверстала окно просмотра вложения
#CEXT-144 #comment - сверстала окно просмотра вложения
Merge remote-tracking branch 'remotes/origin/dev-lena-bn' into Emil-Dev-CS
#CEXT-135 fix sync