Merge origin/master

Conflicts:
	Mage.Sets/src/mage/cards/s/SalvageTrader.java
	Mage.Sets/src/mage/cards/t/ThermalDetonator.java

Mage.Common/src/main/java/mage/utils/MageVersion.java

@@ -14,7 +14,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
     public final static int MAGE_VERSION_MAJOR = 1;
     public final static int MAGE_VERSION_MINOR = 4;
     public final static int MAGE_VERSION_PATCH = 30;
-    public final static String MAGE_VERSION_MINOR_PATCH = "V6";
+    public final static String MAGE_VERSION_MINOR_PATCH = "V7";
     public final static String MAGE_VERSION_INFO = "";
 
     private final int major;

Mage.Sets/src/mage/cards/t/ThermalDetonator.java

@@ -27,8 +27,7 @@ public final class ThermalDetonator extends CardImpl {
     private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent();
 
     static {
-        filterCreature.add(Predicates.not(new AbilityPredicate(SpaceflightAbility.class)));
+        filter.getCreatureFilter().add(Predicates.not(new AbilityPredicate(SpaceflightAbility.class)));
-        filter.setCreatureFilter(filterCreature);
     }
 
     public ThermalDetonator(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/w/WearTear.java

@@ -1,4 +1,3 @@
-
 package mage.cards.w;
 
 import java.util.UUID;
@@ -31,6 +30,8 @@ public final class WearTear extends SplitCard {
         getRightHalfCard().getSpellAbility().addEffect(new DestroyTargetEffect());
         target = new TargetEnchantmentPermanent();
         getRightHalfCard().getSpellAbility().addTarget(target);
+
+        // Fuse (You may cast one or both halves of this card from your hand.)
     }
 
     public WearTear(final WearTear card) {

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java

@@ -1,4 +1,3 @@
-
 package org.mage.test.cards.abilities.keywords;
 
 import mage.abilities.mana.ManaOptions;
@@ -8,7 +7,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.game.permanent.Permanent;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
@@ -164,7 +162,6 @@ public class BestowTest extends CardTestPlayerBase {
      * http://www.mtgsalvation.com/forums/magic-fundamentals/magic-rulings/magic-rulings-archives/513828-bestow-far-away
      */
     @Test
-    @Ignore  // Handling of targets of Fused spells is not handled yet in TestPlayer class
     public void bestowWithFusedSpell() {
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2);
         /**
@@ -183,22 +180,22 @@ public class BestowTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerB, "Swamp", 3);
         addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
 
-        /**
+        // Instant
-         * Far {1}{U} Instant Return target creature to its owner's hand. Away
+        // Far {1}{U} Return target creature to its owner's hand.
-         * {2}{B} Instant Target player sacrifices a creature. Fuse (You may
+        // Away {2}{B} Target player sacrifices a creature.
-         * cast one or both halves of this card from your hand.)
+        // Fuse (You may cast one or both halves of this card from your hand.)
-         */
         addCard(Zone.HAND, playerB, "Far // Away");
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nyxborn Rollicker using bestow", "Cyclops of One-Eyed Pass");
 
-        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "fused Far // Away", "Cyclops of One-Eyed Pass^targetPlayer=PlayerA");
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "fused Far // Away", "Cyclops of One-Eyed Pass");
-        playerA.addTarget("Nyxborn Rollicker");
+        addTarget(playerB, playerA);
+        addTarget(playerA, "Nyxborn Rollicker");
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
 
-        assertHandCount(playerA, 0);
+        assertHandCount(playerA, "Cyclops of One-Eyed Pass", 1);
         assertHandCount(playerB, 0);
 
         assertGraveyardCount(playerB, "Far // Away", 1);

Mage/src/main/java/mage/cards/repository/CardRepository.java

@@ -32,7 +32,7 @@ public enum CardRepository {
     // raise this if db structure was changed
     private static final long CARD_DB_VERSION = 51;
     // raise this if new cards were added to the server
-    private static final long CARD_CONTENT_VERSION = 116;
+    private static final long CARD_CONTENT_VERSION = 117;
     private Dao<CardInfo, Object> cardDao;
     private Set<String> classNames;
 

Mage/src/main/java/mage/cards/repository/ExpansionRepository.java

@@ -29,7 +29,7 @@ public enum ExpansionRepository {
     private static final String JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE";
     private static final String VERSION_ENTITY_NAME = "expansion";
     private static final long EXPANSION_DB_VERSION = 5;
-    private static final long EXPANSION_CONTENT_VERSION = 15;
+    private static final long EXPANSION_CONTENT_VERSION = 16;
 
     private Dao<ExpansionInfo, Object> expansionDao;