Added bleed effect / changed health borders

For visibility
Merged master to erikson
Obligitory update

ignore
Merge remote-tracking branch 'origin/master' into Erikson

Conflicts:
	Maven.userprefs