merge conflict
Merge branch 'master' of https://github.com/LGJ-Poitiers/Venthobee.git

Conflicts:
	game/public/js/entities/entities.js