Added health labels and bars
Merge remote-tracking branch 'origin/master'

Conflicts:
	dotWar/src/client/GUI.java
	dotWar/src/client/GamePanel.java