config assets premières maps
Merge remote-tracking branch 'origin'

Conflicts:
	scripts/assets.json