rjvbn
Merge branch 'develop' of https://github.com/VS-Studio3/dnkom into develop

Conflicts:
	templates/dnkom/css/style.css
	templates/dnkom/js/scripts.js
комит очень важен