Changes to be committed:
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	ext-resources/db_filling_up.sql
	school-web/src/main/webapp/views/tiles/sidebar.jsp

 Changes to be committed:
	modified:   ext-resources/db_filling_up.sql