map update fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/config/config/monster.json
	build/config/config/settings.json