Remove unnecessary \n's from bionics.json and fix minor spacing issues.
Blacksmith profession cost increased to 2.
-damage calculation for vehicle-vehicle collisions
-fixed some bugs in line.cpp and vehicle.cpp
Merge PR #2668 - LSD tablets
Merge PR #2667 - Survivor suit welding
Merge PR #2666 - Crackpipe recipe

Conflicts:
	data/raw/recipes.json
Merge PR #2664 - Typo fix
Merge PR #2669 - Chewing gum

Conflicts:
	data/raw/item_groups.json
	data/raw/items/comestibles.json
Merge PR #2670 - Pickling!

Conflicts:
	data/raw/items/comestibles.json
	data/raw/recipes.json
Merge PR #2648 - Metalworking expansion!

Conflicts:
	data/raw/item_groups.json
	data/raw/items/armor.json
	data/raw/items/books.json
	data/raw/recipes.json
Merge Fix.
Move Mi-Go parrot speech to data/raw/parrot.json.
Merge branch 'warn_on_new_json' into i18n_fixes
Add data/raw/parrot.json to lang/extract_json_strings.py
Missing full-stop in parrot.json.
Merge PR #2662 - Warn on new json
Merge PR #2663 - Skill.json cleanup
Fix some missing endquotes in data/raw/parrot.json.
Update the .pot file.
Edits to drug descriptions, some rebalancing and realism tweaks.