Merge branch 'alex'

Conflicts:
Assets/TestProject/Scripts/GUI/HUD/GUIHealthBar.cs
Fixed GUIHealthBar again