Made it so Shield Icon on UI bar reflects current shield/health status
Merge branch 'Jason'

Conflicts:
	Lords-of-Distortion/Assets/Scenes/LobbyArena.unity
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion