Merge pull request #5950 from Chase-san/patch-1

Peanut Butter fixes.
Merge pull request #5958 from illi-kun/incorrect_refreshing

Tweaking of description tab in new char gen menu
Merge pull request #5938 from Rivet-the-Zombie/chemical-category

Recategorizes a lot of items.
Conflicts:
	data/json/items/ammo.json
	data/json/items/archery.json
Merge pull request #5949 from VampyreLord/helper-veggi-change

Changed macaroni-helper food category to MEAT
Conflicts:
	data/json/recipes/recipes.json
Merge branch 'master' of https://github.com/aapo/Cataclysm-DDA into aapo-master
Merge pull request #5961 from KA101/CB-fix

Adds player_activity to C::B project file
Merge branch 'keep-mods' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-keep-mods
Merge branch 'cannibal' of https://github.com/9600bauds/Cataclysm-DDA into 9600bauds-cannibal

Conflicts:
	src/game.cpp
Merge branch 'computer-terminal-stuff' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into Rivet-the-Zombie-computer-terminal-stuff
Merge branch 'default-flag-for-mods' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-default-flag-for-mods
Merge branch 'skill-fix' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-skill-fix
Merge branch 'fix-file-exists' of https://github.com/macrosblackd/Cataclysm-DDA into macrosblackd-fix-file-exists
Merge branch 'update-ignore' of https://github.com/macrosblackd/Cataclysm-DDA into macrosblackd-update-ignore
Merge branch 'help_fix' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-help_fix
Merge branch 'nerf-ranged' of https://github.com/macrosblackd/Cataclysm-DDA into macrosblackd-nerf-ranged
merge cleanup
Merge pull request #5962 from MisterFelixFox/survivalist-canteen

Adds an empty water canteen to the Survivalist profession
Merge pull request #5952 from Chase-san/patch-2

Increase Max Trait and Initial Points
Merge branch 'dynamic-submap-loading' of https://github.com/kevingranade/Cataclysm-DDA into kevingranade-dynamic-submap-loading

Conflicts:
	src/mod_manager.cpp

Fixes as BevapDin proposed.
Merge pull request #5944 from kevingranade/nerf-sopanls

Nerf solar panels, hard.