(svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk

This includes 2 fixes
-Fix: [1048596] Monorail and Maglev sounds are swapped (r511)
-Add special case to load the jackhammer sound (r478)
The rest are cleanups und enumeration to make merging possible/easier

aircraft_cmd.c

@@ -6,6 +6,7 @@
 #include "station.h"
 #include "news.h"
 #include "gfx.h"
+#include "sound.h"
 #include "player.h"
 #include "airport.h"