Added setuphgamelaunch.sh. A tool to set up an environment for an online server with Hgamelaunch
Added a very dirty fix for two-level substitution of config variables
fixes a tab in the professions JSON
gives the fisherman profession a professional fishing rod
also gives a fish trap to a fisherman.
Gives "Really Bad Day" a more challenging (and rewarding) option.
Scenario-lock the Patient profession.
Detabify the professions.json.

Looks like `s/\t/ {8}/` (improper syntax, yeah) was the right thing to do.
add lunch meat as an option for meat sanwiches
Removes unnecessary debug message.

Unnecessary and misspelled.

It pops up when you get food poisoning from a toilet and doesn't respect
whether you have debug messages off or on.
fixed typo
Merge remote-tracking branch 'upstream/master'
Added Hgamelaunch setup script for gamesharing server setup.
Merge branch 'debug-message-fix' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Merge branch 'fisherman-update' of https://github.com/jcd000/Cataclysm-DDA into merge
Merge branch 'master' of https://github.com/3721assistant/Cataclysm-DDA into merge
Merge branch 'scenario-lock-patient' of https://github.com/narc0tiq/Cataclysm-DDA into merge

Conflicts:
	data/json/professions.json

Fixed
Merge branch 'lunch_meat_sandwich' of https://github.com/bug-sniper/Cataclysm-DDA into merge
Merge branch 'master' of https://github.com/C0DEHERO/Cataclysm-DDA into merge
Adds spelling note to 'The Compleat Trapper'.
Merge pull request #9250 from Rivet-the-Zombie/compleat-note

Adds spelling note to 'The Compleat Trapper'.