bam
added timeline zoom
fixed timeline zoom > 25
Merge branch 'master' of github.com:projecttouch/projecttouch
add effects to side bar