fix
Merge branch 'dev' of https://github.com/GameHomePC/game into dev

Conflicts:
	public/js/my-game/init.js