Resolving merge conflicts from upstream/release

* CMS Global header will continue to send people to edx-code for help.
* LMS Course Navigation to keep changes from upstream and local changes
  (for sneakpeak)

cms/templates/widgets/header.html

@@ -171,11 +171,10 @@
         <h2 class="sr">${_("You're not currently signed in")}</h2>
         <ol>
           <li class="nav-item nav-not-signedin-help">
-<<<<<<< HEAD
             <a href="https://groups.google.com/d/forum/openedx-studio" target="_blank" rel="external">${_("studio-users group")}</a>
-=======
+            <!--
             <a href="${get_online_help_info(online_help_token)['doc_url']}" title="${_("Contextual Online Help")}" target="${_("_blank")}">${_("Help")}</a>
->>>>>>> upstream/release
+            -->
           </li>
           <li class="nav-item nav-not-signedin-signup">
             <a class="action action-signup" href="${reverse('signup')}">${_("Sign Up")}</a>

lms/templates/courseware/course_navigation.html

@@ -21,7 +21,6 @@ def url_class(is_active):
 <%! from courseware.views import notification_image_for_tab %>
 <% import waffle %>
 
-<<<<<<< HEAD
 % if course and user.is_authenticated() and not UserProfile.has_registered(user):
   <p class="unauth-warning">
   <%
@@ -37,9 +36,7 @@ def url_class(is_active):
   </p>
 % endif
 
-=======
 % if disable_tabs is UNDEFINED or not disable_tabs:
->>>>>>> upstream/release
 <nav class="${active_page} course-material">
   <div class="inner-wrapper">
     <ol class="course-tabs">