fixing health and energy bars
Merge branch 'master' of github.com:awalterman/survival
Merge branch 'master' of github.com:awalterman/survival

Conflicts:
	SurvivalPrototype/Assets/Textures/Icons/Health_Bar_Green.png.meta
	SurvivalPrototype/Assets/Textures/Icons/Health_Bar_Red.png.meta
	SurvivalPrototype/Assets/Textures/Icons/Health_Bar_Yellow.png.meta