Added reset threshold to combatant color
Added explosion logic; modified test scenario

Right click for explosion at cursor!
Made combatant color pulse reset tolerance rate*dt
Merge with upstream

Fixed some conflicts
Merge remote-tracking branch 'upstream/master'
Bomb explosion changed to upstream explosion

Matches upstream implementation