improved life management
Merge branch 'master' of https://github.com/eelfroth/BGS_LudumDare29

Conflicts:
	com/BauhausGamesSyndicate/LudumDare29/GameObjects/AbstractEntity.java
	com/BauhausGamesSyndicate/LudumDare29/GameObjects/Soldat.java
	com/BauhausGamesSyndicate/LudumDare29/GameObjects/Warg.java