Add conflict management on units placement
Fix pb typo
Merge branch 'units-placement' into add-right-images-to-placement

Conflicts:
	web/js/game/Tile.js
	web/js/game/contentManager.js