filter activities by classroom id
lots of bug fixing
Merge branch 'dev'