Chapter 2
Merge branch 'master' of https://github.com/sergei-doroshenko/rps.git

Conflicts:
	src/main/java/org/gstu/rps/controllers/JournalController.java
	src/main/java/org/gstu/rps/controllers/StudentController.java
	src/main/java/org/gstu/rps/data/GroupImplHiber.java
	src/main/java/org/gstu/rps/data/GroupStudyPlanItemImplHiber.java
	src/main/java/org/gstu/rps/data/StudentImplHiber.java
	src/main/java/org/gstu/rps/domain/DAO/GroupDAO.java
	src/main/java/org/gstu/rps/domain/DAO/GroupStudyPlanItemDAO.java
	src/main/java/org/gstu/rps/domain/DAO/StudentDAO.java
	src/main/java/org/gstu/rps/domain/Discipline.java
	src/main/java/org/gstu/rps/domain/Faculty.java
	src/main/java/org/gstu/rps/domain/Group.java
	src/main/java/org/gstu/rps/domain/GroupLesson.java
	src/main/java/org/gstu/rps/domain/GroupStudyPlanItem.java
	src/main/java/org/gstu/rps/domain/LessonType.java
	src/main/java/org/gstu/rps/domain/Student.java
	src/main/java/org/gstu/rps/domain/Topic.java
	src/main/resources/db/schema.sql
	src/main/webapp/WEB-INF/dispatcher-servlet.xml
	src/main/webapp/WEB-INF/jsp/journal.jsp