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
Merge remote-tracking branch 'origin/diabloprop2' into nerv_timeline2
Добавлен using в класс
оптимизирован transition и property  в таймлайн
Устранены мелкие недочеты в Object collection
перемещение блоков