Merge remote-tracking branch 'origin/master' into rc-20140825

Conflicts:
	requirements/edx/github.txt

lms/templates/help_modal.html

@@ -51,7 +51,7 @@
     <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">
+	  <a id="help-center-button" href="http://stanfordonline.zendesk.com/hc" target="_blank">
 		${_('Access the Help Center')}
 	  </a>
 	</div>

requirements/edx/github.txt

@@ -28,7 +28,7 @@
 -e git+https://github.com/edx/bok-choy.git@9162c0bfb8e0eb1e2fa8e6df8dec12d181322a90#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/Stanford-Online/edx-ora2.git@302ca7a03bb8d9e147dccee4c161d0c4016a2b4c#egg=edx-ora2
+-e git+https://github.com/Stanford-Online/edx-ora2.git@26efae8fa1e0e8ea2843f9b794aeb3a8cf4f5578#egg=edx-ora2
 -e git+https://github.com/edx/opaque-keys.git@454bd984d9539550c6290020e92ee2d6094038d0#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