Merge branch 'develop' into api-v3

common/dist/sprites/spritesmith-largeSprites-0.css

@@ -1,12 +1,12 @@
 .2014_Fall_HealerPROMO2 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -551px -1051px;
+  background-position: -814px -272px;
   width: 90px;
   height: 90px;
 }
 .2014_Fall_Mage_PROMO9 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -761px;
+  background-position: -1265px -670px;
   width: 120px;
   height: 90px;
 }
@@ -18,7 +18,7 @@
 }
 .2014_Fall_Warrior_PROMO {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -220px;
+  background-position: -814px -363px;
   width: 90px;
   height: 90px;
 }
@@ -60,7 +60,7 @@
 }
 .promo_dilatoryDistress {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -311px;
+  background-position: -306px -402px;
   width: 90px;
   height: 90px;
 }
@@ -72,7 +72,7 @@
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -151px -1051px;
+  background-position: -452px -389px;
   width: 217px;
   height: 90px;
 }
@@ -84,7 +84,7 @@
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -820px -724px;
+  background-position: -306px -220px;
   width: 90px;
   height: 90px;
 }
@@ -96,7 +96,7 @@
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -814px -272px;
+  background-position: -460px -1051px;
   width: 90px;
   height: 90px;
 }
@@ -132,7 +132,7 @@
 }
 .promo_mystery_201405 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -642px -1051px;
+  background-position: -551px -1051px;
   width: 90px;
   height: 90px;
 }
@@ -156,7 +156,7 @@
 }
 .promo_mystery_201409 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -402px;
+  background-position: -306px -311px;
   width: 90px;
   height: 90px;
 }
@@ -168,7 +168,7 @@
 }
 .promo_mystery_201411 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -460px -1051px;
+  background-position: -820px -724px;
   width: 90px;
   height: 90px;
 }
@@ -204,7 +204,7 @@
 }
 .promo_mystery_201505 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -814px -363px;
+  background-position: -733px -1051px;
   width: 90px;
   height: 90px;
 }
@@ -222,7 +222,7 @@
 }
 .promo_mystery_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -1034px;
+  background-position: -1359px -1034px;
   width: 93px;
   height: 90px;
 }
@@ -234,7 +234,7 @@
 }
 .promo_mystery_201510 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1359px -1034px;
+  background-position: -1265px -1034px;
   width: 93px;
   height: 90px;
 }
@@ -252,13 +252,19 @@
 }
 .promo_mystery_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -670px;
+  background-position: -1265px -761px;
   width: 120px;
   height: 90px;
 }
+.promo_mystery_201602 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -642px -1051px;
+  width: 90px;
+  height: 90px;
+}
 .promo_mystery_3014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -389px;
+  background-position: -151px -1051px;
   width: 217px;
   height: 90px;
 }

common/dist/sprites/spritesmith-main-10.css

@@ -1020,133 +1020,133 @@
 }
 .Mount_Icon_TRex-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -1106px;
+  background-position: -1263px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -492px -1106px;
+  background-position: -1263px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -574px -1106px;
+  background-position: -1263px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -656px -1106px;
+  background-position: -1263px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -738px -1106px;
+  background-position: -1263px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -820px -1106px;
+  background-position: -1263px -700px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -902px -1106px;
+  background-position: -1263px -800px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -984px -1106px;
+  background-position: -1263px -900px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1066px -1106px;
+  background-position: -1263px -1000px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1148px -1106px;
+  background-position: -1263px -1100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1263px 0px;
+  background-position: -410px -1106px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1263px -100px;
+  background-position: -492px -1106px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1263px -200px;
+  background-position: -574px -1106px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1263px -300px;
+  background-position: -656px -1106px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1263px -400px;
+  background-position: -738px -1106px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Peppermint {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1263px -500px;
+  background-position: -820px -1106px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1263px -600px;
+  background-position: -902px -1106px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1263px -700px;
+  background-position: -984px -1106px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1263px -800px;
+  background-position: -1066px -1106px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Spooky {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1263px -900px;
+  background-position: -1148px -1106px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1263px -1000px;
+  background-position: -1263px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1263px -1100px;
+  background-position: -1263px -100px;
   width: 81px;
   height: 99px;
 }

common/dist/sprites/spritesmith-main-11.css

@@ -1278,139 +1278,139 @@
 }
 .Pet-TRex-Base {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1312px -500px;
+  background-position: -1394px -500px;
   width: 81px;
   height: 99px;
 }
 .Pet-TRex-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1312px -600px;
