Academic timetable added for parent view
Merge branch 'master', remote-tracking branch 'origin'
Individual Calendar is in pending
monthly wise plan added
parent view devleoped for Academic Time Table
new route changed
Merge remote-tracking branch 'origin/library'
Merge remote-tracking branch 'origin/teaching_plan'
Merge remote-tracking branch 'origin/class_teacher_mapping'
conflict at usermenu
calendar1 syntax issue
submenu for librarian library
Merge branch 'master', remote-tracking branch 'origin'
return book