diff --git a/Mage.Client/serverlist.txt b/Mage.Client/serverlist.txt
index 33df5c541a..41c2909e7f 100644
--- a/Mage.Client/serverlist.txt
+++ b/Mage.Client/serverlist.txt
@@ -1,5 +1,5 @@
woogerworks (Version 1.3.0 dev 2014-10-29V2) :xmage.woogerworks.com:17171
-XMage.info 1 (Version 1.3.0 dev 2014-11-29v3) :176.31.186.181:17171
-XMage.info 2 (Version 1.3.0 dev 2014-11-29V3) :176.31.186.181:17000
+XMage.info 1 (Version 1.3.0 dev 2014-11-29v4) :176.31.186.181:17171
+XMage.info 2 (Version 1.3.0 dev 2014-11-29V4) :176.31.186.181:17000
Seedds Server (Version 1.3.0 dev 2014-11-29v2) :115.29.203.80:17171
localhost -> connect to your local server (must be started):localhost:17171
diff --git a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
index 7e8c8ae7b0..0f9a4a8887 100644
--- a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
+++ b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
@@ -27,7 +27,7 @@ public class ConstructedFormats {
private static final String[] constructedFormats = {
ALL, STANDARD, EXTENDED, MODERN,
- "* Khans of Tarkir Block", "Khans of Tarkir", /*"Fate Reforged",*/
+ "* Khans of Tarkir Block", "Khans of Tarkir", "Fate Reforged", /*"Dragons of Tarkir"*/
"* Theros Block", "Journey into Nyx", "Born of the Gods", "Theros",
"* Return to Ravnica Block", "Dragon's Maze", "Gatecrash", "Return to Ravnica",
"* Innistrad Block", "Avacyn Restored", "Dark Ascension", "Innistrad",
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
index cd0c5b0f98..abc0403420 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
@@ -16,6 +16,7 @@ public class MagicCardsImageSource implements CardImageSource {
private static final Map<String, String> setNameTokenReplacement = new HashMap<String, String>() {
{
+ put("FRF", "fate-reforged");
put("C14", "commander-2014-edition");
put("KTK", "khans-of-tarkir");
put("VMA", "vintage-masters");
diff --git a/Utils/known-sets.txt b/Utils/known-sets.txt
index d3e5b651f9..a1eafb6680 100644
--- a/Utils/known-sets.txt
+++ b/Utils/known-sets.txt
@@ -35,6 +35,7 @@ Eighth Edition|eighthedition|
Eventide|eventide|
Exodus|exodus|
Fallen Empires|fallenempires|
+Fate Reforged|fatereforged|
Fifth Dawn|fifthdawn|
Fifth Edition|fifthedition|
Fourth Edition|fourthedition|
diff --git a/Utils/mtg-sets-data.txt b/Utils/mtg-sets-data.txt
index 8555671e14..8fca69cc1a 100644
--- a/Utils/mtg-sets-data.txt
+++ b/Utils/mtg-sets-data.txt
@@ -1,132 +1,133 @@
-Unlimited Edition|2ED|
-Revised Edition|3ED|
-Fourth Edition|4ED|
-Fifth Dawn|5DN|
-Fifth Edition|5ED|
-Classic Sixth Edition|6ED|
-Seventh Edition|7ED|
-Eighth Edition|8ED|
-Tenth Edition|10E|
-Alliances|ALL|
-Apocalypse|APC|
-Alara Reborn|ARB|
-Arabian Nights|ARN|
-Anthologies|ATH|
-Antiquities|ATQ|
-Archenemy|ARC|
-Avacyn Restored|AVR|
-Betrayers of Kamigawa|BOK|
-Battle Royale Box Set|BRB|
-Beatdown Box Set|BTD|
-Born of the Gods|BNG|
-Champions of Kamigawa|CHK|
-Chronicles|CHR|
-Commander 2013 Edition|C13|
-Commander 2014 Edition|C14|
-Conflux|CON|
-Coldsnap|CSP|
-Dark Ascension|DKA|
-Darksteel|DST|
-Dissension|DIS|
-Deckmasters|DKM|
-Dragon's Maze|DGM|
-The Dark|DRK|
-Duel Decks: Ajani vs. Nicol Bolas|DDH|
-Duel Decks: Elves vs. Goblins|EVG|
-Duel Decks: Divine vs. Demonic|DDC|
-Duel Decks: Elspeth vs. Tezzeret|DDF|
-Duel Decks: Garruk vs. Liliana|DDD|
-Duel Decks: Izzet vs. Golgari|DDJ|
-Duel Decks: Heroes vs. Monsters|DDL|
-Duel Decks: Jace vs. Chandra|DD2|
-Duel Decks: Jace vs. Vraska|DDM|
-Duel Decks: Knights vs. Dragons|DDG|
-Duel Decks: Phyrexia vs. the Coalition|DDE|
-Duel Decks: Sorin vs. Tibalt|DDK|
-Duel Decks: Speed vs. Cunning|DDN|
-Duel Decks: Venser vs. Koth|DDI|
-Eventide|EVE|
-Exodus|EXO|
-Fallen Empires|FEM|
-Future Sight|FUT|
-From the Vault: Dragons|FVD|
-From the Vault: Exiled|FVE|
-From the Vault: Relics|FVR|
-Gatecrash|GTC|
-Guildpact|GPT|
-Homelands|HML|
-Planechase|HOP|
-Planechase 2012 Edition|PC2|
-Ice Age|ICE|
-Innistrad|ISD|
-Invasion|INV|
-Journey into Nyx|JOU|
-Judgment|JUD|
-Khans of Tarkir|KTK|
-Limited Edition Alpha|LEA|
-Limited Edition Beta|LEB|
-Legends|LEG|
-Legions|LGN|
-Lorwyn|LRW|
-Magic 2010|M10|
-Magic 2011|M11|
-Magic 2012|M12|
-Magic 2013|M13|
-Magic 2014|M14|
-Magic 2015|M15|
-Magic: The Gathering-Commander|CMD|
-Magic: The Gathering-Conspiracy|CNS|
-Masters Edition II|ME2|
-Masters Edition III|ME3|
-Masters Edition IV|ME4|
-Masters Edition|MED|
-Mirage|MIR|
-Mercadian Masques|MMQ|
-Morningtide|MOR|
-Modern Masters|MMA|
-Mirrodin|MRD|
-Mirrodin Besieged|MBS|
-MTGO Vanguard|VGO|
-New Phyrexia|NPH|
-Ninth Edition|9ED|
-Nemesis|NMS|
-Odyssey|ODY|
-Onslaught|ONS|
-Prophecy|PCY|
-Planar Chaos|PLC|
-Planeshift|PLS|
-Portal|POR|
-Portal Second Age|PO2|
-Portal Three Kingdoms|PTK|
-Premium Deck Series: Fire and Lightning|PD2|
-Premium Deck Series: Slivers|PDS|
-Ravnica: City of Guilds|RAV|
-Return to Ravnica|RTR|
-Rise of the Eldrazi|ROE|
-Scars of Mirrodin|SOM|
-Scourge|SCG|
-Shadowmoor|SHM|
-Shards of Alara|ALA|
-Saviors of Kamigawa|SOK|
-Starter 2000|S00|
-Starter 1999|S99|
-Stronghold|STH|
-Tempest|TMP|
-Theros|THS|
-Torment|TOR|
-Time Spiral|TSP|
-Time Spiral "Timeshifted"|TSB|
-Unglued|UGL|
-Unhinged|UNH|
-Urza's Destiny|UDS|
-Urza's Legacy|ULG|
-Urza's Saga|USG|
-Vanguard Set 1|VG1|
-Vanguard Set 2|VG2|
-Vanguard Set 3|VG3|
-Vanguard Set 4|VG4|
-Vintage Masters|VMA|
-Visions|VIS|
-Weatherlight|WTH|
-Worldwake|WWK|
+Unlimited Edition|2ED|
+Revised Edition|3ED|
+Fourth Edition|4ED|
+Fifth Dawn|5DN|
+Fifth Edition|5ED|
+Classic Sixth Edition|6ED|
+Seventh Edition|7ED|
+Eighth Edition|8ED|
+Tenth Edition|10E|
+Alliances|ALL|
+Apocalypse|APC|
+Alara Reborn|ARB|
+Arabian Nights|ARN|
+Anthologies|ATH|
+Antiquities|ATQ|
+Archenemy|ARC|
+Avacyn Restored|AVR|
+Betrayers of Kamigawa|BOK|
+Battle Royale Box Set|BRB|
+Beatdown Box Set|BTD|
+Born of the Gods|BNG|
+Champions of Kamigawa|CHK|
+Chronicles|CHR|
+Commander 2013 Edition|C13|
+Commander 2014 Edition|C14|
+Conflux|CON|
+Coldsnap|CSP|
+Dark Ascension|DKA|
+Darksteel|DST|
+Dissension|DIS|
+Deckmasters|DKM|
+Dragon's Maze|DGM|
+The Dark|DRK|
+Duel Decks: Ajani vs. Nicol Bolas|DDH|
+Duel Decks: Elves vs. Goblins|EVG|
+Duel Decks: Divine vs. Demonic|DDC|
+Duel Decks: Elspeth vs. Tezzeret|DDF|
+Duel Decks: Garruk vs. Liliana|DDD|
+Duel Decks: Izzet vs. Golgari|DDJ|
+Duel Decks: Heroes vs. Monsters|DDL|
+Duel Decks: Jace vs. Chandra|DD2|
+Duel Decks: Jace vs. Vraska|DDM|
+Duel Decks: Knights vs. Dragons|DDG|
+Duel Decks: Phyrexia vs. the Coalition|DDE|
+Duel Decks: Sorin vs. Tibalt|DDK|
+Duel Decks: Speed vs. Cunning|DDN|
+Duel Decks: Venser vs. Koth|DDI|
+Eventide|EVE|
+Exodus|EXO|
+Fallen Empires|FEM|
+Fate Reforged|FRF|
+Future Sight|FUT|
+From the Vault: Dragons|FVD|
+From the Vault: Exiled|FVE|
+From the Vault: Relics|FVR|
+Gatecrash|GTC|
+Guildpact|GPT|
+Homelands|HML|
+Planechase|HOP|
+Planechase 2012 Edition|PC2|
+Ice Age|ICE|
+Innistrad|ISD|
+Invasion|INV|
+Journey into Nyx|JOU|
+Judgment|JUD|
+Khans of Tarkir|KTK|
+Limited Edition Alpha|LEA|
+Limited Edition Beta|LEB|
+Legends|LEG|
+Legions|LGN|
+Lorwyn|LRW|
+Magic 2010|M10|
+Magic 2011|M11|
+Magic 2012|M12|
+Magic 2013|M13|
+Magic 2014|M14|
+Magic 2015|M15|
+Magic: The Gathering-Commander|CMD|
+Magic: The Gathering-Conspiracy|CNS|
+Masters Edition II|ME2|
+Masters Edition III|ME3|
+Masters Edition IV|ME4|
+Masters Edition|MED|
+Mirage|MIR|
+Mercadian Masques|MMQ|
+Morningtide|MOR|
+Modern Masters|MMA|
+Mirrodin|MRD|
+Mirrodin Besieged|MBS|
+MTGO Vanguard|VGO|
+New Phyrexia|NPH|
+Ninth Edition|9ED|
+Nemesis|NMS|
+Odyssey|ODY|
+Onslaught|ONS|
+Prophecy|PCY|
+Planar Chaos|PLC|
+Planeshift|PLS|
+Portal|POR|
+Portal Second Age|PO2|
+Portal Three Kingdoms|PTK|
+Premium Deck Series: Fire and Lightning|PD2|
+Premium Deck Series: Slivers|PDS|
+Ravnica: City of Guilds|RAV|
+Return to Ravnica|RTR|
+Rise of the Eldrazi|ROE|
+Scars of Mirrodin|SOM|
+Scourge|SCG|
+Shadowmoor|SHM|
+Shards of Alara|ALA|
+Saviors of Kamigawa|SOK|
+Starter 2000|S00|
+Starter 1999|S99|
+Stronghold|STH|
+Tempest|TMP|
+Theros|THS|
+Torment|TOR|
+Time Spiral|TSP|
+Time Spiral "Timeshifted"|TSB|
+Unglued|UGL|
+Unhinged|UNH|
+Urza's Destiny|UDS|
+Urza's Legacy|ULG|
+Urza's Saga|USG|
+Vanguard Set 1|VG1|
+Vanguard Set 2|VG2|
+Vanguard Set 3|VG3|
+Vanguard Set 4|VG4|
+Vintage Masters|VMA|
+Visions|VIS|
+Weatherlight|WTH|
+Worldwake|WWK|
Zendikar|ZEN|
\ No newline at end of file
diff --git a/mage-bundle.zip b/mage-bundle.zip
index a3b9977580..4bc1045812 100644
Binary files a/mage-bundle.zip and b/mage-bundle.zip differ
diff --git a/temp/startMage.bat b/temp/startMage.bat
deleted file mode 100644
index 35ca530858..0000000000
--- a/temp/startMage.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@ECHO OFF
-cd ./mage-client
-call startClient
-cd ../mage-server
-call startServer
\ No newline at end of file
diff --git a/temp/startMageWin7.bat b/temp/startMageWin7.bat
deleted file mode 100644
index c353ad6888..0000000000
--- a/temp/startMageWin7.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@ECHO OFF
-cd ./mage-client
-call startClientWin7
-cd ../mage-server
-call startServerWin7
\ No newline at end of file