+  background-position: -1394px -600px;
   width: 81px;
   height: 99px;
 }
 .Pet-TRex-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1312px -700px;
+  background-position: -1394px -700px;
   width: 81px;
   height: 99px;
 }
 .Pet-TRex-Desert {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1312px -800px;
+  background-position: -1394px -800px;
   width: 81px;
   height: 99px;
 }
 .Pet-TRex-Golden {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1312px -900px;
+  background-position: -1394px -900px;
   width: 81px;
   height: 99px;
 }
 .Pet-TRex-Red {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1312px -1000px;
+  background-position: -1394px -1000px;
   width: 81px;
   height: 99px;
 }
 .Pet-TRex-Shade {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1312px -1100px;
+  background-position: -1394px -1100px;
   width: 81px;
   height: 99px;
 }
 .Pet-TRex-Skeleton {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1312px -1200px;
+  background-position: -1394px -1200px;
   width: 81px;
   height: 99px;
 }
 .Pet-TRex-White {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px 0px;
+  background-position: 0px -1300px;
   width: 81px;
   height: 99px;
 }
 .Pet-TRex-Zombie {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -100px;
+  background-position: -82px -1300px;
   width: 81px;
   height: 99px;
 }
 .Pet-Tiger-Veteran {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -200px;
+  background-position: -1312px -500px;
   width: 81px;
   height: 99px;
 }
 .Pet-TigerCub-Base {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -300px;
+  background-position: -1312px -600px;
   width: 81px;
   height: 99px;
 }
 .Pet-TigerCub-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -400px;
+  background-position: -1312px -700px;
   width: 81px;
   height: 99px;
 }
 .Pet-TigerCub-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -500px;
+  background-position: -1312px -800px;
   width: 81px;
   height: 99px;
 }
 .Pet-TigerCub-Desert {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -600px;
+  background-position: -1312px -900px;
   width: 81px;
   height: 99px;
 }
 .Pet-TigerCub-Golden {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -700px;
+  background-position: -1312px -1000px;
   width: 81px;
   height: 99px;
 }
 .Pet-TigerCub-Peppermint {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -800px;
+  background-position: -1312px -1100px;
   width: 81px;
   height: 99px;
 }
 .Pet-TigerCub-Red {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -900px;
+  background-position: -1312px -1200px;
   width: 81px;
   height: 99px;
 }
 .Pet-TigerCub-Shade {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -1000px;
+  background-position: -1394px 0px;
   width: 81px;
   height: 99px;
 }
 .Pet-TigerCub-Skeleton {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -1100px;
+  background-position: -1394px -100px;
   width: 81px;
   height: 99px;
 }
 .Pet-TigerCub-Spooky {
   background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -1200px;
+  background-position: -1394px -200px;
   width: 81px;
   height: 99px;
 }
 .Pet-TigerCub-White {
   background-image: url(spritesmith-main-11.png);
-  background-position: 0px -1300px;
+  background-position: -1394px -300px;
   width: 81px;
   height: 99px;
 }
 .Pet-TigerCub-Zombie {
   background-image: url(spritesmith-main-11.png);
-  background-position: -82px -1300px;
+  background-position: -1394px -400px;
   width: 81px;
   height: 99px;
 }

common/dist/sprites/spritesmith-main-7.css

@@ -66,61 +66,61 @@
 }
 .Mount_Body_Octopus-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -848px -1346px;
+  background-position: -1452px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -954px -1346px;
+  background-position: -1452px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1060px -1346px;
+  background-position: -1452px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1166px -1346px;
+  background-position: -1452px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1272px -1346px;
+  background-position: -1452px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px 0px;
+  background-position: -1452px -1272px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -106px;
+  background-position: 0px -1452px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Orca-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -212px;
+  background-position: -106px -1452px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Owl-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -318px;
+  background-position: -212px -1452px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Owl-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -424px;
+  background-position: -318px -1452px;
   width: 105px;
   height: 105px;
 }
@@ -972,73 +972,73 @@
 }
 .Mount_Body_TigerCub-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -530px;
