Mochito, some refactoring, JavaDoc and UI changes
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-web/src/main/webapp/views/salary/payroll.jsp
Merge branch 'master' of https://github.com/vsomov/SchoolPortal