timeline, fix scroll
Merge branch 'gozar_design' into nerv_timeline2

Conflicts:
	client/presentation/timelineEditor/timeline/timeline.css
Fixed: Merge branch 'gozar_design' into nerv_timeline2