+  background-position: -848px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -636px;
+  background-position: -954px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -742px;
+  background-position: -1060px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -848px;
+  background-position: -1166px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -954px;
+  background-position: -1272px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Peppermint {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -1060px;
+  background-position: -1452px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -1166px;
+  background-position: -1452px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -1272px;
+  background-position: -1452px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -1452px;
+  background-position: -1452px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Spooky {
   background-image: url(spritesmith-main-7.png);
-  background-position: -106px -1452px;
+  background-position: -1452px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -212px -1452px;
+  background-position: -1452px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -318px -1452px;
+  background-position: -1452px -636px;
   width: 105px;
   height: 105px;
 }

common/dist/sprites/spritesmith-main-9.css

@@ -6,187 +6,187 @@
 }
 .Mount_Head_Sabretooth-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -136px -272px;
+  background-position: 0px -272px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Sabretooth-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -680px 0px;
+  background-position: -680px -544px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Sabretooth-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -136px;
+  background-position: -408px -408px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Sabretooth-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -136px -136px;
+  background-position: 0px -136px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Sabretooth-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -272px 0px;
+  background-position: -136px -136px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Sabretooth-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -272px -136px;
+  background-position: -272px 0px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Sabretooth-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -272px;
+  background-position: -272px -136px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Seahorse-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -318px;
+  background-position: -106px -1219px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -212px;
+  background-position: 0px -1219px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -106px;
+  background-position: -1240px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px 0px;
+  background-position: -1240px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1060px -1113px;
+  background-position: -1240px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -954px -1113px;
+  background-position: -1240px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -848px -1113px;
+  background-position: -1240px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -742px -1113px;
+  background-position: -1240px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -636px -1113px;
+  background-position: -1240px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -530px -1113px;
+  background-position: -1240px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -424px -1113px;
+  background-position: -1240px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -318px -1113px;
+  background-position: -1240px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -212px -1113px;
+  background-position: -1240px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -636px -901px;
+  background-position: -1060px -1113px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -530px -901px;
+  background-position: -954px -1113px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -424px -901px;
+  background-position: -848px -1113px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -318px -901px;
+  background-position: -742px -1113px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -212px -901px;
+  background-position: -636px -1113px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -106px -901px;
+  background-position: -530px -1113px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -901px;
+  background-position: -424px -1113px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -922px -742px;
+  background-position: -318px -1113px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -922px -636px;
+  background-position: -212px -1113px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -922px -530px;
+  background-position: 0px -1007px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -424px;
+  background-position: -1028px -848px;
   width: 105px;
   height: 105px;
 }
@@ -198,61 +198,61 @@
 }
 .Mount_Head_Slime-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -530px;
+  background-position: -1028px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -636px;
+  background-position: -1028px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -742px;
+  background-position: -1028px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -848px;
+  background-position: -1028px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -954px;
+  background-position: -1028px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -1060px;
+  background-position: -1028px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -1219px;
+  background-position: -1028px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -106px -1219px;
+  background-position: -106px -901px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -816px -345px;
+  background-position: -816px -451px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -816px -451px;
+  background-position: -318px -1007px;
   width: 105px;
   height: 105px;
 }
@@ -348,133 +348,133 @@
 }
 .Mount_Head_TRex-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -680px -544px;
+  background-position: -680px -408px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_TRex-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -680px -408px;
+  background-position: -680px -272px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_TRex-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -680px -272px;
+  background-position: -680px -136px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_TRex-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -680px -136px;
+  background-position: -680px 0px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_TRex-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px 0px;
+  background-position: -544px -544px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_TRex-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -544px -544px;
+  background-position: -408px -544px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_TRex-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -408px -544px;
+  background-position: -272px -544px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_TRex-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -272px -544px;
+  background-position: -136px -544px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_TRex-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -136px -544px;
+  background-position: 0px -544px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_TRex-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -544px;
+  background-position: -544px -408px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_TigerCub-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -742px -901px;
+  background-position: -922px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -848px -901px;
+  background-position: -922px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px 0px;
+  background-position: -922px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -106px;
+  background-position: 0px -901px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -212px;
+  background-position: -212px -1219px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Peppermint {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -318px;
+  background-position: -212px -901px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -424px;
+  background-position: -318px -901px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -530px;
+  background-position: -424px -901px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -636px;
+  background-position: -530px -901px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Spooky {
   background-image: url(spritesmith-main-9.png);
-  background-position: -212px -1219px;
+  background-position: -636px -901px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -848px;
+  background-position: -742px -901px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -1007px;
+  background-position: -848px -901px;
   width: 105px;
   height: 105px;
 }
@@ -492,7 +492,7 @@
 }
 .Mount_Head_Unicorn-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -318px -1007px;
