Set dmg on melee attack
Merge remote-tracking branch 'origin/master' into melee-attack