timeline timecode style changes
Merge branch 'master' of github:databrary/databrary

Conflicts:
	app/assets/volume/slot.html