Merge branch 'master' into specific-error-handling

Conflicts:
	djangoapps/courseware/views.py

lib/util/views.py

@@ -2,7 +2,6 @@ import datetime
 import json
 import sys
 
-from django.conf import settings
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.context_processors import csrf
@@ -61,3 +60,9 @@ def send_feedback(request):
 def info(request):
     ''' Info page (link from main header) '''
     return render_to_response("info.html", {})
+
+def mitxhome(request):
+    ''' Home page (link from main header). List of courses.  '''
+    if settings.ENABLE_MULTICOURSE:
+        return render_to_response("mitxhome.html", {})
+    return info(request)