Fixed overwrite using ATfunction from modal branch to properly call taskStatus functions
Fixed merge overwrite
Merge branch 'master' into jf-timelineColors