Merge remote-tracking branch 'dda/pr/1560' into dda-master
Neat-o enhancements.
Merge remote-tracking branch 'dda/pr/1570' into dda-master
Merge pull request #1586 from acidia/difficulty-pat

Small tweaks to prison monsters
Merge remote-tracking branch 'dda/master' into dda-master
Compilation fix.
Removed rep crossbow spawn
Huge crossbow fix
Only stop the player from putting on power armor if it covers the same slot as other gear

Fixes #1588
Power armor bugfix and new types of archery items.

Conflicts:
	game.cpp
Remove deprecated map::spawn_item().
Change MAX_ITEMS_PER_TILE from 64 to 1024
Spawn the correct number of items when deconstructing etc. Fixes #909.
vehicle::add_item limits volume per MAX_VOLUME_IN_VEHICLE_STORAGE (500),
items per MAX_VOLUME_IN_VEHICLE_STORAGE (1024)
Fix run_cost() for diagonal moves.
Crossbow Recipes!

Last Step for crossbows
Merge branch 'Crossbow-Additions' of https://github.com/Stevensonz/Cataclysm-DDA into Crossbow-Additions
Fix diagonal movement cost for PF_FLEET and/or PF_PARKOUR.
Ensure PF_FLEET helps even if your legs are damaged.
Merge branch 'master' into counter_disassembly