A few minor fixes.
Merge branch 'master' of https://github.com/AlincoRecoders/GearFoundry

Conflicts:
	GearFoundry/HudModules/CombatHud.cs
Recommit after pull