fixed small dashboard problem
fixed dashboard propagation problem
Merge branch '138_Simplify_Time_Usage' into more-javascript
Cleaned up my own mess from the other branch (138)
WIP Cleaning up calculate default times shifts