#CEXT 320, троеточие вконце названия
Merge remote-tracking branch 'remotes/origin/v1.0-dev' into v1.0-dev-foooon

Conflicts:
	Simplanum Extension/js/settings.js
#CEXT-325 добавлен в загрузку