refactoring before demo
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git