Merge branch 'Diabo_Stage' into movie-wip

Conflicts:
	client/model/KeyframeCollection.js
	client/model/Shape.js
Merge branch 'master' into movie-wip

Conflicts:
	client/model/Shape.js
Пофиксил баг с высчетом промежуточных значений