Merge remote-tracking branch 'origin/dev-alfia' into v1.0-dev-foooon

Conflicts:
	chromeExtension/templates/tpls.js
CEXT 749 #dnd on plus
fix замечания
Merge remote-tracking branch 'origin/v1.0-dev-foooon' into dev-alfia

Conflicts:
	chromeExtension/templates/tpls.js
CEXT-769 #Done! кастомный скролл в блокноте