Merge remote-tracking branch 'remotes/origin/Dev-Lena' into Emil-Dev
fix
Merge remote-tracking branch 'remotes/origin/Dev-Lena' into Emil-Dev
fixes
Merge
Merge Emil-Dev with Dev-Lena
Merge remote-tracking branch 'remotes/origin/Dev-Lena' into Emil-Dev

Conflicts:
	Simplanum Extension/js/c/notepad.js
fixes
#CEXT-58 теперь првеью подгружаются в блокнот
#CEXT-50 comment - исправила ошибки
Merge remote-tracking branch 'remotes/origin/Emil-Dev' into Dev-Lena
#CEXT-50 comment - fix