Sorted by team/personal first then by start time (sorry this is on dev)
Merge branch 'dev' into add_commitment