Merge remote-tracking branch 'origin/from_kino' into develop
Merge remote-tracking branch 'origin/from_kino' into develop
Merge remote-tracking branch 'origin/develop' into from_music
require
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	src/js/class.js
no cache
no cache
builder
api, ignore
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	src/js/class.js
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/js/class.js
class implemented
events refactor start
class fix
Events.one fix
ViewModel refactor start
ViewModel refactor end
khjhgf
ViewModel refactor end
Model refactoring