Changes to be committed:
	modified:   school-service/src/main/java/school/service/implementation/UserServiceImpl.java
Merge branch 'master' of https://github.com/vsomov/SchoolPortal
Code for CodeRequest was refactored, Sequrity was enabled
Changes to be committed:
	modified:   school-dao/src/main/java/school/dao/JournalDao.java
	modified:   school-dao/src/main/java/school/dao/implementation/JournalDaoImpl.java
	deleted:    school-dao/src/main/java/school/dto/journal/JournalParentDTO.java
	deleted:    school-dao/src/main/java/school/dto/journal/JournalStudentDTO.java
	deleted:    school-dao/src/main/java/school/dto/journal/JournalStudentWithMarksDTO.java
	modified:   school-dao/src/main/java/school/dto/journal/JournalTeacherDTO.java
	new file:   school-dao/src/main/java/school/dto/journal/MarkDTO.java
	new file:   school-dao/src/main/java/school/dto/journal/StudentMarksDTO.java
	modified:   school-dao/src/main/java/school/model/Journal.java
	modified:   school-dao/src/main/java/school/model/Schedule.java
	modified:   school-dao/src/main/java/school/model/Student.java
	modified:   school-dao/src/main/java/school/model/User.java
	modified:   school-service/src/main/java/school/service/CourseRequestService.java
	modified:   school-service/src/main/java/school/service/CourseService.java
	new file:   school-service/src/main/java/school/service/DiaryService.java
	modified:   school-service/src/main/java/school/service/JournalService.java
	modified:   school-service/src/main/java/school/service/UserService.java
	modified:   school-service/src/main/java/school/service/implementation/CourseRequestServiceImpl.java
	modified:   school-service/src/main/java/school/service/implementation/CourseServiceImpl.java
	new file:   school-service/src/main/java/school/service/implementation/DiaryServiceImpl.java
	modified:   school-service/src/main/java/school/service/implementation/JournalServiceImpl.java
	modified:   school-service/src/main/java/school/service/implementation/UserServiceImpl.java
	modified:   school-service/src/main/java/school/service/utils/JournalUtil.java
	modified:   school-web/src/main/java/school/controller/CourseRequestController.java
	new file:   school-web/src/main/java/school/controller/DiaryController.java
	modified:   school-web/src/main/java/school/controller/JournalController.java
	modified:   school-web/src/main/webapp/WEB-INF/tiles.xml
	new file:   school-web/src/main/webapp/resources/css/diary.css
	modified:   school-web/src/main/webapp/resources/css/journal.css
	modified:   school-web/src/main/webapp/views/course-request/student.jsp
	new file:   school-web/src/main/webapp/views/journal/diary.jsp
	modified:   school-web/src/main/webapp/views/journal/journal.jsp
	modified:   school-web/src/main/webapp/views/tiles/sidebar.jsp