Fix the error in selecting teachers for CGR with year groups
Issue of displaying Year Id in front end fixed.
Change scheduling query
Merge branch 'dev'