Added filter for Student schedules
Merge branch 'develop'