Merge branch 'master', remote-tracking branch 'origin'
removed model AssessmentTeacherMapping
academic_terms
canteenmanagent added
request for inventory added
Merge branch 'master', remote-tracking branch 'origin'
reports
reports
Term Results
Merge with academic_terms
Teacher View Of Term Results
Merge remote-tracking branch 'origin/library'
Merge remote-tracking branch 'origin/holiday_calendar'
Merge remote-tracking branch 'origin/inventory'
conflict correction at seeds.rb