Merge branch 'develop' into kelsin-develop

.babelrc

@@ -0,0 +1,4 @@
+{
+  "presets": ["es2015"],
+  "plugins": ["syntax-async-functions","transform-regenerator"]
+}

.ebextensions/01-increase-timeout.config

@@ -0,0 +1,7 @@
+option_settings:
+  - namespace: aws:elasticbeanstalk:command
+    option_name: Timeout
+    value: 1800
+  - namespace: aws:elb:policies
+    option_name: ConnectionSettingIdleTimeout
+    value: 900

.eslintignore

@@ -0,0 +1,33 @@
+# Compiled and vendored files
+common/dist/
+common/transpiled-babel/
+coverage/
+database_reports/
+migrations/
+website/build/
+website/transpiled-babel/
+
+# The files in website/public/js should be moved out and browserified
+website/public/
+
+# Temporarilly disabled. These should be removed when the linting errors are fixed
+common/script/index.js
+common/script/content/index.js
+common/script/ops/**/*.js
+common/script/fns/**/*.js
+common/script/libs/**/*.js
+common/script/public/**/*.js
+
+website/src/**/*.js
+
+debug-scripts/*
+tasks/*.js
+gulpfile.js
+Gruntfile.js
+newrelic.js
+
+test/api-legacy/**/*
+test/common/simulations/**/*
+test/content/**/*
+test/server_side/**/*
+test/spec/**/*

.eslintrc

@@ -1,126 +1,6 @@
 {
-    "parser": "babel-eslint",
-    "plugins": ["babel"],
-    "rules": {
-        "indent": [2, 2, {"SwitchCase": 1}],
-        "quotes": [2, "single"],
-        "linebreak-style": [2, "unix"],
-        "semi": [2, "always"],
-        "no-extra-parens": 2,
-        "no-unexpected-multiline": 2,
-        "block-scoped-var": 2,
-        "dot-location": [2, "property"],
-        "dot-notation": 2,
-        "eqeqeq": 2,
-        "no-caller": 2,
-        "no-eval": 2,
-        "no-extend-native": 2,
-        "no-extra-bind": 2,
-        "no-fallthrough": 2,
-        "no-floating-decimal": 2,
-        "no-empty-pattern": 2,
-        "no-empty-label": 2,
-        "no-lone-blocks": 2,
-        "no-loop-func": 2,
-        "no-implicit-coercion": 2,
-        "no-implied-eval": 2,
-        "no-native-reassign": 2,
-        "no-new-func": 2,
-        "no-new-wrappers": 2,
-        "no-new": 2,
-        "no-octal-escape": 2,
-        "no-octal": 2,
-        "no-process-env": 2,
-        "no-proto": 2,
-        "no-implied-eval": 2,
-        "yoda": 2,
-        "wrap-iife": 2,
-        "radix": 2,
-        "no-with": 2,
-        "no-void": 2,
-        "no-useless-concat": 2,
-        "no-unused-expressions": 2,
-        "no-throw-literal": 2,
-        "no-sequences": 2,
-        "no-self-compare": 2,
-        "no-return-assign": 2,
-        "no-redeclare": 2,
-        "strict": [0, "global"],
-        "no-delete-var": 2,
-        "no-label-var": 2,
-        "no-shadow-restricted-names": 2,
-        "no-shadow": [2, { "builtinGlobals": true }],
-        "no-undef-init": 2,
-        "no-undef": [2, { "typeof": true }],
-        "no-unused-vars": 2,
-        "no-use-before-define": 2,
-        "global-require": 2,
-        "handle-callback-err": [2, "^.*(e|E)rr"],
-        "no-path-concat": 2,
-        "arrow-spacing": 2,
-        "constructor-super": 2,
-        "generator-star-spacing": 2,
-        "no-arrow-condition": 2,
-        "no-class-assign": 2,
-        "no-const-assign": 2,
-        "no-dupe-class-members": 2,
-        "no-this-before-super": 2,
-        "no-var": 2,
-        "object-shorthand": 0,
-        "prefer-const": 0,
-        "prefer-spread": 2,
-        "prefer-template": 2,
-        "array-bracket-spacing": [2, "never"],
-        "brace-style": [2, "1tbs", { "allowSingleLine": false }],
-        "camelcase": 2,
-        "comma-spacing": 2,
-        "comma-style": [2, "last"],
-        "comma-dangle": [2, "always-multiline"],
-        "computed-property-spacing": [2, "never"],
-        "consistent-this": [0, "self"],
-        "func-names": 2,
-        "func-style": [2, "declaration", { "allowArrowFunctions": true }],
-        "block-spacing": [2, "always"],
-        "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
-        "max-nested-callbacks": [2, 3],
-        "new-cap": 0,
-        "new-parens": 2,
-        "newline-after-var": 0,
-        "no-array-constructor": 2,
-        "no-continue": 2,
-        "no-lonely-if": 2,
-        "no-mixed-spaces-and-tabs": 2,
-        "no-trailing-spaces": 2,
-        "no-spaced-func": 2,
-        "no-new-object": 2,
-        "no-nested-ternary": 2,
-        "one-var": [2, "never"],
-        "operator-linebreak": [2, "after"],
-        "quote-props": [2, "as-needed"],
-        "semi-spacing": [2, {"before": false, "after": true}],
-        "space-after-keywords": 2,
-        "space-before-blocks": 2,
-        "space-before-function-paren": 2,
-        "space-before-keywords": 2,
-        "space-in-parens": [2, "never"],
-        "space-infix-ops": 2,
-        "space-return-throw-case": 2,
-        "space-unary-ops": 2,
-        "spaced-comment": [2, "always", { "exceptions": ["-"]}],
-        "padded-blocks": [2, "never"],
-        "no-multiple-empty-lines": [2, {"max": 2}],
-        "generator-star-spacing": 0,
-        "babel/new-cap": 2,
-        "babel/object-shorthand": 2,
-        "babel/no-await-in-loop": 2
-    },
-    "env": {
-        "es6": true,
-        "mocha": true,
-        "node": true
-    },
-    "ecmaFeatures" : {
-        "modules": true
-    },
-    "extends": "eslint:recommended"
+  "extends": [
+    "habitrpg/server",
+    "habitrpg/babel"
+  ]
 }

