Fixed drowned death
Merge remote-tracking branch 'kotzi/master'

Conflicts:
	js/character.js