#672
#674
Merge branch 'dev-master' into dev-dogovor
#700
#700
#700
#700
#700
#700
#745
#745
#745
#745
#745
#709
#709
dogovor
Merge branch 'dev-dogovor' into dev-master

Conflicts:
	web/templates/core/sd.js
security for dogovor