Add Education system to solution
Merge branch 'EducationSystem'