Merge remote-tracking branch 'edx-mitx/master' into feature/ichuang/staff-email-for-course-creation

Conflicts:
	cms/envs/common.py

cms/templates/index.html

@@ -69,7 +69,7 @@
       <article class="my-classes">
         % if user.is_active:
         <ul class="class-list">
-          %for course, url, lms_link in courses:
+          %for course, url, lms_link in sorted(courses, key=lambda s: s[0].lower()):
           <li>
             <a class="class-link" href="${url}" class="class-name">
               <span class="class-name">${course}</span>