Salary style
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-dao/src/main/java/school/dto/SalaryPayrollDTO.java
	school-web/src/main/webapp/resources/css/clock.css
	school-web/src/main/webapp/views/salary/payroll.jsp