+  background-position: -816px -345px;
   width: 105px;
   height: 105px;
 }
@@ -606,73 +606,73 @@
 }
 .Mount_Head_Wolf-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -544px -408px;
+  background-position: -544px -272px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Wolf-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -544px -272px;
+  background-position: -544px -136px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Wolf-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -544px -136px;
+  background-position: -544px 0px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Wolf-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -544px 0px;
+  background-position: 0px 0px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Wolf-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -408px -408px;
+  background-position: -272px -408px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Wolf-Peppermint {
   background-image: url(spritesmith-main-9.png);
-  background-position: -272px -408px;
+  background-position: -136px -408px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Wolf-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -136px -408px;
+  background-position: 0px -408px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Wolf-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -408px;
+  background-position: -408px -272px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Wolf-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -408px -272px;
+  background-position: -408px -136px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Wolf-Spooky {
   background-image: url(spritesmith-main-9.png);
-  background-position: -408px -136px;
+  background-position: -408px 0px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Wolf-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -408px 0px;
+  background-position: -272px -272px;
   width: 135px;
   height: 135px;
 }
 .Mount_Head_Wolf-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -272px -272px;
+  background-position: -136px -272px;
   width: 135px;
   height: 135px;
 }
@@ -1344,13 +1344,13 @@
 }
 .Mount_Icon_Frog-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -106px -680px;
+  background-position: -530px -680px;
   width: 105px;
   height: 114px;
 }
 .Mount_Icon_Frog-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -212px -680px;
+  background-position: -424px -680px;
   width: 105px;
   height: 114px;
 }
@@ -1362,25 +1362,25 @@
 }
 .Mount_Icon_Frog-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -424px -680px;
+  background-position: -212px -680px;
   width: 105px;
   height: 114px;
 }
 .Mount_Icon_Frog-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -530px -680px;
+  background-position: -106px -680px;
   width: 105px;
   height: 114px;
 }
 .Mount_Icon_Frog-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -636px -680px;
+  background-position: 0px -680px;
   width: 105px;
   height: 114px;
 }
 .Mount_Icon_Frog-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -816px 0px;
+  background-position: -816px -230px;
   width: 105px;
   height: 114px;
 }
@@ -1392,13 +1392,13 @@
 }
 .Mount_Icon_Frog-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -816px -230px;
+  background-position: -816px 0px;
   width: 105px;
   height: 114px;
 }
 .Mount_Icon_Frog-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -680px;
+  background-position: -636px -680px;
   width: 105px;
   height: 114px;
 }

common/locales/en/gear.json

@@ -580,6 +580,8 @@
   "headMystery201512Notes": "These flames burn cold with pure intellect. Confers no benefit. December 2015 Subscriber Item.",
   "headMystery201601Text": "Helm of True Resolve",
   "headMystery201601Notes": "Stay resolute, brave champion! Confers no benefit. January 2016 Subscriber Item.",
+  "headMystery201602Text": "Heartbreaker Hood",
+  "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
   "headMystery301404Text": "Fancy Top Hat",
   "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
   "headMystery301405Text": "Basic Top Hat",
@@ -754,6 +756,8 @@
   "backMystery201507Notes": "Surf off the Diligent Docks and ride the waves in Inkomplete Bay! Confers no benefit. July 2015 Subscriber Item.",
   "backMystery201510Text": "Goblin Tail",
   "backMystery201510Notes": "Prehensile and powerful! Confers no benefit. October 2015 Subscriber Item.",
+  "backMystery201602Text": "Heartbreaker Cape",
+  "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
 
   "backSpecialWonderconRedText": "Mighty Cape",
   "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.",

common/locales/en/subscriber.json

