Проблемы в SCRUM. [#80169]
 Проблемы в SCRUM. [#80169]
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml