Merge branch 'master' into siteneutral

Conflicts:

	pyfpdb/fpdb_import.py
	pyfpdb/fpdb_save_to_db.py
	pyfpdb/fpdb_simple.py

pyfpdb/fpdb_import.py

@@ -191,7 +191,6 @@ class Importer:
                 tmpcursor = self.fdb.db.cursor()
                 tmpcursor.execute("Select count(1) from Hands;")
                 self.settings['handsInDB'] = tmpcursor.fetchone()[0]
-                tmpcursor.close()
             except:
                 pass # if this fails we're probably doomed anyway
         if self.settings['handsInDB'] < 5000:  return "drop"
@@ -336,7 +335,7 @@ class Importer:
                 else:
                     isTourney=fpdb_simple.isTourney(hand[0])
                     if not isTourney:
-                        fpdb_simple.filterAnteBlindFold(hand)
+                        hand = fpdb_simple.filterAnteBlindFold(hand)
                     self.hand=hand
 
                     try: