Fixed double notification bug
Merge branch 'master' of github.com:OrangeJam/iSchool