sidebar
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

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

Conflicts:
	ext-resources/db_filling_up.sql
	school-dao/src/test/resources/xml-data-sets/salary.xml
	school-web/src/main/webapp/views/tiles/sidebar.jsp