Merge branch 'master', remote-tracking branch 'origin'
changed teachingplan design layout
Merge branch 'master', remote-tracking branch 'origin'
soft delete
views created for class-techer-mapping
work for issuing book
Event Calendar popup issue
Merge remote-tracking branch 'origin/teaching_plan'
conflict
calendar.js conflict
conflict at schema