Implemented RechargeWandTrap
Clean up for wand recharge trap

And have taken into account a merge conflict with the Anders branch
Merge branch 'TrapRechargeWand'