modified teachingplan time table
Merge branch 'master', remote-tracking branch 'origin'
solved issues in home and edit in pop up
Merge remote-tracking branch 'origin/teaching_plan'