fixed merge on env

cms/templates/base.html

@@ -55,7 +55,7 @@
 
     <%block name="content"></%block>
     <%include file="widgets/footer.html" />
-
+    <%include file="widgets/tender.html" />
     <%block name="jsextra"></%block>
   </body>
 

cms/templates/widgets/footer.html

@@ -14,15 +14,14 @@
         <li class="nav-item nav-peripheral-pp">
           <a href="#">Privacy Policy</a>
         </li> -->
+        
         <li class="nav-item nav-peripheral-help">
           <a href="http://help.edge.edx.org/" rel="external">edX Studio Help</a>
         </li>
-        <li class="nav-item nav-peripheral-contact">
-          <a href="https://www.edx.org/contact" rel="external">Contact edX</a>
-        </li>
-        
         % if user.is_authenticated():
-        <!-- add in zendesk/tender feedback form UI -->
+        <li class="nav-item nav-peripheral-feedback">
+          <a class="show-tender" href="http://help.edge.edx.org/discussion/new" title="Use our feedback tool, Tender, to share your feedback">Contact Us</a>
+        </li>
         % endif
       </ol>
     </nav>

cms/templates/widgets/header.html

@@ -1,6 +1,6 @@
 <%! from django.core.urlresolvers import reverse %>
 
-<div class="wrapper-header wrapper">
+<div class="wrapper-header wrapper" id="view-top">
   <header class="primary" role="banner">
 
     <div class="wrapper wrapper-left ">

cms/templates/widgets/tender.html

@@ -0,0 +1,13 @@
+% if user.is_authenticated():
+
+<script type="text/javascript">
+  Tender = {
+    hideToggle: true,
+    title: '',
+    body: '',
+    hide_kb: 'true',
+    widgetToggles: $('.show-tender')
+  }
+</script>
+<script src="https://edxedge.tenderapp.com/tender_widget.js" type="text/javascript"></script>
+% endif