Updated index view to calender for manager and employee
Merge remote-tracking branch 'origin/master'