Слияние с diabloStageEdit
Merge remote-tracking branch 'origin/nerv_timeline2' into nerv_timeline2

Conflicts:
	client/presentation/timelineEditor/Component.js
	core/Component.js