Merge branch 'd' into staging

www/common/common-ui-elements.js

@@ -1724,21 +1724,7 @@ define([
                 },
             });
         }
-/*
+
-        if (AppConfig.surveyURL) {
-            options.push({
-                tag: 'a',
-                attributes: {
-                    'class': 'cp-toolbar-survey fa fa-graduation-cap'
-                },
-                content: h('span', Messages.survey),
-                action: function () {
-                    Common.openUnsafeURL(AppConfig.surveyURL);
-                    Feedback.send('SURVEY_CLICKED');
-                },
-            });
-        }
-*/
         options.push({
             tag: 'a',
             attributes: {
@@ -1795,6 +1781,20 @@ define([
             });
         }
 
+        if (AppConfig.surveyURL) {
+            options.push({
+                tag: 'a',
+                attributes: {
+                    'class': 'cp-toolbar-survey fa fa-graduation-cap'
+                },
+                content: h('span', Messages.survey),
+                action: function () {
+                    Common.openUnsafeURL(AppConfig.surveyURL);
+                    Feedback.send('SURVEY_CLICKED');
+                },
+            });
+        }
+
         options.push({ tag: 'hr' });
         // Add login or logout button depending on the current status
         if (priv.loggedIn) {