Salary. Please re-build your DB
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-dao/src/test/resources/xml-data-sets/salary.xml
	school-web/src/main/java/school/controller/SalaryController.java
	school-web/src/main/resources/messages_en.properties
	school-web/src/main/webapp/views/tiles/header.jsp
	school-web/src/main/webapp/views/tiles/sidebar.jsp