Merge branch 'xurui'
Created calendar and ability to add work items
Merge branch 'xurui'
calendar controller
fixed merge conflict
Can get daily work hours in workitemscontroller