.github/CONTRIBUTING.md

@@ -2,6 +2,10 @@
 
 [Please see these instructions for reporting bugs](https://github.com/HabitRPG/habitrpg/issues/2760)
 
+# Pull Request
+
+[Please see these instructions for adding a pull request](http://habitica.wikia.com/wiki/Using_Habitica_Git#Pull_Request)
+
 # Requesting a feature
 
 Habitica uses [Trello](https://trello.com/b/EpoYEYod/habitica) to track feature requests. [Read more](https://trello.com/c/odmhIqyW/440-read-first-table-of-contents).

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,22 @@
+[//]: # (Before logging this issue, look through common problems at https://github.com/HabitRPG/habitrpg/issue If you find your issue there, read at least the first post to see if there is a workaround for you.)
+
+[//]: # (Github is primarilly used for reporting bugs. If you have a feature request, use "Help > Request a Feature" so that the feature request can be vetted by the larger Habitica community.)
+
+[//]: # (To report a bug in one of the mobile apps, please report it in the correct repository. Android: https://github.com/HabitRPG/habitrpg-android, iOS: https://github.com/HabitRPG/habitrpg-ios)
+
+[//]: # (For more guidelines see https://github.com/HabitRPG/habitrpg/issues/2760 for more info)
+
+[//]: # (Fill out relevant information - UUID is found in Settings -> API)
+General Info
+  * UUID: 
+  * Browser: 
+  * OS: 
+
+### Description
+[//]: # (Describe bug in detail here. Include pictures if helpful.)
+
+
+
+#### Console Errors
+[//]: # (Include any javscript console errors here)
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+[//]: # (Note: See http://habitica.wikia.com/wiki/Using_Habitica_Git#Pull_Request for more info)
+
+[//]: # (Put Issue # or URL here, if applicable. This will automatically close the issue if your PR is merged in)
+Fixes put_issue_url_here
+
+### Changes
+[//]: # (Describe the changes that were made in detail here. Include pictures if necessary)
+
+
+
+[//]: # (Put User ID in here - found in Settings -> API)
+----
+UUID: 

.gitignore

@@ -1,6 +1,8 @@
 .DS_Store
 website/public/gen
 website/public/common
+website/transpiled-babel/
+common/transpiled-babel/
 node_modules
 *.swp
 .idea*
@@ -28,6 +30,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

.nvmrc

@@ -1 +1 @@
-0.10.40
+4.3.1

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - '0.10'
+  - '4.3.1'
 before_install:
   - "npm install -g npm@2"
   - "npm install -g gulp"

Dockerfile

@@ -11,6 +11,8 @@ RUN apt-get install -y \
     build-essential \
     curl \
     git \
+    libfontconfig1 \
+    libfreetype6 \
     libkrb5-dev \
     python
 

Gruntfile.js

@@ -1,5 +1,5 @@
 /*global module:false*/
-require('babel-core/register');
+require('babel-register');
 var _ = require('lodash');
 module.exports = function(grunt) {
 
@@ -60,7 +60,7 @@ module.exports = function(grunt) {
           {expand: true, cwd: '', src: 'common/dist/sprites/spritesmith*.png', dest: 'website/build/'},
           {expand: true, cwd: '', src: 'common/img/sprites/backer-only/*.gif', dest: 'website/build/'},
           {expand: true, cwd: '', src: 'common/img/sprites/npc_ian.gif', dest: 'website/build/'},
-          {expand: true, cwd: '', src: 'common/img/sprites/quest_burnout.gif', dest: 'website/build/'},
+          {expand: true, cwd: '', src: 'common/img/sprites/quest_*.gif', dest: 'website/build/'},
           {expand: true, cwd: 'website/public/', src: 'bower_components/bootstrap/dist/fonts/*', dest: 'website/build/'}
         ]
       }
@@ -80,7 +80,7 @@ module.exports = function(grunt) {
           'website/build/common/dist/sprites/*.png',
           'website/build/common/img/sprites/backer-only/*.gif',
           'website/build/common/img/sprites/npc_ian.gif',
-          'website/build/common/img/sprites/quest_burnout.gif',
+          'website/build/common/img/sprites/quest_*.gif',
           'website/build/bower_components/bootstrap/dist/fonts/*'
         ],
         dest: 'website/build/*.css'

Procfile

@@ -1 +1 @@
-web: node ./website/src/server.js
+web: node ./website/transpiled-babel/server.js

README.md

@@ -10,3 +10,21 @@ For an introduction to the technologies used and how the software is organized,
 To set up a local install of Habitica for development and testing, see [Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally), which contains instructions for Windows, *nix / Mac OS, and Vagrant.
 
 Then read [Guidance for Blacksmiths](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths) for additional instructions and useful tips.
+
+## Debug Scripts
+
+In the `./debug-scripts/` folder, there are a few files. Here's a sample:
+
+```bash
+grant-all-equipment.js
+grant-all-mounts.js
+grant-all-pets.js
+```
+
+You can run them by doing:
+
+```bash
+node debug-scripts/name-of-script.js
+```
+
+If there are more arguments required to make the script work, it will print out the usage and an explanation of what the script does.

bower.json

@@ -37,12 +37,12 @@
     "jquery-ui": "1.10.3",
     "jquery.cookie": "1.4.0",
     "js-emoji": "snicker/js-emoji#f25d8a303f",
-    "marked": "0.2.9",
     "ngInfiniteScroll": "1.0.0",
     "pnotify": "1.3.1",
     "sticky": "*",
     "swagger-ui": "wordnik/swagger-ui#v2.0.24",
-    "smart-app-banner": "78ef9c0679723b25be1a0ae04f7b4aef7cbced4f"
+    "smart-app-banner": "78ef9c0679723b25be1a0ae04f7b4aef7cbced4f",
+    "habitica-markdown": "^1.1.0"
   },
   "devDependencies": {
     "angular-mocks": "1.3.9"

common/.eslintrc

@@ -0,0 +1,4 @@
+{
+  "extends": "habitrpg/browser"
+}
+

common/browserify.js

@@ -0,0 +1,7 @@
+var shared = require('./script/index');
+var _ = require('lodash');
+var moment = require('moment');
+
+window.habitrpgShared = shared;
+window._ = _;
+window.moment = moment;

common/css/index.css

@@ -1,9 +1,9 @@
 /* Comment out for holiday events */
-.npc_ian {
+/* .npc_ian {
   background: url("/common/img/sprites/npc_ian.gif") no-repeat;
   width: 78px;
   height: 135px;
-} 
+} */
 
 .quest_burnout {
   background: url("/common/img/sprites/quest_burnout.gif") no-repeat;
@@ -11,6 +11,12 @@
   height: 249px;
 }
 
+.quest_bewilder {
+  background: url("/common/img/sprites/quest_bewilder.gif") no-repeat;
+  width: 219px;
+  height: 219px;
+}
+
 .Gems {
   display:inline-block;
   margin-right:5px;

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

@@ -1,108 +1,132 @@
 .2014_Fall_HealerPROMO2 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -551px -1051px;
+  background-position: -842px -1203px;
   width: 90px;
   height: 90px;
 }
 .2014_Fall_Mage_PROMO9 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -761px;
+  background-position: -813px -569px;
   width: 120px;
   height: 90px;
 }
 .2014_Fall_RoguePROMO3 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -943px;
+  background-position: -977px -1112px;
   width: 105px;
   height: 90px;
 }
 .2014_Fall_Warrior_PROMO {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -220px;
+  background-position: -91px -1295px;
   width: 90px;
   height: 90px;
 }
 .promo_android {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -277px;
+  background-position: -593px -241px;
   width: 175px;
   height: 175px;
 }
 .promo_backgrounds_armoire_201602 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -672px -181px;
+  background-position: -306px -220px;
   width: 141px;
   height: 294px;
 }
+.promo_backgrounds_armoire_201603 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -813px 0px;
+  width: 141px;
+  height: 294px;
+}
+.promo_backgrounds_armoire_201604 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -452px 0px;
+  width: 140px;
+  height: 441px;
+}
 .promo_backtoschool {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1051px;
+  background-position: -1236px -148px;
   width: 150px;
   height: 150px;
 }
 .promo_burnout {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px 0px;
+  background-position: -593px 0px;
   width: 219px;
   height: 240px;
 }
 .promo_classes_fall_2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px 0px;
+  background-position: -326px -912px;
   width: 321px;
   height: 100px;
 }
 .promo_classes_fall_2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -430px -621px;
+  background-position: -430px -706px;
   width: 377px;
   height: 99px;
 }
 .promo_dilatoryDistress {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -311px;
+  background-position: -569px -1203px;
   width: 90px;
   height: 90px;
 }
+.promo_egg_mounts {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -955px 0px;
+  width: 280px;
+  height: 147px;
+}
 .promo_enchanted_armoire {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -890px;
+  background-position: -271px -621px;
   width: 374px;
   height: 76px;
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -151px -1051px;
+  background-position: -578px -1112px;
   width: 217px;
   height: 90px;
 }
 .promo_enchanted_armoire_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -92px;
+  background-position: -796px -1112px;
   width: 180px;
   height: 90px;
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -820px -724px;
+  background-position: -751px -1203px;
   width: 90px;
   height: 90px;
 }
 .promo_enchanted_armoire_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -503px;
+  background-position: -1236px -915px;
   width: 122px;
   height: 90px;
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -814px -272px;
+  background-position: -1115px -1203px;
   width: 90px;
   height: 90px;
 }
+.promo_floral_potions {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -813px -295px;
+  width: 105px;
+  height: 273px;
+}
 .promo_habitica {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -101px;
+  background-position: -955px -480px;
   width: 175px;
   height: 175px;
 }
@@ -114,289 +138,295 @@
 }
 .promo_haunted_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -183px;
+  background-position: -1236px -595px;
   width: 100px;
   height: 137px;
 }
-.customize-option.promo_haunted_hair {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1290px -198px;
-  width: 60px;
-  height: 60px;
-}
 .promo_item_notif {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -724px;
+  background-position: -955px -656px;
   width: 249px;
   height: 102px;
 }
 .promo_mystery_201405 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -642px -1051px;
+  background-position: -364px -1295px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1371px -397px;
+  background-position: 0px -1295px;
   width: 90px;
   height: 96px;
 }
 .promo_mystery_201407 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -827px;
+  background-position: -769px -241px;
   width: 42px;
   height: 62px;
 }
 .promo_mystery_201408 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1386px -761px;
+  background-position: -513px -442px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -402px;
+  background-position: -933px -1203px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1386px -670px;
+  background-position: -1131px -586px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -460px -1051px;
+  background-position: -1297px -1203px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1193px -724px;
+  background-position: -1342px -809px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1412px -594px;
+  background-position: -1337px -595px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1371px -943px;
+  background-position: -387px -1203px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -814px -181px;
+  background-position: -478px -1203px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1374px -852px;
+  background-position: -646px -621px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -814px -363px;
+  background-position: -660px -1203px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201506 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1418px -321px;
+  background-position: -1337px -659px;
   width: 42px;
   height: 69px;
 }
 .promo_mystery_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1366px -183px;
+  background-position: -1131px -480px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -1034px;
+  background-position: -293px -1203px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -808px -621px;
+  background-position: -1024px -1203px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1359px -1034px;
+  background-position: -199px -1203px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -369px -1051px;
+  background-position: -1206px -1203px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201512 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1388px -503px;
+  background-position: -452px -442px;
   width: 60px;
   height: 81px;
 }
 .promo_mystery_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -670px;
