updated Timelines controller
Merge branch 'master' of github.com:toodelirious/StereoSpace