Merge remote-tracking branch 'dda/pr/8137' into dda-master

* dda/pr/8137:
  Glug Glug Glug Glug Glug Glug Glug Glug Glug
  added the ability to hack the console to get free gas (hello, John-Candlebury)
  special interface of terminal for illiterate
  betterment discount processing. Thx @BevapDin for suggestions.
  AStyle
  redisign map, feature: enlight selected pump
  more gas-pump lines, more terminals
  Tank has more fuel
  formatting
  discount cards
  ready
  fixing bugs
  optimizing
  processing pay_gas
  fixing spoiled branch
  fixing spoiled branch
  terrains, furniture, amenu
  prepare json-files
  rename branch
  begin

Conflicts:
	data/json/furniture.json
	src/iexamine.cpp
	src/iexamine.h
Stylin.
Don't automatically select a pump when opening automatic gas station menu.  Prevents pump being selected after a cancel.
Automatic gas pump build fixes.
Remove character that makes clang unhappy.
Generate straighter lines with map::route by checking points closer to the target first.
properly account for the starting season option
Boat/auto-fuel proofreading

Cleaned up some unclear language.  Sorry I didn't comment on these
during the process.
Zombie pigs

As summoned by Labtop_215:
http://smf.cataclysmdda.com/index.php?topic=19.msg158380#msg158380
another typo
Fix JSON error

Use the right id, KA101!
OK, now bite down

Bites are pretty common.
pour into containers on ground
name of liquid to menu caption
AStyle
Merge remote-tracking branches 'dda/pr/8205' and 'dda/pr/8207' into dda-master

* dda/pr/8205:
  another typo
  Boat/auto-fuel proofreading

* dda/pr/8207:
  OK, now bite down
  Fix JSON error
  Zombie pigs, for great justice!
Fixes more singlespaces.
CBM units too.
Oops.
begin