Sallary added
 Changes to be committed:
	modified:   school-dao/src/main/java/school/dao/RoomDao.java
	modified:   school-dao/src/main/java/school/dao/SalaryDao.java
	new file:   school-dao/src/main/java/school/dao/implementation/SalaryDaoImpl.java
	new file:   school-dao/src/main/java/school/dto/SalaryDTO.java
	modified:   school-dao/src/main/java/school/model/Salary.java
	new file:   school-dao/src/test/java/school/dao/implementation/RoomDaoImplTest.java
	new file:   school-dao/src/test/java/school/dao/implementation/SalaryDaoImplTest.java
	modified:   school-dao/src/test/resources/xml-data-sets/salary.xml
	new file:   school-service/src/main/java/school/service/SalaryService.java
	new file:   school-service/src/main/java/school/service/implementation/SalaryServiceImpl.java
	new file:   school-service/src/main/java/school/service/utils/SalaryUtil.java
	new file:   school-web/src/main/java/school/controller/SalaryController.java
	modified:   school-web/src/main/resources/messages_en.properties
	modified:   school-web/src/main/webapp/WEB-INF/tiles.xml
	new file:   school-web/src/main/webapp/resources/css/salary.css
	new file:   school-web/src/main/webapp/resources/js/salary.js
	new file:   school-web/src/main/webapp/views/salary/history.jsp
	modified:   school-web/src/main/webapp/views/tiles/sidebar.jsp
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-web/src/main/resources/messages_en.properties

 Sallary merge
 Changes to be committed:
	modified:   ext-resources/db_filling_up.sql
	modified:   school-web/src/main/java/school/controller/CourseController.java
	modified:   school-web/src/main/java/school/controller/CourseRequestController.java
	modified:   school-web/src/main/java/school/controller/GroupController.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
	modified:   school-web/src/main/webapp/resources/img/crumbs_logo.png
	modified:   school-web/src/main/webapp/views/groups/head-teacher.jsp
	modified:   school-web/src/main/webapp/views/groups/student.jsp
	modified:   school-web/src/main/webapp/views/groups/teacher.jsp
	modified:   school-web/src/main/webapp/views/salary/history.jsp
	new file:   school-web/src/main/webapp/views/tiles/header_new.jsp