Merge branch 'master', remote-tracking branch 'origin'
Merge remote-tracking branch 'origin/master'
Teachers Time Table Developing
added home side menu and resolved issues
modified teaching plan form
added home side menu and resolved issues
Merge remote-tracking branch 'origin/teaching_plan'
Merge remote-tracking branch 'origin/uma'
fee structure approvals
fee structure approval renamed to approval item