Merge branch 'master' into iteru

* master:
  Set previously missing YESTREE on BLACK_CAPs in ASCII tileset
  Add missing braces around INVERTED TILE in masterwork tilesets and Obsidian Soul
  Normalise tilesets with formatting of harder invaders.
  Fix missing brackets on INVERTED_TILE tags
  raw changes for new options
  updated raws and new civ options
  updated gitignore for .suo file(s)
  removed .suo
  added deleted preview.png from the merge
  fixes, added 3rd party source
  fix for backwards 'simple' settings
  fixed random creature issue
  tileset color mapping, modified background, about button
  plant_grasses and missing color
  final cleanup for release version
  initial commit
Fix 'separate bone' bolt-making reactions. Thanks to GTrax.

See discussion and fix at
http://www.bay12forums.com/smf/index.php?topic=125628.msg4836436#msg4836436
Merge branch 'master' into iteru

* master:
  Fix 'separate bone' bolt-making reactions. Thanks to GTrax.
  Rebalance: Medicine produces five units from two plants.
yoink-master.pl - Distribute master patches to all active branches.
yoink-master.pl - Return to current branch. Prettier graphs on github.
lint-raws.pl: Detect undefined and unpermitted reactions.
Raw import of @Vherid's Iteru raws.

This commit imports Verhid/DFMWIteru@fd53ef85ae0d51416177abc302c1a36a87f0b6dd
004

Small amount of work added to Papyrus plant
Merge branch 'iteru' of https://github.com/pjf/masterwork-dwarf-fortress into iteru

Conflicts:
	Dwarf Fortress/raw/objects/plant_iteru.txt
Merge branch 'iteru' of https://github.com/Vherid/masterwork-dwarf-fortress into iteru