+  background-position: -1236px -1082px;
   width: 120px;
   height: 90px;
 }
+.promo_mystery_201602 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -182px -1295px;
+  width: 90px;
+  height: 90px;
+}
+.promo_mystery_201603 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -273px -1295px;
+  width: 90px;
+  height: 90px;
+}
+.promo_mystery_201604 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -1083px -1112px;
+  width: 93px;
+  height: 90px;
+}
 .promo_mystery_3014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -389px;
+  background-position: -593px -417px;
   width: 217px;
   height: 90px;
 }
 .promo_orca {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -397px;
+  background-position: -1236px -809px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -1125px;
+  background-position: -955px -759px;
   width: 115px;
   height: 47px;
 }
 .promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -331px -967px;
+  background-position: -648px -912px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -356px -982px;
+  background-position: -673px -927px;
   width: 60px;
   height: 60px;
 }
 .promo_peppermint_flame {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -277px;
+  background-position: -1236px -447px;
   width: 140px;
   height: 147px;
 }
 .promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -101px;
+  background-position: -1236px -299px;
   width: 140px;
   height: 147px;
 }
 .customize-option.promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1144px -116px;
+  background-position: -1261px -314px;
   width: 60px;
   height: 60px;
 }
 .promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -967px;
+  background-position: -724px -809px;
   width: 330px;
   height: 83px;
 }
