Testing jl8e's updated changes
Merge remote-tracking branch 'upstream/master'
Update master to upstream/master.
Bring master branch up to date with attacks branch for testing on pagoda
Replaced any calls in BMAttack to the inner structure of BMGame->activeDieArrayArray with accessors
Removed one useless call to collect_helpers() in BMAttackPowerTest