Merge branch 'quicknewbranch' of https://github.com/mafagafogigante/Cataclysm-DDA into merge2

Conflicts:
	src/melee.cpp

He's a serial merger, I tell you! you must stop him!
Broken-bot audit

Looks like all broken bots were manhacks.  This starts bringing volume
and mass in line with their size, gear, etc.
Merge pull request #8399 from Rivet-the-Zombie/spacing

More spacing fixes.
Camping mess kit

Basic functionality and camping mess kit item
Merge branch 'options-hidden' of https://github.com/OzoneH3/Cataclysm-DDA into merge
More spacing fixes.
Propperly remove empty lines when options are hidden.
Merge branch 'melee-miss-explanations-dex' of https://github.com/Spferical/Cataclysm-DDA into dexmsg

Conflicts:
	src/disease.cpp
	src/melee.cpp

Hoping I got it right in melee.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Trailing spaces must die.
Add MACPORTS parameter to Makefile to help it figure out where gettext lives.
Fixes the encumbrance-display bug

This one was just a display issue, courtesy of a copy/paste error.
Understandable in a project this size.
Merge pull request #8403 from KA101/limbs

Fixes the leg encumbrance-display bug
Fix deletion error
Call reset stats after processing effects
Fix legacy body_part effects
Partial fix for artifact saves
Fix setting language from options menu.
Only on Linux in this commit.
Fix windows build on minGW
Change language without restart