SchoolYear refactored
bugfix
Merge pull request #548 from davvitt/issue#544

SchoolYear refactored