Merge branch 'version-3-2'

Conflicts:
	src/laws.c

s/preview

@@ -88,7 +88,9 @@ zip="$turn-$1.zip"
 zip -q -u $zip $turn-$1.?r
 email=$(grep "faction=$1:" reports.txt | cut -d: -f2 | sed 's/email=//')
 echo "sending reports to $1 / $email"
-cat /dev/null | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $game Partei $1" -a $zip -- $email
+info=/dev/null
+[ -e ../email.txt ] && info=../email.txt
+cat $info | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $game Partei $1" -a $zip -- $email
 }
 
 game=0

src/kernel/save.c

@@ -1571,8 +1571,10 @@ int readgame(const char *filename, int backup)
             }
         }
         a_read(&store, &pl->attribs, pl);
+        if (pl->id != 1094969858) { // Regatta
             addlist(&planes, pl);
         }
+    }
 
     /* Read factions */
     if (gdata.version >= ALLIANCES_VERSION) {