Merge branch 'develop' into gh-pages

Conflicts:
	index.html
	src/GameScene.js
	src/Player.js
	src/enemy/Enemy.js
	src/main.js