Merge branch 'master' of http://gitlab.lan.arta.kz/Bazarbay/templateservice...

Merge branch 'master' of http://gitlab.lan.arta.kz/Bazarbay/templateservice into b.tulenov/add_consumer

 Conflicts:
	src/main/java/kz/project/printedFormsService/controller/DocumentsController.java
	src/main/java/kz/project/printedFormsService/service/impl/TemplateServiceImpl.java
	src/main/resources/application.yml