Merge branch 'master' into Leif

Conflicts:
	entities/enemies.js