тащем то
#CEXT 422
#CEXT 422
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-Emil' into v1.0-dev-foooon
#CEXT-377, поправил баг
#CEXT-377, добавил условие
#CEXT-377, поправил условие
#CEXT-443, BN__calendar
#CEXT-443, fixed styles
#CEXT-443, fixed styles
#CEXT-455, fixed styles
#CEXT-458, уменьшил padding
#CEXT-454
#CEXT-457 #fixed