+
++
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-dao/src/test/java/school/dao/sessionfactory/implementation/ConversationDaoImplTest.java