Коммит
Merge branch 'develop' of https://github.com/VS-Studio3/build into develop

Conflicts:
	templates/krovlya/css/style.css
Merge branch 'develop' of https://github.com/VS-Studio3/build into develop

Conflicts:
	templates/krovlya/js/custom.js