Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting

cms/templates/500.html

 <%inherit file="base.html" />
-<%block name="title">Server Error</%block>
+
+<%block name="title">Studio Server Error</%block>
 
 <%block name="content">
 
 <div class="wrapper-content wrapper">
   <section class="content">
-      <h1>Currently the <em>edX</em> servers are down</h1>
-      <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@edx.org">technical@edx.org</a> to report any problems or downtime.</p>
+    <h1>The <em>Studio</em> servers encountered an error</h1>
+    <p>
+      An error occurred in Studio and the page could not be loaded. Please try again in a few moments.
+      We've logged the error and our staff is currently working to resolve this error as soon as possible. 
+      If the problem persists, please email us at <a href="mailto:technical@edx.org">technical@edx.org</a>.
+    </p>
   </section>
 </div>