-.customize-option.promo_shimmer_hair {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -25px -982px;
-  width: 60px;
-  height: 60px;
-}
 .promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px 0px;
+  background-position: 0px -1203px;
   width: 198px;
   height: 91px;
 }
 .customize-option.promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1290px -15px;
+  background-position: -25px -1218px;
   width: 60px;
   height: 60px;
 }
+.promo_spring_classes_2016 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: 0px -809px;
+  width: 362px;
+  height: 102px;
+}
 .promo_springclasses2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -542px;
+  background-position: 0px -1112px;
   width: 288px;
   height: 90px;
 }
 .promo_springclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -633px;
+  background-position: -289px -1112px;
   width: 288px;
   height: 90px;
 }
 .promo_summer_classes_2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -621px;
+  background-position: 0px -706px;
   width: 429px;
   height: 102px;
 }
 .promo_summer_classes_2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -453px;
+  background-position: 0px -1023px;
   width: 300px;
   height: 88px;
 }
 .promo_updos {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -241px;
+  background-position: -1236px 0px;
   width: 156px;
   height: 147px;
 }
 .promo_veteran_pets {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -594px;
+  background-position: -1236px -1006px;
   width: 146px;
   height: 75px;
 }
 .promo_winter_classes_2016 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -499px -525px;
+  background-position: -363px -809px;
   width: 360px;
   height: 90px;
 }
 .promo_winterclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -494px -724px;
+  background-position: 0px -912px;
   width: 325px;
   height: 110px;
 }
 .promo_winteryhair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -321px;
+  background-position: -1236px -733px;
   width: 152px;
   height: 75px;
 }
-.customize-option.promo_winteryhair {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1290px -336px;
-  width: 60px;
-  height: 60px;
-}
 .avatar_variety {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -525px;
+  background-position: -271px -525px;
   width: 498px;
   height: 95px;
 }
 .npc_viirus {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -852px;
+  background-position: -813px -660px;
   width: 108px;
   height: 90px;
 }
@@ -408,19 +438,19 @@
 }
 .welcome_basic_avatars {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -247px -724px;
+  background-position: -955px -148px;
   width: 246px;
   height: 165px;
 }
 .welcome_promo_party {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -672px 0px;
+  background-position: 0px -525px;
   width: 270px;
   height: 180px;
 }
 .welcome_sample_tasks {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -724px;
+  background-position: -955px -314px;
   width: 246px;
   height: 165px;
 }