Merge pull request #6051 from Soyweiser/Cowbell

Changed the cowbell sound volume from 6 to 12.
Conflicts:
	src/iuse.cpp
Merge pull request #6049 from Soyweiser/Classic_Zombear_Removal

Removed wildlife tag from zombear. Does not show up in classic anymore.
Merge pull request #6047 from Soyweiser/Stylish2

Stylish Fixes, missing slots added, and a cap included (20)
Merge pull request #6046 from Soyweiser/Misc_Item_Fixes

Misc item fixes
Conflicts:
	data/json/recipes/recipes.json
Merge pull request #6053 from Soyweiser/Lab_Computers

Lab computers
Merge pull request #6042 from Rivet-the-Zombie/briefcase-fix

You carry a briefcase with your hand, not just your arm.
Merge pull request #6054 from Rivet-the-Zombie/hatchet-description-fix

Vague-ifies hatchet description a bit so as not to imply that it can be used to chop down trees.
Merge pull request #5735 from Kuxe/SDLToggleFullscreen

[CR] SDL fullscreen support
Merge branch 'ammo-effects' of https://github.com/kevingranade/Cataclysm-DDA into kevingranade-ammo-effects

Conflicts:
	data/json/items/ammo.json
Merge branch 'new_crafting_filter' of https://github.com/ZwodahS/Cataclysm-DDA into ZwodahS-new_crafting_filter
Merge pull request #6057 from Rivet-the-Zombie/repairing-constructions

Grants the player the ability to repair chipped/broken wood and log walls.
Merge branch 'fix-minimap-4' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-fix-minimap-4
Merge pull request #6063 from Soyweiser/Carving_Outputstring

Fixed the small issue where carving/cutting with a bladed object could result in no objects, but a 0 chunks string.
Merge branch 'GUI_Dropping' of https://github.com/Soyweiser/Cataclysm-DDA into Soyweiser-GUI_Dropping
Merge pull request #6065 from kevingranade/terrain-enums-strike-again

Terrain enums strike again
Merge pull request #6066 from kevingranade/fix-field-order

Fix field order
Merge pull request #6081 from Soyweiser/FOODCO_Description

Updated FOODCO description.
Conflicts:
	data/json/items/vehicle_parts.json
Merge pull request #6074 from BevapDin/fields

Fix for #4260
Merge branch 'impreove-writing-files' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-impreove-writing-files

Conflicts:
	src/mod_manager.cpp
Merge branch 'Spray_Can' of https://github.com/Soyweiser/Cataclysm-DDA into Soyweiser-Spray_Can