Setting up stuff for TimelineController and new directive.
Merge branch 'dev' of github.com:pculture/unisubs into dev