Merge proposals dependent on lp://qastaging/~schooltool-developers/schooltool/schooltool.courseinfo

1. schooltool.courseinfo
2. Dependent merge proposals