nextlab
2
Merge remote-tracking branch 'origin/nextlab'

Conflicts:
	pom.xml
	src/test/resources/hibernate.cfg.xml
фывфыв