@@ -98,6 +98,7 @@
     "mysterySet201511": "Wood Warrior Set",
     "mysterySet201512": "Winter Flame Set",
     "mysterySet201601": "Champion of Resolution Set",
+    "mysterySet201602": "Heartbreaker Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
 

common/script/content/gear/sets/mystery.js

@@ -148,6 +148,12 @@ let back = {
     mystery: '201510',
     value: 0,
   },
+  201602: {
+    text: t('backMystery201602Text'),
+    notes: t('backMystery201602Notes'),
+    mystery: '201602',
+    value: 0,
+  },
 };
 
 let eyewear = {
@@ -268,6 +274,12 @@ let head = {
     mystery: '201601',
     value: 0,
   },
+  201602: {
+    text: t('headMystery201602Text'),
+    notes: t('headMystery201602Notes'),
+    mystery: '201602',
+    value: 0,
+  },
   301404: {
     text: t('headMystery301404Text'),
     notes: t('headMystery301404Notes'),

common/script/content/index.js

@@ -1036,11 +1036,13 @@ api.specialMounts = {
 api.timeTravelStable = {
   pets: {
     'Mammoth-Base': t('mammoth'),
-    'MantisShrimp-Base': t('mantisShrimp')
+    'MantisShrimp-Base': t('mantisShrimp'),
+    'Phoenix-Base': t('phoenix'),
   },
   mounts: {
     'Mammoth-Base': t('mammoth'),
-    'MantisShrimp-Base': t('mantisShrimp')
+    'MantisShrimp-Base': t('mantisShrimp'),
+    'Phoenix-Base': t('phoenix'),
   }
 };
 
@@ -1647,7 +1649,7 @@ api.quests = {
   },
   evilsanta: {
     canBuy: (function() {
-      return true;
+      return false;
     }),
     text: t('questEvilSantaText'),
     notes: t('questEvilSantaNotes'),
@@ -1673,7 +1675,7 @@ api.quests = {
   },
   evilsanta2: {
     canBuy: (function() {
-      return true;
+      return false;
     }),
     text: t('questEvilSanta2Text'),
     notes: t('questEvilSanta2Notes'),

common/script/content/mystery-sets.js

@@ -98,6 +98,10 @@ let mysterySets = {
     start: '2016-01-26',
     end: '2016-02-02',
   },
+  201602: {
+    start: '2016-02-24',
+    end: '2016-03-02',
+  },
   301404: {
     start: '3014-03-24',
     end: '3014-04-02',

migrations/mystery_items.js

@@ -2,7 +2,7 @@ var _id = '';
 var update = {
   $addToSet: {
     'purchased.plan.mysteryItems':{
-      $each:['head_mystery_201601','shield_mystery_201601']
+      $each:['head_mystery_201602','back_mystery_201602']
     }
   }
 };

website/src/index.js

@@ -17,7 +17,7 @@ const IS_DEV = nconf.get('IS_DEV');
 const CORES = Number(nconf.get('WEB_CONCURRENCY')) || 0;
 
 // Initialize New Relic
-if (IS_PROD) require('newrelic');
+if (IS_PROD && nconf.get('NEW_RELIC_ENABLED') === 'true') require('newrelic');
 
 // Setup the cluster module
 if (CORES !== 0 && cluster.isMaster && (IS_DEV || IS_PROD)) {

website/src/libs/api-v2/utils.js

@@ -167,8 +167,13 @@ module.exports.analytics = { track: function() { }, trackPurchase: function() {
  * Load nconf and define default configuration values if config.json or ENV vars are not found
  */
 module.exports.setupConfig = function(){
+  IS_PROD = nconf.get('NODE_ENV') === 'production';
+  BASE_URL = nconf.get('BASE_URL');
+
   if (nconf.get('IS_DEV'))
     Error.stackTraceLimit = Infinity;
+  if (IS_PROD && nconf.get('NEW_RELIC_ENABLED') === 'true')
+    require('newrelic');
 
   var analytics = IS_PROD && require('./api-v2/analytics');
   var analyticsTokens = {

website/src/libs/api-v3/logger.js

@@ -9,7 +9,7 @@ const IS_TEST = nconf.get('IS_TEST');
 let logger = new winston.Logger();
 
 if (IS_PROD) {
-  // TODO production logging, use loggly
+  // TODO production logging, use loggly and new relic too
   // log errors to console too
 } else if (IS_TEST) {
   // Do not log anything when testing

website/views/shared/new-stuff.jade

@@ -1,21 +1,35 @@
-h2 2/17/2016 - ANDROID APP IN PORTUGUESE, LITHUANIAN, AND POLISH! PLUS, NEW YEAR'S RESOLUTION CHALLENGE WINNERS
+h2 2/24/2016 - PHOENIXES IN THE TIME TRAVEL STABLE! FEBRUARY MYSTERY SET!
   hr
   tr
     td
-      h3 Android App Update: Translations
-      p <a href='https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica&hl=en' target='_blank'>We've released an update to our Android app!</a> It is now translated into Portuguese, Lithuanian, and Polish. Many thanks to our amazing <a href='https://www.transifex.com/habitrpg/habitica-android/' target='_blank'>volunteer translators</a> for all their time and effort! More languages will be coming soon in future updates. If you are fluent in another language and would like to help, come <a href='https://www.transifex.com/habitrpg/habitica-android/' target='_blank'>join our translation team!</a>
-      p.small.muted by viirus, Portuguese translation team, Lithuanian translation team, and Polish translation team
+      .Pet-Phoenix-Base.pull-right
+      h3 Phoenixes Available from the Time Travelers!
+      p The Time Travelers have made a stop in the past to pick up some rare <a href='/#/options/inventory/timetravelers'>Phoenix pets and mounts</a> from last fall's World Boss battle. Get them now!
+      br
+      p To unlock the Phoenixes, you'll need Mystic Hourglasses, which are awarded to people who have been <a href='/#/options/settings/subscription'>subscribers</a> for three consecutive months or more. Thank you so much for your support--Habitica really does depend on you.
   tr
     td
-      h3 New Year's Resolution Challenge Winners
-      p The winners in our official <a href='https://habitica.wordpress.com/category/new-years-resolutions/' target='_blank'>New Year's Resolution Challenge</a> have been randomly selected, and the lucky Habiticans are... Snellopy, Papyrus, PreacherMYS, embustation, and djmjr! Congratulations to them, and congratulations to all of the participants who prepared themselves to surmount the Challenges of 2016.
-      p.small.muted by redphoenix
+      .promo_mystery_201602.pull-right
+      h3 February Subscriber Items
+      p The February Subscriber Items have been revealed: the Heartbreaker Item Set! All February subscribers will receive the Heartbreaker Cape and the Heartbreaker Hood. You still have five days to <a href='/#/options/settings/subscription'>subscribe</a> and receive the item set! Thank you so much for your support - we really do rely on you to keep Habitica free to use and running smoothly.
+      p.small.muted by Lemoness
 
 if menuItem !== 'oldNews'
   hr
   a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h2 2/17/2016 - ANDROID APP IN PORTUGUESE, LITHUANIAN, AND POLISH! PLUS, NEW YEAR'S RESOLUTION CHALLENGE WINNERS
+    tr
+      td
+        h3 Android App Update: Translations
+        p <a href='https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica&hl=en' target='_blank'>We've released an update to our Android app!</a> It is now translated into Portuguese, Lithuanian, and Polish. Many thanks to our amazing <a href='https://www.transifex.com/habitrpg/habitica-android/' target='_blank'>volunteer translators</a> for all their time and effort! More languages will be coming soon in future updates. If you are fluent in another language and would like to help, come <a href='https://www.transifex.com/habitrpg/habitica-android/' target='_blank'>join our translation team!</a>
+        p.small.muted by viirus, Portuguese translation team, Lithuanian translation team, and Polish translation team
+    tr
+      td
+        h3 New Year's Resolution Challenge Winners
+        p The winners in our official <a href='https://habitica.wordpress.com/category/new-years-resolutions/' target='_blank'>New Year's Resolution Challenge</a> have been randomly selected, and the lucky Habiticans are... Snellopy, Papyrus, PreacherMYS, embustation, and djmjr! Congratulations to them, and congratulations to all of the participants who prepared themselves to surmount the Challenges of 2016.
+        p.small.muted by redphoenix
   h2 2/8/2016 - VALENTINE'S DAY AND MONKEY PET QUEST!!
     tr
       td