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

Conflicts:
	Simplanum Extension/css/bossnoteStyles/bossnoteEditor.css
	Simplanum Extension/css/bossnoteStyles/bossnoteNotepad.css
	Simplanum Extension/js/c/editor.js
	Simplanum Extension/views/editor.html
Merge remote-tracking branch 'remotes/origin/Emil-Dev-CS' into dev-lena-bn
CEXT-108 #comment - fix
#CEXT-109 #comment Добавлены модули. некоторые исправления