OnHitEffectsManager updated and working
Merge onhiteffects branch with master