Merge branch 'master' into 25-dissapearing-enemies

Conflicts:
	build/glue.min.js