Merge branch 'develop' into release

website/client/assets/css/sprites/spritesmith-main-0.css

@@ -1102,55 +1102,55 @@
   width: 68px;
   height: 68px;
 }
-.icon_background_bamboo_forest {
+.icon_background_back_of_giant_beast {
   background-image: url(/static/sprites/spritesmith-main-0.png);
   background-position: -846px -1480px;
   width: 68px;
   height: 68px;
 }
-.icon_background_beach {
+.icon_background_bamboo_forest {
   background-image: url(/static/sprites/spritesmith-main-0.png);
   background-position: -846px -1549px;
   width: 68px;
   height: 68px;
 }
-.icon_background_beehive {
+.icon_background_beach {
   background-image: url(/static/sprites/spritesmith-main-0.png);
   background-position: -1605px -1480px;
   width: 68px;
   height: 68px;
 }
-.icon_background_bell_tower {
+.icon_background_beehive {
   background-image: url(/static/sprites/spritesmith-main-0.png);
   background-position: -1536px -1480px;
   width: 68px;
   height: 68px;
 }
-.icon_background_blacksmithy {
+.icon_background_bell_tower {
   background-image: url(/static/sprites/spritesmith-main-0.png);
   background-position: -1467px -1480px;
   width: 68px;
   height: 68px;
 }
-.icon_background_blizzard {
+.icon_background_beside_well {
   background-image: url(/static/sprites/spritesmith-main-0.png);
   background-position: -1398px -1480px;
   width: 68px;
   height: 68px;
 }
-.icon_background_blue {
+.icon_background_blacksmithy {
   background-image: url(/static/sprites/spritesmith-main-0.png);
   background-position: -1329px -1480px;
   width: 68px;
   height: 68px;
 }
-.icon_background_bug_covered_log {
+.icon_background_blizzard {
   background-image: url(/static/sprites/spritesmith-main-0.png);
   background-position: -1260px -1480px;
   width: 68px;
   height: 68px;
 }
-.icon_background_buried_treasure {
+.icon_background_blue {
   background-image: url(/static/sprites/spritesmith-main-0.png);
   background-position: -1191px -1480px;
   width: 68px;