Reset player on death
Merge branch 'develop' of https://github.com/werme/DATX02 into develop
Merge branch 'develop' of https://github.com/werme/DATX02 into develop

Conflicts:
	src/js/entities/player.js