popup calendar added
calendar mouseover added
static route
conflict at home and resource.js
Merge remote-tracking branch 'origin/teaching_plan'
Merge branch 'master', remote-tracking branch 'origin'
Teacher View
js syntacs errors
Merge branch 'master', remote-tracking branch 'origin'
issuing book