fixed journal and diary
++
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-dao/.classpath
	school-dao/.settings/org.eclipse.wst.common.component
	school-dao/src/main/java/school/dto/journal/StudentWithMarksDTO.java
	school-service/.classpath
	school-service/.settings/org.eclipse.wst.common.component
	school-service/src/main/java/school/service/implementation/DiaryServiceImpl.java
	school-service/src/main/java/school/service/implementation/JournalServiceImpl.java
	school-service/src/main/java/school/service/utils/JournalUtil.java
	school-web/.classpath
	school-web/src/main/java/school/controller/DiaryController.java
	school-web/src/main/java/school/controller/JournalController.java
	school-web/src/main/webapp/resources/css/journal.css
	school-web/src/main/webapp/resources/js/journal.js
	school-web/src/main/webapp/views/journal/journal.jsp
	school-web/src/main/webapp/views/tiles/header.jsp
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-dao/.classpath
	school-service/.classpath
	school-web/.classpath