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
Merge remote-tracking branch 'origin/teaching_plan'
conflict
calendar.js conflict
conflict at schema
payment status report
Gem file skipped wile resolving conflict
javascript errors solved
alerts removed at reports
 popup calendar added
Merge branch 'master', remote-tracking branch 'origin'
calendar mouseover added
static route
bulk creation and issuing
conflict at home and resource.js