Journal changes + ParentDao
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-dao/src/main/java/school/dao/ScheduleDao.java
	school-dao/src/main/java/school/dao/implementation/ScheduleDaoImpl.java
	school-dao/src/main/java/school/dto/JournalStudentDto.java
	school-dao/src/main/java/school/dto/JournalTeacherDto.java
	school-dao/src/main/java/school/model/Schedule.java
	school-service/src/main/java/school/service/JournalService.java
	school-service/src/main/java/school/service/implementation/JournalServiceImpl.java
	school-web/src/main/java/school/controller/JournalController.java
	school-web/src/main/webapp/resources/css/journal.css
	school-web/src/main/webapp/views/journal/journal.jsp
Merge branch 'master' of https://github.com/vsomov/SchoolPortal
Merge branch 'master' of https://github.com/vsomov/SchoolPortal
++