Some progress on the timeline controller
Merge remote-tracking branch 'origin/master'
Nothing