Added tests for DistributeDamage in player and fixed the chain of methods it uses to make tests pass
Merge origin/master
Merge origin/master