use user-dir when USE_HOME_DIR is set
add config dir as default user dir
Load config files from legacy paths and save to new paths if necessary.
Misc compile breakage when adding support for legacy file path handling.
Merge pull request #7064 from Wishbringer/VehicleTankMessageFixes

Vehicle to vehicle fuel transfer was always reporting drained tank (bugfix).
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
New Houses
Corpses rot and are eventually removed
Merge pull request #7070 from John-Candlebury/garages

New houses
Add pizza parlor to mapgen
Pulled Elec and Impact Resist Plating

Because I have no idea how to do it and people are excited enough for
what's done as is.
Merge remote-tracking branch 'EkarusRyndren/Vehicoolz' into FrankenMod
Merge remote-tracking branch 'MattAmmann/corpse_rot' into FrankenMod

Conflicts:
	src/action.cpp
Think that is it.
Font problem solved.
Easy to fix, missing else clause.
Or not, should be like this.
Merge branch 'master' into FrankenMod

Conflicts:
	src/sdltiles.cpp
Merge remote-tracking branch 'TranquilMarmot/pizzaparlor' into FrankenMod

Conflicts:
	data/json/regional_map_settings.json
This really needs to be maintained better.
Mjau!