Fixed #310
Fixed  #301 melee bonus.
Merge branch 'master' of github.com:FreezingMoon/AncientBeast