Merge branch 'master' into recipes_for_item

Conflicts:
	src/game.cpp
	src/veh_interact.cpp
Restore make zlave in knife
Remove baseball bat recipe.
more id conversions
Clay And Pottery pack. Part 1.

Construction options:
1. Cut Down Grass
2. Remove Dirt Mound
3. Extract Clay Mound
Items:
1. Clay jug
2. Clay bowl
3. Clay container
4. Clay canister
5. Clay pot
6. Clay quern
7. Clay teapot
8. Clay lump
9. Brick
New materials:
1. Fresh Clay
2. Clay
New terrain object:
1. Clay mound
src/item_factory.cpp: Fixed an oopsie
Little correction, put "level_required" instead of "skill_required"
Mapdata fix
Mapdata fix
Power station groups tweak
Vertically align MOTD and credits popups to available screen space.
Update MOTD and credits to indicate increased potential size.
Tweak
Typo.
Actually remove the 16 lines constraint this time.
Merge remote-tracking branch 'origin/master' into Hotwiring

Conflicts:
	src/game.h
	src/vehicle.cpp
Fixed up broken merge stuff.
Merge branch 'aiming-system-wip' of https://github.com/kevingranade/Cataclysm-DDA into merge
Merge branch 'recipes_for_item' of https://github.com/yobbobanana/Cataclysm-DDA into merge
Add electric chainsaw/jackhammer
Merge branch 'straw' of https://github.com/Mshock777/Cataclysm-DDA into merge

Conflicts:
	data/json/items/melee.json