Merge branch 'release' into develop

website/server/models/user/schema.js

@@ -130,6 +130,8 @@ export default new Schema({
     undeadUndertaker: Boolean,
     primedForPainting: Boolean,
     pearlyPro: Boolean,
+    tickledPink: Boolean,
+    rosyOutlook: Boolean,
     // Onboarding Guide
     createdTask: Boolean,
     completedTask: Boolean,

website/server/models/userNotification.js

@@ -51,6 +51,8 @@ const NOTIFICATION_TYPES = [
   'ACHIEVEMENT_UNDEAD_UNDERTAKER',
   'ACHIEVEMENT_PRIMED_FOR_PAINTING',
   'ACHIEVEMENT_PEARLY_PRO',
+  'ACHIEVEMENT_TICKLED_PINK',
+  'ACHIEVEMENT_ROSY_OUTLOOK',
   'ACHIEVEMENT', // generic achievement notification, details inside `notification.data`
 ];