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

Conflicts:
	client/presentation/timelineEditor/Component.js
	core/Component.js
Merge branch 'nervtimeline2Slil' of https://github.com/amixok/amix into nerv_timeline2
Merge origin/master into diabloprop