tried to implement zoom/move timeline feature.
Merge branch 'master' into timelineZoom
Merge branch 'master' into timelineZoom
-finished zooming / moving