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
Merge remote-tracking branch 'origin/teaching_plan'