Masterwork 4i release.
Merge branch 'upstream' into gold

* upstream:
  Masterwork 4i release.

All conflicts trivial to resolve, except for dfhack.init,
where the upstream version was used.

Conflicts:
	Dwarf Fortress/dfhack.init
	Dwarf Fortress/raw/objects/creature_gnome.txt
	Dwarf Fortress/raw/objects/entity_default.txt
	Dwarf Fortress/raw/objects/item_tool.txt
	Dwarf Fortress/raw/objects/item_tool_masterwork.txt