added wind and solar hz bars
Merge branch 'master' of https://github.com/bernhardbreuss/DeltaSquad

Conflicts:
	Assets/Scripts/PlayerPowergrid.cs
	Assets/dev.unity