правки
Merge branch 'develop' of https://github.com/VS-Studio3/printondemandsolution into develop

Conflicts:
	templates/printsolution/index.php