Fix db/baseline.pl to take --school-admin= option
Merge remote branch 'code/feature/fixdb' into feature/fixdb