Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into menu_name_change

.gitignore

@@ -28,6 +28,10 @@ coverage
 coverage.html
 common/dist/scripts/*
 common/dist/sprites/habitrpg-shared.css
-.elasticbeanstalk/config.yml
 
 test/spec/mocks/translations.js
+
+# Elastic Beanstalk Files
+.elasticbeanstalk/*
+!.elasticbeanstalk/*.cfg.yml
+!.elasticbeanstalk/*.global.yml

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

@@ -1,6 +1,6 @@
 .2014_Fall_HealerPROMO2 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -814px -272px;
+  background-position: -460px -1051px;
   width: 90px;
   height: 90px;
 }
@@ -24,7 +24,7 @@
 }
 .promo_android {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -277px;
+  background-position: -943px -101px;
   width: 175px;
   height: 175px;
 }
@@ -60,7 +60,7 @@
 }
 .promo_dilatoryDistress {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -402px;
+  background-position: -306px -220px;
   width: 90px;
   height: 90px;
 }
@@ -72,7 +72,7 @@
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -389px;
+  background-position: -151px -1051px;
   width: 217px;
   height: 90px;
 }
@@ -84,7 +84,7 @@
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -220px;
+  background-position: -306px -402px;
   width: 90px;
   height: 90px;
 }
@@ -96,13 +96,13 @@
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -460px -1051px;
+  background-position: -814px -272px;
   width: 90px;
   height: 90px;
 }
 .promo_habitica {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -101px;
+  background-position: -943px -277px;
   width: 175px;
   height: 175px;
 }
@@ -264,7 +264,7 @@
 }
 .promo_mystery_3014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -151px -1051px;
+  background-position: -452px -389px;
   width: 217px;
   height: 90px;
 }
@@ -282,13 +282,13 @@
 }
 .promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -331px -967px;
+  background-position: 0px -967px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -356px -982px;
+  background-position: -25px -982px;
   width: 60px;
   height: 60px;
 }
@@ -312,13 +312,13 @@
 }
 .promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -967px;
+  background-position: -331px -967px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -25px -982px;
+  background-position: -356px -982px;
   width: 60px;
   height: 60px;
 }
@@ -336,13 +336,13 @@
 }
 .promo_springclasses2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -542px;
+  background-position: -943px -633px;
   width: 288px;
   height: 90px;
 }
 .promo_springclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -633px;
+  background-position: -943px -542px;
   width: 288px;
   height: 90px;
 }

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

@@ -1152,13 +1152,13 @@
 }
 .headAccessory_mystery_301405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1001px -1228px;
+  background-position: -910px -1228px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_301405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -910px -1228px;
+  background-position: -1001px -1228px;
   width: 90px;
   height: 90px;
 }
@@ -1176,13 +1176,13 @@
 }
 .shop_headAccessory_mystery_301405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1418px;
+  background-position: -1623px -1418px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_301405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1418px;
+  background-position: -1582px -1418px;
   width: 40px;
   height: 40px;
 }
@@ -1242,97 +1242,97 @@
 }
 .headAccessory_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -364px -1319px;
+  background-position: -1400px -910px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -455px -1319px;
+  background-position: -1400px -1001px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -546px -1319px;
+  background-position: -1400px -1092px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -637px -1319px;
+  background-position: -1400px -1183px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -728px -1319px;
+  background-position: 0px -1319px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -819px -1319px;
+  background-position: -91px -1319px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -910px -1319px;
+  background-position: -182px -1319px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1001px -1319px;
+  background-position: -273px -1319px;
   width: 90px;
   height: 90px;
 }
 .head_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -910px;
+  background-position: -364px -1319px;
   width: 90px;
   height: 90px;
 }
 .head_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -1001px;
+  background-position: -455px -1319px;
   width: 90px;
   height: 90px;
 }
 .head_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -1092px;
+  background-position: -546px -1319px;
   width: 90px;
   height: 90px;
 }
 .head_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -1183px;
+  background-position: -637px -1319px;
   width: 90px;
   height: 90px;
 }
 .head_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -1319px;
+  background-position: -728px -1319px;
   width: 90px;
   height: 90px;
 }
 .head_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -91px -1319px;
+  background-position: -819px -1319px;
   width: 90px;
   height: 90px;
 }
 .head_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -182px -1319px;
+  background-position: -910px -1319px;
   width: 90px;
   height: 90px;
 }
 .head_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -273px -1319px;
+  background-position: -1001px -1319px;
   width: 90px;
   height: 90px;
 }
@@ -1422,97 +1422,97 @@
 }
 .shop_headAccessory_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1049px;
+  background-position: -1582px -1213px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1049px;
+  background-position: -1623px -1172px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1008px;
+  background-position: -1582px -1172px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1008px;
+  background-position: -820px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -967px;
+  background-position: -1623px -1131px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -967px;
+  background-position: -1582px -1131px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -926px;
+  background-position: -1623px -1090px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -926px;
+  background-position: -1582px -1090px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1213px;
+  background-position: -1623px -1049px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1172px;
+  background-position: -1582px -1049px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1172px;
+  background-position: -1623px -1008px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -820px -1624px;
+  background-position: -1582px -1008px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1131px;
+  background-position: -1623px -967px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1131px;
+  background-position: -1582px -967px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1090px;
+  background-position: -1623px -926px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1090px;
+  background-position: -1582px -926px;
   width: 40px;
   height: 40px;
 }