Repainted the healthbar
Modified weapon system
Merge branch 'develop' of https://github.com/bellevik/glory into develop

Conflicts:
	zombie-world/src/se/glory/zombieworld/model/StageModel.java