тащем то
#CEXT 422
#CEXT 422
Merge remote-tracking branch 'remotes/origin/v1.0-dev-foooon' into v1.0-dev-Emil
Merge remote-tracking branch 'origin/v1.0-dev-foooon' into v1.0-dev-foooon

Conflicts:
	Simplanum Extension/templates/tpls.js
fix
Merge remote-tracking branch 'remotes/origin/v1.0-dev-foooon' into v1.0-dev-Emil
Merge remote-tracking branch 'remotes/origin/v1.0-dev-Emil' into v1.0-dev-foooon
#CEXT-377, поправил баг