Fixes #2288
Merge branch 'master' of github.com:databrary/databrary
timeline - use volume, colored active track, spare track, edit mode
Merge branch 'master' of https://github.com/databrary/databrary
Merge branch 'master' into jsmodels