Course Request Page functionality added
 Changes to be committed:
	modified:   school-dao/src/main/java/school/dao/CourseDao.java
	modified:   school-dao/src/main/java/school/dao/implementation/CourseDaoImpl.java
	modified:   school-dao/src/main/java/school/model/Course.java
	modified:   school-dao/src/main/java/school/model/CourseRequest.java
	modified:   school-service/pom.xml
	modified:   school-service/src/main/java/school/service/CourseRequestService.java
	modified:   school-service/src/main/java/school/service/CourseService.java
	modified:   school-service/src/main/java/school/service/implementation/CourseRequestServiceImpl.java
	modified:   school-service/src/main/java/school/service/implementation/CourseServiceImpl.java
	modified:   school-service/src/test/java/school/service/implementation/CourseServiceImplTest.java
	modified:   school-web/src/main/java/school/controller/CourseRequestController.java
	new file:   school-web/src/main/webapp/resources/css/bootstrap-select.min.css
	modified:   school-web/src/main/webapp/resources/css/course.css
	new file:   school-web/src/main/webapp/resources/js/bootstrap-select.min.js
	modified:   school-web/src/main/webapp/views/course-request/student.jsp
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-dao/src/main/java/school/model/Course.java
	school-service/src/main/java/school/service/CourseService.java

 All conflicts fixed but you are still merging.
 Changes to be committed:
	deleted:    ext-resources/db_filling_up
	new file:   ext-resources/db_filling_up.sql
	modified:   school-dao/pom.xml
	new file:   school-dao/src/main/java/school/dto/JournalStudentDto.java
	new file:   school-dao/src/main/java/school/dto/JournalTeacherDto.java
	modified:   school-dao/src/main/java/school/model/Course.java
	modified:   school-dao/src/main/java/school/model/Group.java
	modified:   school-dao/src/main/java/school/model/Role.java
	modified:   school-dao/src/main/java/school/model/User.java
	modified:   school-dao/src/test/java/school/dao/implementation/RoleRequestDaoImplTest.java
	modified:   school-dao/src/test/java/school/dao/implementation/ScheduleDaoImplTest.java
	modified:   school-dao/src/test/java/school/dao/implementation/UserDaoImplTest.java
	modified:   school-service/pom.xml
	modified:   school-service/src/main/java/school/service/CourseService.java
	new file:   school-service/src/main/java/school/service/EmailService.java
	modified:   school-service/src/main/java/school/service/GroupService.java
	modified:   school-service/src/main/java/school/service/JournalService.java
	new file:   school-service/src/main/java/school/service/implementation/EmailServiceImpl.java
	modified:   school-service/src/main/java/school/service/implementation/JournalServiceImpl.java
	modified:   school-service/src/main/java/school/service/implementation/UserDetailsServiceImpl.java
	new file:   school-service/src/test/java/school/service/implementation/EmailServiceImplTest.java
	modified:   school-web/src/main/java/school/controller/HomeController.java
	modified:   school-web/src/main/java/school/controller/JournalController.java
	modified:   school-web/src/main/resources/messages_en.properties
	modified:   school-web/src/main/resources/messages_ru.properties
	modified:   school-web/src/main/resources/messages_ua.properties
	modified:   school-web/src/main/webapp/WEB-INF/tiles.xml
	new file:   school-web/src/main/webapp/resources/css/journal.css
	new file:   school-web/src/main/webapp/resources/img/school.jpg
	new file:   school-web/src/main/webapp/resources/img/school_home.jpg
	new file:   school-web/src/main/webapp/resources/js/journal.js
	modified:   school-web/src/main/webapp/views/journal/journal.jsp