Changes made by Ivan Vlaevski (ivlaevski@objectsystems.com).
Merge branch 'master' of https://github.com/ivanvlaevski/OurSchoolNetwork.git