Merge branch 'master' into cargo

Conflicts:
	eos/saveddata/fit.py

service/fit.py

@@ -162,6 +162,8 @@ class Fit(object):
         fit = eos.db.getFit(fitID)
         sFlt = Fleet.getInstance()
         sFlt.removeAssociatedFleetData(fit)
+        self.removeProjectedData(fitID)        
+        
         eos.db.remove(fit)
 
     def copyFit(self, fitID):
@@ -177,7 +179,15 @@ class Fit(object):
         fit = eos.db.getFit(fitID)
         fit.clear()
         return fit
-
+        
+    def removeProjectedData(self, fitID):
+        '''Removes projection relation from ships that have fitID as projection. See GitHub issue #90'''
+        fit = eos.db.getFit(fitID)
+        fits = eos.db.getProjectedFits(fitID)
+        
+        for projectee in fits:
+            projectee.projectedFits.remove(fit)
+        
     def toggleFactorReload(self, fitID):
         if fitID is None:
             return None