updated CBP
Merge branch 'display-kills' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-display-kills
Merge pull request #5853 from origamiwolf/json-toilet

Allow for special terrain generation in json
Conflicts:
	data/json/mapgen/gunsmith.json
	data/json/witomod/dojo.json
Merge branch 'help' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-help

Conflicts:
	src/output.h

oh no! he's pulling onto the highway! it's a merge!
Merge pull request #5856 from sduran/fix_allow_pickup_vehground

Pickup after cancelling vehicle examination.
minor bugfixes