Merge project
 Changes to be committed:
	modified:   school-web/src/main/webapp/WEB-INF/tiles.xml
	modified:   school-web/src/main/webapp/views/layout.jsp
Merge branch 'master' of https://github.com/vsomov/SchoolPortal
Conflicts: school-web/src/main/webapp/WEB-INF/tiles.xml

Merge.
Added Courses in UI.
Changes to be committed:
	modified:   ext-resources/db_filling_up
	modified:   pom.xml
	modified:   school-dao/src/main/java/school/dao/ConversationDao.java
	modified:   school-dao/src/main/java/school/dao/implementation/ConversationDaoImpl.java
	modified:   school-dao/src/test/java/school/dao/implementation/ConversationDaoImplTest.java
	modified:   school-dao/src/test/java/school/dao/implementation/MessageDaoImplTest.java
	modified:   school-dao/src/test/resources/xml-data-sets/conversation.xml
	deleted:    school-dao/src/test/resources/xml-data-sets/message.xml
	new file:   school-model/src/main/java/school/dto/ConversationDto.java
	modified:   school-model/src/main/java/school/model/Conversation.java
	modified:   school-model/src/main/java/school/model/Course.java
	modified:   school-model/src/main/java/school/model/Message.java
	new file:   school-service/src/main/java/school/service/ConversationService.java
	new file:   school-service/src/main/java/school/service/CourseService.java
	new file:   school-service/src/main/java/school/service/implementation/ConversationServiceImpl.java
	new file:   school-service/src/main/java/school/service/implementation/CourseServiceImpl.java
	new file:   school-service/src/test/java/school/service/implementation/ConversationServiceImplTest.java
	modified:   school-service/src/test/java/school/service/implementation/StudentServiceImplTest.java
	new file:   school-web/src/main/java/school/controller/ConversationController.java
	new file:   school-web/src/main/java/school/controller/CourseController.java
	modified:   school-web/src/main/java/school/controller/StudentController.java
	modified:   school-web/src/main/webapp/WEB-INF/tiles.xml
	modified:   school-web/src/main/webapp/resources/css/main.css
	new file:   school-web/src/main/webapp/resources/css/messages.css
	new file:   school-web/src/main/webapp/resources/js/course.js
	new file:   school-web/src/main/webapp/views/courses/student.jsp
	modified:   school-web/src/main/webapp/views/layout.jsp
	new file:   school-web/src/main/webapp/views/messages/inbox.jsp
	new file:   school-web/src/main/webapp/views/messages/sent.jsp
	new file:   school-web/src/main/webapp/views/tiles/header.jsp
	modified:   school-web/src/main/webapp/views/tiles/sidebar.jsp