Merge proposals dependent on lp:~aelkner/schooltool.intervention/march_fixes

lp:~aelkner/schooltool.intervention/march_fixes has no merge proposals.