resolving local merge conflict

cms/envs/common.py

@@ -34,6 +34,7 @@ MITX_FEATURES = {
     'ENABLE_DISCUSSION_SERVICE': False,
     'AUTH_USE_MIT_CERTIFICATES': False,
     'STUB_VIDEO_FOR_TESTING': False,   # do not display video when running automated acceptance tests
+    'STUDIO_NPS_SURVEY': True, 
 }
 ENABLE_JASMINE = False
 

cms/envs/dev.py

@@ -147,3 +147,6 @@ DEBUG_TOOLBAR_CONFIG = {
 # To see stacktraces for MongoDB queries, set this to True.
 # Stacktraces slow down page loads drastically (for pages with lots of queries).
 DEBUG_TOOLBAR_MONGO_STACKTRACES = True
+
+# disable NPS survey in dev mode
+MITX_FEATURES['STUDIO_NPS_SURVEY'] = False

cms/templates/base.html

@@ -63,4 +63,6 @@
     <%include file="widgets/tender.html" />
     <%block name="jsextra"></%block>
   </body>
+
+  <%include file="widgets/qualaroo.html" />
 </html>

cms/templates/widgets/qualaroo.html

@@ -0,0 +1,13 @@
+% if settings.MITX_FEATURES.get('STUDIO_NPS_SURVEY'):
+    <!-- Qualaroo is used for net promoter score surveys -->
+    <script type="text/javascript">
+        % if user.is_authenticated():
+            var _kiq = _kiq || [];
+            _kiq.push(['identify', "${ user.email }" ]);
+        % endif
+    </script>
+
+    <!-- Qualaroo for edx.org -->
+    <script type="text/javascript" src="//s3.amazonaws.com/ki.js/48221/9SN.js" async="true"></script>
+    <!-- end Qualaroo -->
+% endif