Merge branch 'xurui'
Merge branch 'xurui'
edits in workitemscontroller
Merge branch 'master' into xurui
Added bar chart
Merge branch 'master' of github.com:u-jo/cally
Whole task work flow works
Merge branch 'master' into xurui