quivers container changed to std::map and loop modified
Multiquiver autoloading
Merge item plurilization support.

Conflicts:
	data/json/items/melee.json
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod
Merge remote-tracking branch 'MattAmmann/autoquiver' into FrankenMod
max_charges_from_flag() tweaks
changed outdated comment
Merge remote-tracking branch 'MattAmmann/autoquiver' into FrankenMod
Made it so that overmap type can be changed without applying generated terrain
Merge remote-tracking branch 'TranquilMarmot/omap_change' into FrankenMod