fixed a bug in teacher notification
Merge remote-tracking branch 'sam/master'
small layout enhancements