added timeline and brush interaction
Merge branch 'master' of https://github.com/densitydesign/ccfs14