- Made some more code cleanups and (small) performance improvements.

- Fixed Sarkhan Vol and Ajani Goldmane token controllership issues. Also fixed Ajani Goldmane?\127 lifegain after a different player takes control of it.
- Memnarch's first ability will put the Artifact type at the beginning of the type text (so "Artifact Planeswalker - Ajani" instead of "Planeswalker - Ajani Artifact").
- Planeswalkers with the same "subtype" should get destroyed correctly now if there are two or more in play, even if one of them got "Memnarched" into an artifact.

src/javazoom/jl/converter/WaveFile.java

@@ -32,7 +32,7 @@ public class WaveFile extends RiffFile
 {
     public static final int 	MAX_WAVE_CHANNELS = 2;
     
-	class WaveFormat_ChunkData
+	static class WaveFormat_ChunkData
 	{
    	   public short         wFormatTag = 0;       // Format category (PCM=1)
    	   public short         nChannels = 0;        // Number of channels (mono=1, stereo=2)
@@ -88,7 +88,7 @@ public class WaveFile extends RiffFile
    		}
 	}
 
-	public class WaveFileSample
+	public static class WaveFileSample
 	{
    		public short[] 				chan;