Merge branch 'master' into attrGroup

eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Skills named like: Target Management (2 of 2)
-type = "passive"
+type = "passive", "structure"
 
 
 def handler(fit, skill, context):

gui/fitCommands/calc/fitReplaceModule.py

@@ -78,7 +78,7 @@ class FitReplaceModuleCommand(wx.Command):
             if self.module.isValidState(State.ACTIVE):
                 self.module.state = State.ACTIVE
 
-            if self.old_module.charge and self.module.isValidCharge(self.old_module.charge):
+            if self.old_module and self.old_module.charge and self.module.isValidCharge(self.old_module.charge):
                 self.module.charge = self.old_module.charge
 
             # Then, check states of all modules and change where needed. This will recalc if needed