One big update for stacks.
Some grammar
Two small bugs...
Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp

Conflicts:
	code/game/objects/items/weapons/grenades/ghettobomb.dm
	code/game/objects/structures/door_assembly.dm
Fix
Merge pull request #3889 from Kelenius/OfCyborgsAndModules

Of cyborgs and modules