Lesson 18 more university
Merge branch 'branch1'

Conflicts:
	university/src/main/java/org/edu/gjj/dao/GroupDao.java
	university/src/main/java/org/edu/gjj/dao/GroupDaoImpl.java
	university/src/main/java/org/edu/gjj/dao/StudentDao.java
	university/src/main/java/org/edu/gjj/dao/StudentDaoImpl.java
	university/src/main/java/org/edu/gjj/model/Group.java
	university/src/test/java/org/edu/gjj/dao/GroupDaoImplTest.java
	university/src/test/resources/scripts/schema.sql