ver
Merge branch 'master' of https://github.com/yaroslav-gorbenko/labs

Conflicts:
	pom.xml
1
Merge branch 'master' of https://github.com/yaroslav-gorbenko/labs
Merge remote-tracking branch 'origin/master' into НьюПрожект

Conflicts:
	BackBone/pom.xml
фывфыв