fixing bugs
Merge branch 'schoolgate-master' of https://github.com/schoolgate/schoolgate into schoolgate-master