Merge branch 'release' into develop

website/client/components/avatar.vue

@@ -24,7 +24,7 @@
       span.head_0
       span(:class="getGearClass('back_collar')")
       span(:class="getGearClass('body')")
-      template(v-for="type in ['base', 'bangs', 'mustache', 'beard']")
+      template(v-for="type in ['bangs', 'base', 'mustache', 'beard']")
         span(:class="'hair_' + type + '_' + member.preferences.hair[type] + '_' + member.preferences.hair.color")
       span(:class="getGearClass('eyewear')")
       span(:class="getGearClass('head')")

website/client/components/notifications.vue

@@ -311,6 +311,8 @@ export default {
   },
   methods: {
     checkUserAchievements () {
+      if (this.user.needsCron) return;
+
       // List of prompts for user on changes. Sounds like we may need a refactor here, but it is clean for now
       if (!this.user.flags.welcomed) {
         this.$store.state.avatarEditorOptions.editingUser = false;