Note to self: Always make before commit ...
allowed points to be negative in character building
Mergefest.

Conflicts:
	translations.h
Correct the other flotation misspellings too.
Remove commented out code.
Simplify an assignment.
Remove some unused variables.
Reduce damage dealt by corpse-filled pits.
allowed points to be temporarily negative in character building
Merge branch 'master' of github.com:fiddlerwoaroof/Cataclysm-DDA

Conflicts:
	newcharacter.cpp
Cleanup.
Fix flicker when scrolling advanced inventory.
Update weight pain penalties.
Halve overburdened speed penalty.
Player collapses if carrying too much
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into mutations
Actually mutate when eating mutagen.

Removed fontlist, why did it even commit that ...
Make fd_flame_burst and fd_fire_vent display properly
Alternative "weird meat" fix; corpses must have "corpse" != NULL -and- typeId() == "corpse". Meat retains "corpse" ptr for future shenanigans
typo: fix