Merge branch 'rc' into release

* Release 2014-08-22, picked up:
** Requirements updates for TrackChanges
** edx-submissions version bump
** help center link is a visible button

lms/templates/help_modal.html

@@ -48,18 +48,19 @@
     </p>
 % endif
 
-    <p>${_('Have <strong>general questions about {platform_name}</strong>? You can find lots of helpful information in the {platform_name} {link_start}Help Center{link_end}.').format(
-        link_start='<a href="{url}" target="_blank">'.format(
-          url='https://stanfordonline.zendesk.com/hc/en-us'
-        ),
-        link_end='</a>',
-        platform_name=platform_name)}
-      </p>
+    <p>${_('Have <strong>general questions about {platform_name}</strong>? You can find lots of helpful information in the {platform_name} Help Center.').format(platform_name=platform_name)}</p>
+	
+	<div class="help-buttons">
+	  <a id="help-center-button" href="{url}" target="_blank">
+		${_('Access the Help Center')}
+	  </a>
+	</div>
 
-    <p>${_('Have a <strong>question about something specific</strong>? You can contact the {platform_name} general support team directly:').format(
+	<hr>
+
+    <p>${_("Can't find an answer to your question? You can contact the {platform_name} general support team directly:").format(
         platform_name=platform_name
       )}</p>
-    <hr>
 
     <div class="help-buttons">
       <a href="#" id="feedback_link_problem">${_('Report a problem')}</a>

requirements/edx/base.txt

@@ -134,4 +134,4 @@ git+https://github.com/mfogel/django-settings-context-processor.git
 git+https://github.com/mitocw/django-cas.git
 
 # edX packages
-edx-submissions==0.0.3
+edx-submissions==0.0.7

requirements/edx/github.txt

@@ -27,7 +27,7 @@
 -e git+https://github.com/edx/bok-choy.git@82b4e82d79b9d4c6d087ebbfa26ea23235728e62#egg=bok_choy
 -e git+https://github.com/edx-solutions/django-splash.git@9965a53c269666a30bb4e2b3f6037c138aef2a55#egg=django-splash
 -e git+https://github.com/edx/acid-block.git@459aff7b63db8f2c5decd1755706c1a64fb4ebb1#egg=acid-xblock
--e git+https://github.com/edx/edx-ora2.git@release-2014-08-08T13.47#egg=edx-ora2
+-e git+https://github.com/Stanford-Online/edx-ora2.git@302ca7a03bb8d9e147dccee4c161d0c4016a2b4c#egg=edx-ora2
 -e git+https://github.com/edx/opaque-keys.git@c63412fc939cd094ddbc9c2ef71acb345e3b4eb7#egg=opaque-keys
 -e git+https://github.com/edx/ease.git@97de68448e5495385ba043d3091f570a699d5b5f#egg=ease
 -e git+https://github.com/edx/i18n-tools.git@f5303e82dff368c7595884d9325aeea1d802da25#egg=i18n-tools