cut scene- partial
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/entities/entities.js
	js/game.js
	js/screens/play.js