Merge branch 'master', remote-tracking branch 'origin'
solved issues in home and edit in pop up
Merge remote-tracking branch 'origin/teaching_plan'
parent check coupled with transaction and add all at filling monthly pdc in payments
calendar added