Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.137.1",
+  "version": "4.138.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.137.1",
+  "version": "4.138.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.8.7",

website/common/script/libs/shops-seasonal.config.js

@@ -24,5 +24,5 @@ export default {
   availableQuests: [
   ],
 
-  featuredSet: 'spring2019OrchidWarriorSet',
+  featuredSet: 'spring2020PuddleMageSet',
 };