diff --git a/AUTHORS b/AUTHORS
index e37dd7e395..450188c8fb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -179,3 +179,4 @@ Henry Tareque <henry.tareque@gmail.com>
 Eugeny Kolpakov <eugeny.kolpakov@gmail.com>
 Omar Al-Ithawi <oithawi@qrf.org>
 Louis Pilfold <louis@lpil.uk>
+Akiva Leffert <akiva@edx.org>
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e2b7eb2983..fb5aa94e5c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,6 +7,8 @@ the top.  Include a label indicating the component affected.
 
 Common: Add configurable reset button to units
 
+Studio: Add support xblock validation messages on Studio unit/container page. TNL-683
+
 LMS: Support adding cohorts from the instructor dashboard. TNL-162
 
 LMS: Support adding students to a cohort via the instructor dashboard. TNL-163
diff --git a/cms/djangoapps/contentstore/features/video.py b/cms/djangoapps/contentstore/features/video.py
index 39ab626638..065a772bd3 100644
--- a/cms/djangoapps/contentstore/features/video.py
+++ b/cms/djangoapps/contentstore/features/video.py
@@ -1,4 +1,4 @@
-# pylint: disable=C0111
+# pylint: disable=missing-docstring
 
 from lettuce import world, step
 from selenium.webdriver.common.keys import Keys
@@ -20,9 +20,10 @@ SELECTORS = {
 # We should wait 300 ms for event handler invocation + 200ms for safety.
 DELAY = 0.5
 
+
 @step('youtube stub server (.*) YouTube API')
 def configure_youtube_api(_step, action):
-    action=action.strip()
+    action = action.strip()
     if action == 'proxies':
         world.youtube.config['youtube_api_blocked'] = False
     elif action == 'blocks':
@@ -30,6 +31,7 @@ def configure_youtube_api(_step, action):
     else:
         raise ValueError('Parameter `action` should be one of "proxies" or "blocks".')
 
+
 @step('I have created a Video component$')
 def i_created_a_video_component(step):
     step.given('I am in Studio editing a new unit')
@@ -47,6 +49,7 @@ def i_created_a_video_component(step):
     if not world.youtube.config.get('youtube_api_blocked'):
         world.wait_for_visible(SELECTORS['controls'])
 
+
 @step('I have created a Video component with subtitles$')
 def i_created_a_video_with_subs(_step):
     _step.given('I have created a Video component with subtitles "OEoXaMPEzfM"')
@@ -221,7 +224,7 @@ def see_a_range_slider_with_proper_range(_step):
 def do_not_see_or_not_button_video(_step, action, button_type):
     world.wait(DELAY)
     world.wait_for_ajax_complete()
-    action=action.strip()
+    action = action.strip()
     button = button_type.strip()
     if action == 'do not':
         assert not world.is_css_present(VIDEO_BUTTONS[button])
diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_cleanup_assets.py b/cms/djangoapps/contentstore/management/commands/tests/test_cleanup_assets.py
index 6c7dfc8628..7bda45df3b 100644
--- a/cms/djangoapps/contentstore/management/commands/tests/test_cleanup_assets.py
+++ b/cms/djangoapps/contentstore/management/commands/tests/test_cleanup_assets.py
@@ -11,6 +11,9 @@ from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.mongo.base import location_to_query
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.xml_importer import import_from_xml
+from django.conf import settings
+
+TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 
 
 class ExportAllCourses(ModuleStoreTestCase):
@@ -30,7 +33,7 @@ class ExportAllCourses(ModuleStoreTestCase):
         import_from_xml(
             self.module_store,
             '**replace_user**',
-            'common/test/data/',
+            TEST_DATA_DIR,
             ['dot-underscore'],
             static_content_store=self.content_store,
             do_import_static=True,
diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index fa22a9fbaa..7ff89e6a39 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -56,6 +56,8 @@ from xmodule.contentstore.content import StaticContent
 TEST_DATA_CONTENTSTORE = copy.deepcopy(settings.CONTENTSTORE)
 TEST_DATA_CONTENTSTORE['DOC_STORE_CONFIG']['db'] = 'test_xcontent_%s' % uuid4().hex
 
+TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
+
 
 @override_settings(CONTENTSTORE=TEST_DATA_CONTENTSTORE)
 class ContentStoreTestCase(CourseTestCase):
@@ -69,7 +71,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
     Tests which legitimately need to import a course
     """
     def test_no_static_link_rewrites_on_import(self):
-        course_items = import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'])
+        course_items = import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'])
         course = course_items[0]
 
         handouts_usage_key = course.id.make_usage_key('course_info', 'handouts')
@@ -81,7 +83,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
         self.assertIn('/static/', handouts.data)
 
     def test_xlint_fails(self):
-        err_cnt = perform_xlint('common/test/data', ['toy'])
+        err_cnt = perform_xlint(TEST_DATA_DIR, ['toy'])
         self.assertGreater(err_cnt, 0)
 
     def test_about_overrides(self):
@@ -90,7 +92,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
         e.g. /about/Fall_2012/effort.html
         while there is a base definition in /about/effort.html
         '''
-        course_items = import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'])
+        course_items = import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'])
         course_key = course_items[0].id
         effort = self.store.get_item(course_key.make_usage_key('about', 'effort'))
         self.assertEqual(effort.data, '6 hours')
@@ -105,7 +107,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
         '''
         content_store = contentstore()
 
-        import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'], static_content_store=content_store, verbose=True)
+        import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'], static_content_store=content_store, verbose=True)
 
         course = self.store.get_course(SlashSeparatedCourseKey('edX', 'toy', '2012_Fall'))
 
@@ -153,7 +155,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
         Test that course info updates are imported and exported with all content fields ('data', 'items')
         """
         content_store = contentstore()
-        data_dir = "common/test/data/"
+        data_dir = TEST_DATA_DIR
         courses = import_from_xml(
             self.store, self.user.id, data_dir, ['course_info_updates'],
             static_content_store=content_store, verbose=True,
@@ -166,7 +168,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
         self.assertIsNotNone(course_updates)
 
         # check that course which is imported has files 'updates.html' and 'updates.items.json'
-        filesystem = OSFS(data_dir + 'course_info_updates/info')
+        filesystem = OSFS(data_dir + '/course_info_updates/info')
         self.assertTrue(filesystem.exists('updates.html'))
         self.assertTrue(filesystem.exists('updates.items.json'))
 
@@ -204,7 +206,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
     def test_rewrite_nonportable_links_on_import(self):
         content_store = contentstore()
 
-        import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'], static_content_store=content_store)
+        import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'], static_content_store=content_store)
 
         # first check a static asset link
         course_key = SlashSeparatedCourseKey('edX', 'toy', 'run')
@@ -250,6 +252,14 @@ class ImportRequiredTestCases(ContentStoreTestCase):
         # check for about content
         self.verify_content_existence(self.store, root_dir, course_id, 'about', 'about', '.html')
 
+        # assert that there is an html and video directory in drafts:
+        draft_dir = OSFS(root_dir / 'test_export/drafts')
+        self.assertTrue(draft_dir.exists('html'))
+        self.assertTrue(draft_dir.exists('video'))
+        # and assert that they contain the created modules
+        self.assertIn(self.DRAFT_HTML + ".xml", draft_dir.listdir('html'))
+        self.assertIn(self.DRAFT_VIDEO + ".xml", draft_dir.listdir('video'))
+
         # check for grading_policy.json
         filesystem = OSFS(root_dir / 'test_export/policies/2012_Fall')
         self.assertTrue(filesystem.exists('grading_policy.json'))
@@ -302,6 +312,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
             """Verifies all temporary attributes added during export are removed"""
             self.assertNotIn('index_in_children_list', attributes)
             self.assertNotIn('parent_sequential_url', attributes)
+            self.assertNotIn('parent_url', attributes)
 
         vertical = self.store.get_item(course_id.make_usage_key('vertical', self.TEST_VERTICAL))
         verify_export_attrs_removed(vertical.xml_attributes)
@@ -314,7 +325,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
     def test_export_course_with_metadata_only_video(self):
         content_store = contentstore()
 
-        import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'])
+        import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'])
         course_id = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
 
         # create a new video module and add it as a child to a vertical
@@ -343,7 +354,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
         """
         content_store = contentstore()
 
-        import_from_xml(self.store, self.user.id, 'common/test/data/', ['word_cloud'])
+        import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['word_cloud'])
         course_id = SlashSeparatedCourseKey('HarvardX', 'ER22x', '2013_Spring')
 
         verticals = self.store.get_items(course_id, qualifiers={'category': 'vertical'})
@@ -370,7 +381,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
         """
         content_store = contentstore()
 
-        import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'])
+        import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'])
         course_id = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
 
         verticals = self.store.get_items(course_id, qualifiers={'category': 'vertical'})
@@ -401,7 +412,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
         """
         content_store = contentstore()
 
-        import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'])
+        import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'])
 
         course_id = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
 
@@ -423,7 +434,7 @@ class ImportRequiredTestCases(ContentStoreTestCase):
     def test_export_course_without_content_store(self):
         # Create toy course
 
-        course_items = import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'])
+        course_items = import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'])
         course_id = course_items[0].id
 
         root_dir = path(mkdtemp_clean())
@@ -844,15 +855,14 @@ class MiscCourseTests(ContentStoreTestCase):
         self.assertContains(resp, unicode(asset_key))
 
     def test_prefetch_children(self):
-        # make sure we haven't done too many round trips to DB
-        # note we say 4 round trips here for:
+        # make sure we haven't done too many round trips to DB:
         # 1) the course,
         # 2 & 3) for the chapters and sequentials
         # Because we're querying from the top of the tree, we cache information needed for inheritance,
         # so we don't need to make an extra query to compute it.
         # set the branch to 'publish' in order to prevent extra lookups of draft versions
         with self.store.branch_setting(ModuleStoreEnum.Branch.published_only, self.course.id):
-            with check_mongo_calls(3, 0):
+            with check_mongo_calls(3):
                 course = self.store.get_course(self.course.id, depth=2)
 
             # make sure we pre-fetched a known sequential which should be at depth=2
@@ -864,7 +874,7 @@ class MiscCourseTests(ContentStoreTestCase):
         # Now, test with the branch set to draft. No extra round trips b/c it doesn't go deep enough to get
         # beyond direct only categories
         with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, self.course.id):
-            with check_mongo_calls(3, 0):
+            with check_mongo_calls(3):
                 self.store.get_course(self.course.id, depth=2)
 
     def _check_verticals(self, locations):
@@ -1212,7 +1222,7 @@ class ContentStoreTest(ContentStoreTestCase):
             )
             self.assertEqual(resp.status_code, 200)
 
-        course_items = import_from_xml(self.store, self.user.id, 'common/test/data/', ['simple'])
+        course_items = import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['simple'])
         course_key = course_items[0].id
 
         resp = self._show_course_overview(course_key)
@@ -1259,7 +1269,7 @@ class ContentStoreTest(ContentStoreTestCase):
         target_course_id = _get_course_id(self.course_data)
         _create_course(self, target_course_id, self.course_data)
 
-        import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'], target_course_id=target_course_id)
+        import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'], target_course_id=target_course_id)
 
         modules = self.store.get_items(target_course_id)
 
@@ -1294,7 +1304,7 @@ class ContentStoreTest(ContentStoreTestCase):
         course_module.save()
 
         # Import a course with wiki_slug == location.course
-        import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'], target_course_id=target_course_id)
+        import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'], target_course_id=target_course_id)
         course_module = self.store.get_course(target_course_id)
         self.assertEquals(course_module.wiki_slug, 'toy')
 
@@ -1309,17 +1319,17 @@ class ContentStoreTest(ContentStoreTestCase):
         _create_course(self, target_course_id, course_data)
 
         # Import a course with wiki_slug == location.course
-        import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'], target_course_id=target_course_id)
+        import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'], target_course_id=target_course_id)
         course_module = self.store.get_course(target_course_id)
         self.assertEquals(course_module.wiki_slug, 'MITx.111.2013_Spring')
 
         # Now try importing a course with wiki_slug == '{0}.{1}.{2}'.format(location.org, location.course, location.run)
-        import_from_xml(self.store, self.user.id, 'common/test/data/', ['two_toys'], target_course_id=target_course_id)
+        import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['two_toys'], target_course_id=target_course_id)
         course_module = self.store.get_course(target_course_id)
         self.assertEquals(course_module.wiki_slug, 'MITx.111.2013_Spring')
 
     def test_import_metadata_with_attempts_empty_string(self):
-        import_from_xml(self.store, self.user.id, 'common/test/data/', ['simple'])
+        import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['simple'])
         did_load_item = False
         try:
             course_key = SlashSeparatedCourseKey('edX', 'simple', 'problem')
@@ -1341,7 +1351,7 @@ class ContentStoreTest(ContentStoreTestCase):
         self.assertNotEquals(new_discussion_item.discussion_id, '$$GUID$$')
 
     def test_metadata_inheritance(self):
-        course_items = import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'])
+        course_items = import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'])
 
         course = course_items[0]
         verticals = self.store.get_items(course.id, qualifiers={'category': 'vertical'})
@@ -1410,7 +1420,7 @@ class ContentStoreTest(ContentStoreTestCase):
         courses = import_from_xml(
             self.store,
             self.user.id,
-            'common/test/data/',
+            TEST_DATA_DIR,
             ['conditional_and_poll'],
             static_content_store=content_store
         )
diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py
index ed1deb3ca3..5062450cf5 100644
--- a/cms/djangoapps/contentstore/tests/test_course_settings.py
+++ b/cms/djangoapps/contentstore/tests/test_course_settings.py
@@ -607,11 +607,13 @@ class CourseMetadataEditingTest(CourseTestCase):
 
     def test_correct_http_status(self):
         json_data = json.dumps({
-                        "advertised_start": {"value": 1, "display_name": "Course Advertised Start Date", },
-                        "days_early_for_beta": {"value": "supposed to be an integer",
-                                        "display_name": "Days Early for Beta Users", },
-                        "advanced_modules": {"value": 1, "display_name": "Advanced Module List", },
-                    })
+            "advertised_start": {"value": 1, "display_name": "Course Advertised Start Date", },
+            "days_early_for_beta": {
+                "value": "supposed to be an integer",
+                "display_name": "Days Early for Beta Users",
+            },
+            "advanced_modules": {"value": 1, "display_name": "Advanced Module List", },
+        })
         response = self.client.ajax_post(self.course_setting_url, json_data)
         self.assertEqual(400, response.status_code)
 
@@ -623,7 +625,7 @@ class CourseMetadataEditingTest(CourseTestCase):
                 "days_early_for_beta": {"value": 2},
             },
             user=self.user
-         )
+        )
         self.update_check(test_model)
         # try fresh fetch to ensure persistence
         fresh = modulestore().get_course(self.course.id)
diff --git a/cms/djangoapps/contentstore/tests/test_crud.py b/cms/djangoapps/contentstore/tests/test_crud.py
index 8f3f224c94..70ddf7fc59 100644
--- a/cms/djangoapps/contentstore/tests/test_crud.py
+++ b/cms/djangoapps/contentstore/tests/test_crud.py
@@ -66,8 +66,10 @@ class TemplateTests(unittest.TestCase):
         self.assertEqual(index_info['course'], 'course')
         self.assertEqual(index_info['run'], '2014')
 
-        test_chapter = persistent_factories.ItemFactory.create(display_name='chapter 1',
-            parent_location=test_course.location)
+        test_chapter = persistent_factories.ItemFactory.create(
+            display_name='chapter 1',
+            parent_location=test_course.location
+        )
         self.assertIsInstance(test_chapter, SequenceDescriptor)
         # refetch parent which should now point to child
         test_course = self.split_store.get_course(test_course.id.version_agnostic())
@@ -156,8 +158,10 @@ class TemplateTests(unittest.TestCase):
             course='history', run='doomed', org='edu.harvard',
             display_name='doomed test course',
             user_id='testbot')
-        persistent_factories.ItemFactory.create(display_name='chapter 1',
-            parent_location=test_course.location)
+        persistent_factories.ItemFactory.create(
+            display_name='chapter 1',
+            parent_location=test_course.location
+        )
 
         id_locator = test_course.id.for_branch(ModuleStoreEnum.BranchName.draft)
         guid_locator = test_course.location.course_agnostic()
@@ -180,10 +184,17 @@ class TemplateTests(unittest.TestCase):
             display_name='history test course',
             user_id='testbot'
         )
-        chapter = persistent_factories.ItemFactory.create(display_name='chapter 1',
-            parent_location=test_course.location, user_id='testbot')
-        sub = persistent_factories.ItemFactory.create(display_name='subsection 1',
-            parent_location=chapter.location, user_id='testbot', category='vertical')
+        chapter = persistent_factories.ItemFactory.create(
+            display_name='chapter 1',
+            parent_location=test_course.location,
+            user_id='testbot'
+        )
+        sub = persistent_factories.ItemFactory.create(
+            display_name='subsection 1',
+            parent_location=chapter.location,
+            user_id='testbot',
+            category='vertical'
+        )
         first_problem = persistent_factories.ItemFactory.create(
             display_name='problem 1', parent_location=sub.location, user_id='testbot', category='problem',
             data="<problem></problem>"
diff --git a/cms/djangoapps/contentstore/tests/test_import.py b/cms/djangoapps/contentstore/tests/test_import.py
index d8f4dfe95c..fe81ce05ea 100644
--- a/cms/djangoapps/contentstore/tests/test_import.py
+++ b/cms/djangoapps/contentstore/tests/test_import.py
@@ -24,6 +24,8 @@ from uuid import uuid4
 TEST_DATA_CONTENTSTORE = copy.deepcopy(settings.CONTENTSTORE)
 TEST_DATA_CONTENTSTORE['DOC_STORE_CONFIG']['db'] = 'test_xcontent_%s' % uuid4().hex
 
+TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
+
 
 @ddt.ddt
 @override_settings(CONTENTSTORE=TEST_DATA_CONTENTSTORE)
@@ -48,7 +50,7 @@ class ContentStoreImportTest(ModuleStoreTestCase):
         import_from_xml(
             module_store,
             self.user.id,
-            'common/test/data/',
+            TEST_DATA_DIR,
             ['test_import_course'],
             static_content_store=content_store,
             do_import_static=False,
@@ -70,7 +72,7 @@ class ContentStoreImportTest(ModuleStoreTestCase):
         course_items = import_from_xml(
             module_store,
             self.user.id,
-            'common/test/data',
+            TEST_DATA_DIR,
             ['test_import_course_2'],
             target_course_id=course.id,
             verbose=True,
@@ -86,7 +88,7 @@ class ContentStoreImportTest(ModuleStoreTestCase):
         import_from_xml(
             module_store,
             self.user.id,
-            'common/test/data/',
+            TEST_DATA_DIR,
             ['2014_Uni'],
             target_course_id=course_id
         )
@@ -131,7 +133,7 @@ class ContentStoreImportTest(ModuleStoreTestCase):
         content_store = contentstore()
 
         module_store = modulestore()
-        import_from_xml(module_store, self.user.id, 'common/test/data/', ['toy'], static_content_store=content_store, do_import_static=False, verbose=True)
+        import_from_xml(module_store, self.user.id, TEST_DATA_DIR, ['toy'], static_content_store=content_store, do_import_static=False, verbose=True)
 
         course = module_store.get_course(SlashSeparatedCourseKey('edX', 'toy', '2012_Fall'))
 
@@ -142,7 +144,7 @@ class ContentStoreImportTest(ModuleStoreTestCase):
 
     def test_no_static_link_rewrites_on_import(self):
         module_store = modulestore()
-        courses = import_from_xml(module_store, self.user.id, 'common/test/data/', ['toy'], do_import_static=False, verbose=True)
+        courses = import_from_xml(module_store, self.user.id, TEST_DATA_DIR, ['toy'], do_import_static=False, verbose=True)
         course_key = courses[0].id
 
         handouts = module_store.get_item(course_key.make_usage_key('course_info', 'handouts'))
@@ -183,7 +185,7 @@ class ContentStoreImportTest(ModuleStoreTestCase):
         import_from_xml(
             module_store,
             self.user.id,
-            'common/test/data/',
+            TEST_DATA_DIR,
             ['conditional'],
             target_course_id=target_course_id
         )
@@ -213,7 +215,7 @@ class ContentStoreImportTest(ModuleStoreTestCase):
         import_from_xml(
             module_store,
             self.user.id,
-            'common/test/data/',
+            TEST_DATA_DIR,
             ['open_ended'],
             target_course_id=target_course_id
         )
@@ -254,7 +256,7 @@ class ContentStoreImportTest(ModuleStoreTestCase):
         import_from_xml(
             module_store,
             self.user.id,
-            'common/test/data/',
+            TEST_DATA_DIR,
             [source_course_name],
             target_course_id=target_course_id
         )
diff --git a/cms/djangoapps/contentstore/tests/test_import_draft_order.py b/cms/djangoapps/contentstore/tests/test_import_draft_order.py
index 13c47ea53a..4f3e2c1d3a 100644
--- a/cms/djangoapps/contentstore/tests/test_import_draft_order.py
+++ b/cms/djangoapps/contentstore/tests/test_import_draft_order.py
@@ -2,6 +2,9 @@ from xmodule.modulestore.xml_importer import import_from_xml
 
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.django import modulestore
+from django.conf import settings
+
+TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 
 
 # This test is in the CMS module because the test configuration to use a draft
@@ -10,7 +13,7 @@ class DraftReorderTestCase(ModuleStoreTestCase):
 
     def test_order(self):
         store = modulestore()
-        course_items = import_from_xml(store, self.user.id, 'common/test/data/', ['import_draft_order'])
+        course_items = import_from_xml(store, self.user.id, TEST_DATA_DIR, ['import_draft_order'])
         course_key = course_items[0].id
         sequential = store.get_item(course_key.make_usage_key('sequential', '0f4f7649b10141b0bdc9922dcf94515a'))
         verticals = sequential.children
diff --git a/cms/djangoapps/contentstore/tests/test_import_pure_xblock.py b/cms/djangoapps/contentstore/tests/test_import_pure_xblock.py
index 681c1b1d44..e2b5fd73cc 100644
--- a/cms/djangoapps/contentstore/tests/test_import_pure_xblock.py
+++ b/cms/djangoapps/contentstore/tests/test_import_pure_xblock.py
@@ -7,8 +7,10 @@ from xblock.fields import String
 
 from xmodule.modulestore.xml_importer import import_from_xml
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.mongo.draft import as_draft
+from django.conf import settings
+
+TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 
 
 class StubXBlock(XBlock):
@@ -59,7 +61,7 @@ class XBlockImportTest(ModuleStoreTestCase):
 
         """
         courses = import_from_xml(
-            self.store, self.user.id, 'common/test/data', [course_dir]
+            self.store, self.user.id, TEST_DATA_DIR, [course_dir]
         )
 
         xblock_location = courses[0].id.make_usage_key('stubxblock', 'xblock_test')
diff --git a/cms/djangoapps/contentstore/tests/utils.py b/cms/djangoapps/contentstore/tests/utils.py
index cc1b4b4717..2d878cd4bc 100644
--- a/cms/djangoapps/contentstore/tests/utils.py
+++ b/cms/djangoapps/contentstore/tests/utils.py
@@ -18,6 +18,9 @@ from student.models import Registration
 from opaque_keys.edx.locations import SlashSeparatedCourseKey, AssetLocation
 from contentstore.utils import reverse_url
 from xmodule.modulestore.split_mongo.split import SplitMongoModuleStore
+from django.conf import settings
+
+TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 
 
 def parse_json(response):
@@ -128,6 +131,8 @@ class CourseTestCase(ModuleStoreTestCase):
     PRIVATE_VERTICAL = 'a_private_vertical'
     PUBLISHED_VERTICAL = 'a_published_vertical'
     SEQUENTIAL = 'vertical_sequential'
+    DRAFT_HTML = 'draft_html'
+    DRAFT_VIDEO = 'draft_video'
     LOCKED_ASSET_KEY = AssetLocation.from_deprecated_string('/c4x/edX/toy/asset/sample_static.txt')
 
     def import_and_populate_course(self):
@@ -135,7 +140,7 @@ class CourseTestCase(ModuleStoreTestCase):
         Imports the test toy course and populates it with additional test data
         """
         content_store = contentstore()
-        import_from_xml(self.store, self.user.id, 'common/test/data/', ['toy'], static_content_store=content_store)
+        import_from_xml(self.store, self.user.id, TEST_DATA_DIR, ['toy'], static_content_store=content_store)
         course_id = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
 
         # create an Orphan
@@ -167,6 +172,20 @@ class CourseTestCase(ModuleStoreTestCase):
         sequential.children.append(public_vertical.location)
         self.store.update_item(sequential, self.user.id)
 
+        # create an html and video component to make drafts:
+        draft_html = self.store.create_item(self.user.id, course_id, 'html', self.DRAFT_HTML)
+        draft_video = self.store.create_item(self.user.id, course_id, 'video', self.DRAFT_VIDEO)
+
+        # add them as children to the public_vertical
+        public_vertical.children.append(draft_html.location)
+        public_vertical.children.append(draft_video.location)
+        self.store.update_item(public_vertical, self.user.id)
+        # publish changes to vertical
+        self.store.publish(public_vertical.location, self.user.id)
+        # convert html/video to draft
+        self.store.convert_to_draft(draft_html.location, self.user.id)
+        self.store.convert_to_draft(draft_video.location, self.user.id)
+
         # lock an asset
         content_store.set_attr(self.LOCKED_ASSET_KEY, 'locked', True)
 
@@ -199,18 +218,25 @@ class CourseTestCase(ModuleStoreTestCase):
             self.assertEqual(self.store.has_published_version(item), publish_state)
 
         def get_and_verify_publish_state(item_type, item_name, publish_state):
-            """Gets the given item from the store and verifies the publish state of the item is as expected."""
+            """
+            Gets the given item from the store and verifies the publish state
+            of the item is as expected.
+            """
             item = self.store.get_item(course_id.make_usage_key(item_type, item_name))
             verify_item_publish_state(item, publish_state)
             return item
 
-        # verify that the draft vertical is draft
+        # verify draft vertical has a published version with published children
         vertical = get_and_verify_publish_state('vertical', self.TEST_VERTICAL, True)
         for child in vertical.get_children():
             verify_item_publish_state(child, True)
 
-        # make sure that we don't have a sequential that is not in draft mode
+        # verify that it has a draft too
+        self.assertTrue(getattr(vertical, "is_draft", False))
+
+        # make sure that we don't have a sequential that is in draft mode
         sequential = get_and_verify_publish_state('sequential', self.SEQUENTIAL, True)
+        self.assertFalse(getattr(sequential, "is_draft", False))
 
         # verify that we have the private vertical
         private_vertical = get_and_verify_publish_state('vertical', self.PRIVATE_VERTICAL, False)
@@ -218,10 +244,24 @@ class CourseTestCase(ModuleStoreTestCase):
         # verify that we have the public vertical
         public_vertical = get_and_verify_publish_state('vertical', self.PUBLISHED_VERTICAL, True)
 
+        # verify that we have the draft html
+        draft_html = self.store.get_item(course_id.make_usage_key('html', self.DRAFT_HTML))
+        self.assertTrue(getattr(draft_html, 'is_draft', False))
+
+        # verify that we have the draft video
+        draft_video = self.store.get_item(course_id.make_usage_key('video', self.DRAFT_VIDEO))
+        self.assertTrue(getattr(draft_video, 'is_draft', False))
+
         # verify verticals are children of sequential
         for vert in [vertical, private_vertical, public_vertical]:
             self.assertIn(vert.location, sequential.children)
 
+        # verify draft html is the child of the public vertical
+        self.assertIn(draft_html.location, public_vertical.children)
+
+        # verify draft video is the child of the public vertical
+        self.assertIn(draft_video.location, public_vertical.children)
+
         # verify textbook exists
         course = self.store.get_course(course_id)
         self.assertGreater(len(course.textbooks), 0)
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index 79056f749d..77f6c95b58 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -1290,10 +1290,12 @@ class GroupConfiguration(object):
                 'container_handler',
                 course.location.course_key.make_usage_key(unit.location.block_type, unit.location.name)
             )
+
+            validation_summary = split_test.general_validation_message()
             usage_info[split_test.user_partition_id].append({
                 'label': '{} / {}'.format(unit.display_name, split_test.display_name),
                 'url': unit_url,
-                'validation': split_test.general_validation_message,
+                'validation': validation_summary.to_json() if validation_summary else None,
             })
         return usage_info
 
diff --git a/cms/djangoapps/contentstore/views/tests/test_assets.py b/cms/djangoapps/contentstore/views/tests/test_assets.py
index 98bdcf8e31..fa31e14888 100644
--- a/cms/djangoapps/contentstore/views/tests/test_assets.py
+++ b/cms/djangoapps/contentstore/views/tests/test_assets.py
@@ -1,11 +1,6 @@
 """
 Unit tests for the asset upload endpoint.
 """
-
-# pylint: disable=C0111
-# pylint: disable=W0621
-# pylint: disable=W0212
-
 from datetime import datetime
 from io import BytesIO
 from pytz import UTC
@@ -13,12 +8,17 @@ import json
 from contentstore.tests.utils import CourseTestCase
 from contentstore.views import assets
 from contentstore.utils import reverse_course_url
+from xmodule.assetstore.assetmgr import AssetMetadataFoundTemporary
+from xmodule.assetstore import AssetMetadata
 from xmodule.contentstore.content import StaticContent
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.xml_importer import import_from_xml
 from django.test.utils import override_settings
 from opaque_keys.edx.locations import SlashSeparatedCourseKey, AssetLocation
+from django.conf import settings
+
+TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 
 
 class AssetsTestCase(CourseTestCase):
@@ -30,12 +30,18 @@ class AssetsTestCase(CourseTestCase):
         self.url = reverse_course_url('assets_handler', self.course.id)
 
     def upload_asset(self, name="asset-1"):
+        """
+        Post to the asset upload url
+        """
         f = BytesIO(name)
         f.name = name + ".txt"
         return self.client.post(self.url, {"name": name, "file": f})
 
 
 class BasicAssetsTestCase(AssetsTestCase):
+    """
+    Test getting assets via html w/o additional args
+    """
     def test_basic(self):
         resp = self.client.get(self.url, HTTP_ACCEPT='text/html')
         self.assertEquals(resp.status_code, 200)
@@ -52,7 +58,7 @@ class BasicAssetsTestCase(AssetsTestCase):
         course_items = import_from_xml(
             module_store,
             self.user.id,
-            'common/test/data/',
+            TEST_DATA_DIR,
             ['toy'],
             static_content_store=contentstore(),
             verbose=True
@@ -76,6 +82,9 @@ class PaginationTestCase(AssetsTestCase):
     Tests the pagination of assets returned from the REST API.
     """
     def test_json_responses(self):
+        """
+        Test the ajax asset interfaces
+        """
         self.upload_asset("asset-1")
         self.upload_asset("asset-2")
         self.upload_asset("asset-3")
@@ -95,20 +104,26 @@ class PaginationTestCase(AssetsTestCase):
         self.assert_correct_asset_response(self.url + "?page_size=3&page=1", 0, 3, 3)
 
     def assert_correct_asset_response(self, url, expected_start, expected_length, expected_total):
+        """
+        Get from the url and ensure it contains the expected number of responses
+        """
         resp = self.client.get(url, HTTP_ACCEPT='application/json')
         json_response = json.loads(resp.content)
-        assets = json_response['assets']
+        assets_response = json_response['assets']
         self.assertEquals(json_response['start'], expected_start)
-        self.assertEquals(len(assets), expected_length)
+        self.assertEquals(len(assets_response), expected_length)
         self.assertEquals(json_response['totalCount'], expected_total)
 
     def assert_correct_sort_response(self, url, sort, direction):
+        """
+        Get from the url w/ a sort option and ensure items honor that sort
+        """
         resp = self.client.get(url + '?sort=' + sort + '&direction=' + direction, HTTP_ACCEPT='application/json')
         json_response = json.loads(resp.content)
-        assets = json_response['assets']
-        name1 = assets[0][sort]
-        name2 = assets[1][sort]
-        name3 = assets[2][sort]
+        assets_response = json_response['assets']
+        name1 = assets_response[0][sort]
+        name2 = assets_response[1][sort]
+        name3 = assets_response[2][sort]
         if direction == 'asc':
             self.assertLessEqual(name1, name2)
             self.assertLessEqual(name2, name3)
@@ -134,6 +149,49 @@ class UploadTestCase(AssetsTestCase):
         self.assertEquals(resp.status_code, 400)
 
 
+class DownloadTestCase(AssetsTestCase):
+    """
+    Unit tests for downloading a file.
+    """
+    def setUp(self):
+        super(DownloadTestCase, self).setUp()
+        self.url = reverse_course_url('assets_handler', self.course.id)
+        # First, upload something.
+        self.asset_name = 'download_test'
+        resp = self.upload_asset(self.asset_name)
+        self.assertEquals(resp.status_code, 200)
+        self.uploaded_url = json.loads(resp.content)['asset']['url']
+
+    def test_download(self):
+        # Now, download it.
+        resp = self.client.get(self.uploaded_url, HTTP_ACCEPT='text/html')
+        self.assertEquals(resp.status_code, 200)
+        self.assertEquals(resp.content, self.asset_name)
+
+    def test_download_not_found_throw(self):
+        url = self.uploaded_url.replace(self.asset_name, 'not_the_asset_name')
+        resp = self.client.get(url, HTTP_ACCEPT='text/html')
+        self.assertEquals(resp.status_code, 404)
+
+    def test_metadata_found_in_modulestore(self):
+        # Insert asset metadata into the modulestore (with no accompanying asset).
+        asset_key = self.course.id.make_asset_key(AssetMetadata.ASSET_TYPE, 'pic1.jpg')
+        asset_md = AssetMetadata(asset_key, {
+            'internal_name': 'EKMND332DDBK',
+            'basename': 'pix/archive',
+            'locked': False,
+            'curr_version': '14',
+            'prev_version': '13'
+        })
+        modulestore().save_asset_metadata(asset_md, 15)
+        # Get the asset metadata and have it be found in the modulestore.
+        # Currently, no asset metadata should be found in the modulestore. The code is not yet storing it there.
+        # If asset metadata *is* found there, an exception is raised. This test ensures the exception is indeed raised.
+        # THIS IS TEMPORARY. Soon, asset metadata *will* be stored in the modulestore.
+        with self.assertRaises((AssetMetadataFoundTemporary, NameError)):
+            self.client.get(unicode(asset_key), HTTP_ACCEPT='text/html')
+
+
 class AssetToJsonTestCase(AssetsTestCase):
     """
     Unit test for transforming asset information into something
@@ -147,6 +205,7 @@ class AssetToJsonTestCase(AssetsTestCase):
         location = course_key.make_asset_key('asset', 'my_file_name.jpg')
         thumbnail_location = course_key.make_asset_key('thumbnail', 'my_file_name_thumb.jpg')
 
+        # pylint: disable=protected-access
         output = assets._get_asset_json("my_file", upload_date, location, thumbnail_location, True)
 
         self.assertEquals(output["display_name"], "my_file")
@@ -185,6 +244,7 @@ class LockAssetTestCase(AssetsTestCase):
 
             resp = self.client.post(
                 url,
+                # pylint: disable=protected-access
                 json.dumps(assets._get_asset_json("sample_static.txt", upload_date, asset_location, None, lock)),
                 "application/json"
             )
@@ -196,7 +256,7 @@ class LockAssetTestCase(AssetsTestCase):
         course_items = import_from_xml(
             module_store,
             self.user.id,
-            'common/test/data/',
+            TEST_DATA_DIR,
             ['toy'],
             static_content_store=contentstore(),
             verbose=True
diff --git a/cms/djangoapps/contentstore/views/tests/test_course_index.py b/cms/djangoapps/contentstore/views/tests/test_course_index.py
index 83a00ebb5c..eb8adc5ea7 100644
--- a/cms/djangoapps/contentstore/views/tests/test_course_index.py
+++ b/cms/djangoapps/contentstore/views/tests/test_course_index.py
@@ -8,20 +8,17 @@ import datetime
 from contentstore.tests.utils import CourseTestCase
 from contentstore.utils import reverse_course_url, add_instructor
 from contentstore.views.access import has_course_access
-from contentstore.views.course import course_outline_initial_state, _course_outline_json
+from contentstore.views.course import course_outline_initial_state
 from contentstore.views.item import create_xblock_info, VisibilityState
 from course_action_state.models import CourseRerunState
 from util.date_utils import get_default_time_display
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, check_mongo_calls, \
-    mongo_uses_error_check
+from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from opaque_keys.edx.locator import CourseLocator
 from student.tests.factories import UserFactory
 from course_action_state.managers import CourseRerunUIStateManager
 from django.conf import settings
-import ddt
-import threading
 import pytz
 
 
@@ -312,28 +309,3 @@ class TestCourseOutline(CourseTestCase):
 
         self.assertEqual(_get_release_date(response), get_default_time_display(self.course.start))
         _assert_settings_link_present(response)
-
-
-@ddt.ddt
-class OutlinePerfTest(TestCourseOutline):
-    def setUp(self):
-        with modulestore().default_store(ModuleStoreEnum.Type.split):
-            super(OutlinePerfTest, self).setUp()
-
-    @ddt.data(1, 2, 4, 8)
-    def test_query_counts(self, num_threads):
-        """
-        Test that increasing threads does not increase query counts
-        """
-        def test_client():
-            with modulestore().default_store(ModuleStoreEnum.Type.split):
-                with modulestore().bulk_operations(self.course.id):
-                    course = modulestore().get_course(self.course.id, depth=0)
-                    return _course_outline_json(None, course)
-
-        per_thread = 4
-        with check_mongo_calls(per_thread * num_threads, 0):
-            outline_threads = [threading.Thread(target=test_client) for __ in xrange(num_threads)]
-            [thread.start() for thread in outline_threads]
-            # now wait until they all finish
-            [thread.join() for thread in outline_threads]
diff --git a/cms/djangoapps/contentstore/views/tests/test_group_configurations.py b/cms/djangoapps/contentstore/views/tests/test_group_configurations.py
index ca122a58f7..7d03c23c0f 100644
--- a/cms/djangoapps/contentstore/views/tests/test_group_configurations.py
+++ b/cms/djangoapps/contentstore/views/tests/test_group_configurations.py
@@ -9,7 +9,7 @@ from contentstore.views.course import GroupConfiguration
 from contentstore.tests.utils import CourseTestCase
 from xmodule.partitions.partitions import Group, UserPartition
 from xmodule.modulestore.tests.factories import ItemFactory
-from xmodule.split_test_module import ValidationMessage, ValidationMessageType
+from xmodule.validation import StudioValidation, StudioValidationMessage
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore import ModuleStoreEnum
 
@@ -541,87 +541,75 @@ class GroupConfigurationsValidationTestCase(CourseTestCase, HelperMethods):
     def setUp(self):
         super(GroupConfigurationsValidationTestCase, self).setUp()
 
-    @patch('xmodule.split_test_module.SplitTestDescriptor.validation_messages')
-    def test_error_message_present(self, mocked_validation_messages):
+    @patch('xmodule.split_test_module.SplitTestDescriptor.validate_split_test')
+    def verify_validation_add_usage_info(self, expected_result, mocked_message, mocked_validation_messages):
         """
-        Tests if validation message is present.
+        Helper method for testing validation information present after add_usage_info.
         """
         self._add_user_partitions()
         split_test = self._create_content_experiment(cid=0, name_suffix='0')[1]
 
-        mocked_validation_messages.return_value = [
-            ValidationMessage(
-                split_test,
-                u"Validation message",
-                ValidationMessageType.error
-            )
-        ]
-        group_configuration = GroupConfiguration.add_usage_info(self.course, self.store)[0]
-        self.assertEqual(
-            group_configuration['usage'][0]['validation'],
-            {
-                'message': u'This content experiment has issues that affect content visibility.',
-                'type': 'error'
-            }
-        )
+        validation = StudioValidation(split_test.location)
+        validation.add(mocked_message)
+        mocked_validation_messages.return_value = validation
 
-    @patch('xmodule.split_test_module.SplitTestDescriptor.validation_messages')
-    def test_warning_message_present(self, mocked_validation_messages):
+        group_configuration = GroupConfiguration.add_usage_info(self.course, self.store)[0]
+        self.assertEqual(expected_result.to_json(), group_configuration['usage'][0]['validation'])
+
+    def test_error_message_present(self):
         """
-        Tests if validation message is present.
+        Tests if validation message is present (error case).
+        """
+        mocked_message = StudioValidationMessage(StudioValidationMessage.ERROR, u"Validation message")
+        expected_result = StudioValidationMessage(
+            StudioValidationMessage.ERROR, u"This content experiment has issues that affect content visibility."
+        )
+        self.verify_validation_add_usage_info(expected_result, mocked_message)  # pylint: disable=no-value-for-parameter
+
+    def test_warning_message_present(self):
+        """
+        Tests if validation message is present (warning case).
+        """
+        mocked_message = StudioValidationMessage(StudioValidationMessage.WARNING, u"Validation message")
+        expected_result = StudioValidationMessage(
+            StudioValidationMessage.WARNING, u"This content experiment has issues that affect content visibility."
+        )
+        self.verify_validation_add_usage_info(expected_result, mocked_message)  # pylint: disable=no-value-for-parameter
+
+    @patch('xmodule.split_test_module.SplitTestDescriptor.validate_split_test')
+    def verify_validation_update_usage_info(self, expected_result, mocked_message, mocked_validation_messages):
+        """
+        Helper method for testing validation information present after update_usage_info.
         """
         self._add_user_partitions()
         split_test = self._create_content_experiment(cid=0, name_suffix='0')[1]
 
-        mocked_validation_messages.return_value = [
-            ValidationMessage(
-                split_test,
-                u"Validation message",
-                ValidationMessageType.warning
-            )
-        ]
-        group_configuration = GroupConfiguration.add_usage_info(self.course, self.store)[0]
+        validation = StudioValidation(split_test.location)
+        if mocked_message is not None:
+            validation.add(mocked_message)
+        mocked_validation_messages.return_value = validation
+
+        group_configuration = GroupConfiguration.update_usage_info(
+            self.store, self.course, self.course.user_partitions[0]
+        )
         self.assertEqual(
-            group_configuration['usage'][0]['validation'],
-            {
-                'message': u'This content experiment has issues that affect content visibility.',
-                'type': 'warning'
-            }
+            expected_result.to_json() if expected_result is not None else None,
+            group_configuration['usage'][0]['validation']
         )
 
-    @patch('xmodule.split_test_module.SplitTestDescriptor.validation_messages')
-    def test_update_usage_info(self, mocked_validation_messages):
+    def test_update_usage_info(self):
         """
         Tests if validation message is present when updating usage info.
         """
-        self._add_user_partitions()
-        split_test = self._create_content_experiment(cid=0, name_suffix='0')[1]
-
-        mocked_validation_messages.return_value = [
-            ValidationMessage(
-                split_test,
-                u"Validation message",
-                ValidationMessageType.warning
-            )
-        ]
-
-        group_configuration = GroupConfiguration.update_usage_info(self.store, self.course, self.course.user_partitions[0])
-
-        self.assertEqual(
-            group_configuration['usage'][0]['validation'],
-            {
-                'message': u'This content experiment has issues that affect content visibility.',
-                'type': 'warning'
-            }
+        mocked_message = StudioValidationMessage(StudioValidationMessage.WARNING, u"Validation message")
+        expected_result = StudioValidationMessage(
+            StudioValidationMessage.WARNING, u"This content experiment has issues that affect content visibility."
         )
+        # pylint: disable=no-value-for-parameter
+        self.verify_validation_update_usage_info(expected_result, mocked_message)
 
-    @patch('xmodule.split_test_module.SplitTestDescriptor.validation_messages')
-    def test_update_usage_info_no_message(self, mocked_validation_messages):
+    def test_update_usage_info_no_message(self):
         """
         Tests if validation message is not present when updating usage info.
         """
-        self._add_user_partitions()
-        self._create_content_experiment(cid=0, name_suffix='0')
-        mocked_validation_messages.return_value = []
-        group_configuration = GroupConfiguration.update_usage_info(self.store, self.course, self.course.user_partitions[0])
-        self.assertEqual(group_configuration['usage'][0]['validation'], None)
+        self.verify_validation_update_usage_info(None, None)  # pylint: disable=no-value-for-parameter
diff --git a/cms/djangoapps/contentstore/views/tests/test_item.py b/cms/djangoapps/contentstore/views/tests/test_item.py
index c765f1da55..a1296a9495 100644
--- a/cms/djangoapps/contentstore/views/tests/test_item.py
+++ b/cms/djangoapps/contentstore/views/tests/test_item.py
@@ -130,8 +130,10 @@ class GetItemTest(ItemTest):
         root_usage_key = self._create_vertical()
         html, __ = self._get_container_preview(root_usage_key)
 
-        # Verify that the Studio wrapper is not added
-        self.assertNotIn('wrapper-xblock', html)
+        # XBlock messages are added by the Studio wrapper.
+        self.assertIn('wrapper-xblock-message', html)
+        # Make sure that "wrapper-xblock" does not appear by itself (without -message at end).
+        self.assertNotRegexpMatches(html, r'wrapper-xblock[^-]+')
 
         # Verify that the header and article tags are still added
         self.assertIn('<header class="xblock-header xblock-header-vertical">', html)
diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index c37a36d02f..2c6b730833 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -215,14 +215,8 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
     AUTH_TOKENS = json.load(auth_file)
 
 ############### XBlock filesystem field config ##########
-if 'XBLOCK_FS_STORAGE_BUCKET' in ENV_TOKENS:
-    DJFS = {
-        'type' : 's3fs',
-        'bucket' : ENV_TOKENS.get('XBLOCK_FS_STORAGE_BUCKET', None),
-        'prefix' : ENV_TOKENS.get('XBLOCK_FS_STORAGE_PREFIX', '/xblock-storage/'),
-        'aws_access_key_id' : AUTH_TOKENS.get('AWS_ACCESS_KEY_ID', None),
-        'aws_secret_access_key' : AUTH_TOKENS.get('AWS_SECRET_ACCESS_KEY', None)
-    }
+if 'DJFS' in AUTH_TOKENS and AUTH_TOKENS['DJFS'] is not None:
+    DJFS = AUTH_TOKENS['DJFS']
 
 EMAIL_HOST_USER = AUTH_TOKENS.get('EMAIL_HOST_USER', EMAIL_HOST_USER)
 EMAIL_HOST_PASSWORD = AUTH_TOKENS.get('EMAIL_HOST_PASSWORD', EMAIL_HOST_PASSWORD)
diff --git a/cms/envs/bok_choy.auth.json b/cms/envs/bok_choy.auth.json
index 74dab5ed55..17b46a9b6c 100644
--- a/cms/envs/bok_choy.auth.json
+++ b/cms/envs/bok_choy.auth.json
@@ -89,6 +89,13 @@
         "url": "http://localhost:18060/",
         "username": "lms"
     },
+    "DJFS": {
+            "type": "s3fs",
+            "bucket": "test",
+            "prefix": "test",
+            "aws_access_key_id": "test",
+            "aws_secret_access_key": "test"
+    },
     "SECRET_KEY": "",
     "XQUEUE_INTERFACE": {
         "basic_auth": [
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 93c0fb4a74..2e987ed5b0 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -292,7 +292,6 @@ MANAGERS = ADMINS
 
 # Static content
 STATIC_URL = '/static/' + git.revision + "/"
-ADMIN_MEDIA_PREFIX = '/static/admin/'
 STATIC_ROOT = ENV_ROOT / "staticfiles" / git.revision
 
 STATICFILES_DIRS = [
diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee
index 10a277b28c..45ff7269d6 100644
--- a/cms/static/coffee/spec/main.coffee
+++ b/cms/static/coffee/spec/main.coffee
@@ -213,6 +213,7 @@ define([
     "js/spec/models/component_template_spec",
     "js/spec/models/explicit_url_spec",
     "js/spec/models/xblock_info_spec",
+    "js/spec/models/xblock_validation_spec",
 
     "js/spec/utils/drag_and_drop_spec",
     "js/spec/utils/handle_iframe_binding_spec",
@@ -228,6 +229,7 @@ define([
     "js/spec/views/xblock_spec",
     "js/spec/views/xblock_editor_spec",
     "js/spec/views/xblock_string_field_editor_spec",
+    "js/spec/views/xblock_validation_spec",
 
     "js/spec/views/utils/view_utils_spec",
 
diff --git a/cms/static/img/blue-spinner.gif b/cms/static/img/blue-spinner.gif
deleted file mode 100644
index 2cee72553a..0000000000
Binary files a/cms/static/img/blue-spinner.gif and /dev/null differ
diff --git a/cms/static/img/breadcrumb-arrow.png b/cms/static/img/breadcrumb-arrow.png
deleted file mode 100644
index 5dca714363..0000000000
Binary files a/cms/static/img/breadcrumb-arrow.png and /dev/null differ
diff --git a/cms/static/img/calendar-icon.png b/cms/static/img/calendar-icon.png
deleted file mode 100644
index 5d30a27c01..0000000000
Binary files a/cms/static/img/calendar-icon.png and /dev/null differ
diff --git a/cms/static/img/close-icon.png b/cms/static/img/close-icon.png
deleted file mode 100644
index 684399725b..0000000000
Binary files a/cms/static/img/close-icon.png and /dev/null differ
diff --git a/cms/static/img/collapse-all-icon.png b/cms/static/img/collapse-all-icon.png
deleted file mode 100644
index c468778b02..0000000000
Binary files a/cms/static/img/collapse-all-icon.png and /dev/null differ
diff --git a/cms/static/img/content-types/chapter.png b/cms/static/img/content-types/chapter.png
deleted file mode 100644
index 2903f668d0..0000000000
Binary files a/cms/static/img/content-types/chapter.png and /dev/null differ
diff --git a/cms/static/img/content-types/html.png b/cms/static/img/content-types/html.png
deleted file mode 100644
index 566d0a232e..0000000000
Binary files a/cms/static/img/content-types/html.png and /dev/null differ
diff --git a/cms/static/img/content-types/lab.png b/cms/static/img/content-types/lab.png
deleted file mode 100644
index f5b457b8f2..0000000000
Binary files a/cms/static/img/content-types/lab.png and /dev/null differ
diff --git a/cms/static/img/content-types/module.png b/cms/static/img/content-types/module.png
deleted file mode 100644
index 643c12d1d9..0000000000
Binary files a/cms/static/img/content-types/module.png and /dev/null differ
diff --git a/cms/static/img/content-types/problem.png b/cms/static/img/content-types/problem.png
deleted file mode 100644
index 198e57d629..0000000000
Binary files a/cms/static/img/content-types/problem.png and /dev/null differ
diff --git a/cms/static/img/content-types/problemset.png b/cms/static/img/content-types/problemset.png
deleted file mode 100644
index 85576db2ac..0000000000
Binary files a/cms/static/img/content-types/problemset.png and /dev/null differ
diff --git a/cms/static/img/content-types/sequential.png b/cms/static/img/content-types/sequential.png
deleted file mode 100644
index f0fda6d490..0000000000
Binary files a/cms/static/img/content-types/sequential.png and /dev/null differ
diff --git a/cms/static/img/content-types/vertical.png b/cms/static/img/content-types/vertical.png
deleted file mode 100644
index 17e4833f8b..0000000000
Binary files a/cms/static/img/content-types/vertical.png and /dev/null differ
diff --git a/cms/static/img/content-types/video.png b/cms/static/img/content-types/video.png
deleted file mode 100644
index 1c9f0176bc..0000000000
Binary files a/cms/static/img/content-types/video.png and /dev/null differ
diff --git a/cms/static/img/content-types/videosequence.png b/cms/static/img/content-types/videosequence.png
deleted file mode 100644
index 3a6c85843b..0000000000
Binary files a/cms/static/img/content-types/videosequence.png and /dev/null differ
diff --git a/cms/static/img/date-circle.png b/cms/static/img/date-circle.png
deleted file mode 100644
index 10b654735d..0000000000
Binary files a/cms/static/img/date-circle.png and /dev/null differ
diff --git a/cms/static/img/delete-icon-white.png b/cms/static/img/delete-icon-white.png
deleted file mode 100644
index 3a1efd1f97..0000000000
Binary files a/cms/static/img/delete-icon-white.png and /dev/null differ
diff --git a/cms/static/img/delete-icon.png b/cms/static/img/delete-icon.png
deleted file mode 100644
index 9c7f65daef..0000000000
Binary files a/cms/static/img/delete-icon.png and /dev/null differ
diff --git a/cms/static/img/discussion-module.png b/cms/static/img/discussion-module.png
deleted file mode 100644
index 1eed318e57..0000000000
Binary files a/cms/static/img/discussion-module.png and /dev/null differ
diff --git a/cms/static/img/drag-handle.png b/cms/static/img/drag-handle.png
deleted file mode 100644
index 3c9c3c1ebc..0000000000
Binary files a/cms/static/img/drag-handle.png and /dev/null differ
diff --git a/cms/static/img/due-date-icon.png b/cms/static/img/due-date-icon.png
deleted file mode 100644
index 294837a1df..0000000000
Binary files a/cms/static/img/due-date-icon.png and /dev/null differ
diff --git a/cms/static/img/dummy-calendar.png b/cms/static/img/dummy-calendar.png
deleted file mode 100644
index 4720877235..0000000000
Binary files a/cms/static/img/dummy-calendar.png and /dev/null differ
diff --git a/cms/static/img/edit-icon-white.png b/cms/static/img/edit-icon-white.png
deleted file mode 100644
index 0469d56c89..0000000000
Binary files a/cms/static/img/edit-icon-white.png and /dev/null differ
diff --git a/cms/static/img/edit-icon.png b/cms/static/img/edit-icon.png
deleted file mode 100644
index 748d3d2115..0000000000
Binary files a/cms/static/img/edit-icon.png and /dev/null differ
diff --git a/cms/static/img/edx-labs-logo-small.png b/cms/static/img/edx-labs-logo-small.png
deleted file mode 100644
index 992e158148..0000000000
Binary files a/cms/static/img/edx-labs-logo-small.png and /dev/null differ
diff --git a/cms/static/img/logo-edx-studio.png b/cms/static/img/edx-studio-logo.png
similarity index 100%
rename from cms/static/img/logo-edx-studio.png
rename to cms/static/img/edx-studio-logo.png
diff --git a/cms/static/img/expand-collapse-icons.png b/cms/static/img/expand-collapse-icons.png
deleted file mode 100644
index a4a1518ec9..0000000000
Binary files a/cms/static/img/expand-collapse-icons.png and /dev/null differ
diff --git a/cms/static/img/file-icon.png b/cms/static/img/file-icon.png
deleted file mode 100644
index b054232f76..0000000000
Binary files a/cms/static/img/file-icon.png and /dev/null differ
diff --git a/cms/static/img/folder-icon.png b/cms/static/img/folder-icon.png
deleted file mode 100644
index a98a6b995e..0000000000
Binary files a/cms/static/img/folder-icon.png and /dev/null differ
diff --git a/cms/static/img/home-icon-blue.png b/cms/static/img/home-icon-blue.png
deleted file mode 100644
index 45b4971a2a..0000000000
Binary files a/cms/static/img/home-icon-blue.png and /dev/null differ
diff --git a/cms/static/img/home-icon.png b/cms/static/img/home-icon.png
deleted file mode 100644
index be44bc2089..0000000000
Binary files a/cms/static/img/home-icon.png and /dev/null differ
diff --git a/cms/static/img/indicator.gif b/cms/static/img/indicator.gif
deleted file mode 100755
index 085ccaecaf..0000000000
Binary files a/cms/static/img/indicator.gif and /dev/null differ
diff --git a/cms/static/img/large-annotations-icon.png b/cms/static/img/large-annotations-icon.png
deleted file mode 100644
index 249193521f..0000000000
Binary files a/cms/static/img/large-annotations-icon.png and /dev/null differ
diff --git a/cms/static/img/large-freeform-icon.png b/cms/static/img/large-freeform-icon.png
deleted file mode 100644
index 0d5e454f58..0000000000
Binary files a/cms/static/img/large-freeform-icon.png and /dev/null differ
diff --git a/cms/static/img/html-icon.png b/cms/static/img/large-html-icon.png
similarity index 100%
rename from cms/static/img/html-icon.png
rename to cms/static/img/large-html-icon.png
diff --git a/cms/static/img/large-openended-icon.png b/cms/static/img/large-openended-icon.png
deleted file mode 100644
index 4d31815413..0000000000
Binary files a/cms/static/img/large-openended-icon.png and /dev/null differ
diff --git a/cms/static/img/large-slide-icon.png b/cms/static/img/large-slide-icon.png
deleted file mode 100644
index 04241fa2f7..0000000000
Binary files a/cms/static/img/large-slide-icon.png and /dev/null differ
diff --git a/cms/static/img/large-textbook-icon.png b/cms/static/img/large-textbook-icon.png
deleted file mode 100644
index 1ac2db86d2..0000000000
Binary files a/cms/static/img/large-textbook-icon.png and /dev/null differ
diff --git a/cms/static/img/large-toggles.png b/cms/static/img/large-toggles.png
deleted file mode 100644
index 8c38a77ba0..0000000000
Binary files a/cms/static/img/large-toggles.png and /dev/null differ
diff --git a/cms/static/img/list-icon.png b/cms/static/img/list-icon.png
deleted file mode 100644
index ab46179cec..0000000000
Binary files a/cms/static/img/list-icon.png and /dev/null differ
diff --git a/cms/static/img/log-out-icon.png b/cms/static/img/log-out-icon.png
deleted file mode 100644
index 887d59f45d..0000000000
Binary files a/cms/static/img/log-out-icon.png and /dev/null differ
diff --git a/cms/static/img/menu.png b/cms/static/img/menu.png
deleted file mode 100644
index 7449b34c1c..0000000000
Binary files a/cms/static/img/menu.png and /dev/null differ
diff --git a/cms/static/img/new-folder-icon.png b/cms/static/img/new-folder-icon.png
deleted file mode 100644
index 6bcef05c3e..0000000000
Binary files a/cms/static/img/new-folder-icon.png and /dev/null differ
diff --git a/cms/static/img/new-unit-icon.png b/cms/static/img/new-unit-icon.png
deleted file mode 100644
index ba5d706953..0000000000
Binary files a/cms/static/img/new-unit-icon.png and /dev/null differ
diff --git a/cms/static/img/noise.png b/cms/static/img/noise.png
deleted file mode 100644
index 8fa5168293..0000000000
Binary files a/cms/static/img/noise.png and /dev/null differ
diff --git a/cms/static/img/pl-1x1-000.png b/cms/static/img/pl-1x1-000.png
deleted file mode 100644
index b94b7a9746..0000000000
Binary files a/cms/static/img/pl-1x1-000.png and /dev/null differ
diff --git a/cms/static/img/pl-1x1-fff.png b/cms/static/img/pl-1x1-fff.png
deleted file mode 100644
index 7081c75d36..0000000000
Binary files a/cms/static/img/pl-1x1-fff.png and /dev/null differ
diff --git a/cms/static/img/plus-icon-small.png b/cms/static/img/plus-icon-small.png
deleted file mode 100644
index 1abb12b6da..0000000000
Binary files a/cms/static/img/plus-icon-small.png and /dev/null differ
diff --git a/cms/static/img/plus-icon-white.png b/cms/static/img/plus-icon-white.png
deleted file mode 100644
index d2c5263f93..0000000000
Binary files a/cms/static/img/plus-icon-white.png and /dev/null differ
diff --git a/cms/static/img/plus-icon.png b/cms/static/img/plus-icon.png
deleted file mode 100644
index 3ffa4f2f69..0000000000
Binary files a/cms/static/img/plus-icon.png and /dev/null differ
diff --git a/cms/static/img/preview.jpg b/cms/static/img/preview.jpg
deleted file mode 100644
index c69e60d9b0..0000000000
Binary files a/cms/static/img/preview.jpg and /dev/null differ
diff --git a/cms/static/img/sequence-icon.png b/cms/static/img/sequence-icon.png
deleted file mode 100644
index f95065b5eb..0000000000
Binary files a/cms/static/img/sequence-icon.png and /dev/null differ
diff --git a/cms/static/img/slides-icon.png b/cms/static/img/slides-icon.png
deleted file mode 100644
index e1dae5185b..0000000000
Binary files a/cms/static/img/slides-icon.png and /dev/null differ
diff --git a/cms/static/img/small-home-icon.png b/cms/static/img/small-home-icon.png
deleted file mode 100644
index 5755bf659d..0000000000
Binary files a/cms/static/img/small-home-icon.png and /dev/null differ
diff --git a/cms/static/img/small-toggle-icons.png b/cms/static/img/small-toggle-icons.png
deleted file mode 100644
index ad6585862e..0000000000
Binary files a/cms/static/img/small-toggle-icons.png and /dev/null differ
diff --git a/cms/static/img/small-toggle-off.png b/cms/static/img/small-toggle-off.png
deleted file mode 100644
index 2238454bae..0000000000
Binary files a/cms/static/img/small-toggle-off.png and /dev/null differ
diff --git a/cms/static/img/small-toggle-on.png b/cms/static/img/small-toggle-on.png
deleted file mode 100644
index f744e920c5..0000000000
Binary files a/cms/static/img/small-toggle-on.png and /dev/null differ
diff --git a/cms/static/img/spinner-in-field.gif b/cms/static/img/spinner-in-field.gif
deleted file mode 100644
index fe2f556f5e..0000000000
Binary files a/cms/static/img/spinner-in-field.gif and /dev/null differ
diff --git a/cms/static/img/textbook-icon.png b/cms/static/img/textbook-icon.png
deleted file mode 100644
index 11e4abb363..0000000000
Binary files a/cms/static/img/textbook-icon.png and /dev/null differ
diff --git a/cms/static/img/upload-icon.png b/cms/static/img/upload-icon.png
deleted file mode 100644
index 0a78627f87..0000000000
Binary files a/cms/static/img/upload-icon.png and /dev/null differ
diff --git a/cms/static/img/video-icon.png b/cms/static/img/video-icon.png
deleted file mode 100644
index 5f8c930d16..0000000000
Binary files a/cms/static/img/video-icon.png and /dev/null differ
diff --git a/cms/static/img/video-module.png b/cms/static/img/video-module.png
deleted file mode 100644
index 2a0c340d47..0000000000
Binary files a/cms/static/img/video-module.png and /dev/null differ
diff --git a/cms/static/img/video.jpg b/cms/static/img/video.jpg
deleted file mode 100644
index e92271c3ad..0000000000
Binary files a/cms/static/img/video.jpg and /dev/null differ
diff --git a/cms/static/img/white-drag-handles.png b/cms/static/img/white-drag-handles.png
deleted file mode 100644
index 802a663893..0000000000
Binary files a/cms/static/img/white-drag-handles.png and /dev/null differ
diff --git a/cms/static/js/factories/import.js b/cms/static/js/factories/import.js
index 2577844e42..acefd1a6c6 100644
--- a/cms/static/js/factories/import.js
+++ b/cms/static/js/factories/import.js
@@ -28,6 +28,7 @@ define([
             autoUpload: false,
             add: function(e, data) {
                 CourseImport.clearImportDisplay();
+                CourseImport.okayToNavigateAway = false;
                 submitBtn.unbind('click');
                 file = data.files[0];
                 if (file.name.match(/tar\.gz$/)) {
@@ -97,7 +98,9 @@ define([
             },
             start: function(event) {
                 window.onbeforeunload = function() {
-                    return gettext('Your import is in progress; navigating away will abort it.');
+                    if (!CourseImport.okayToNavigateAway) {
+                        return "${_('Your import is in progress; navigating away will abort it.')}";
+                    }
                 };
             },
             sequentialUploads: true,
diff --git a/cms/static/js/models/xblock_validation.js b/cms/static/js/models/xblock_validation.js
new file mode 100644
index 0000000000..f48f593afd
--- /dev/null
+++ b/cms/static/js/models/xblock_validation.js
@@ -0,0 +1,46 @@
+define(["backbone", "gettext", "underscore"], function (Backbone, gettext, _) {
+    /**
+     * Model for xblock validation messages as displayed in Studio.
+     */
+    var XBlockValidationModel = Backbone.Model.extend({
+        defaults: {
+            summary: {},
+            messages: [],
+            empty: true,
+            xblock_id: null
+        },
+
+        WARNING : "warning",
+        ERROR: "error",
+        NOT_CONFIGURED: "not-configured",
+
+        parse: function(response) {
+            if (!response.empty) {
+                var summary = "summary" in response ? response.summary : {};
+                var messages = "messages" in response ? response.messages : [];
+                if (!(_.has(summary, "text")) || !summary.text) {
+                    summary.text = gettext("This component has validation issues.");
+                }
+                if (!(_.has(summary, "type")) || !summary.type) {
+                    summary.type = this.WARNING;
+                    // Possible types are ERROR, WARNING, and NOT_CONFIGURED. NOT_CONFIGURED is treated as a warning.
+                    _.find(messages, function (message) {
+                        if (message.type === this.ERROR) {
+                            summary.type = this.ERROR;
+                            return true;
+                        }
+                        return false;
+                    }, this);
+                }
+                response.summary = summary;
+                if (response.showSummaryOnly) {
+                    messages = [];
+                }
+                response.messages = messages;
+            }
+
+            return response;
+        }
+    });
+    return XBlockValidationModel;
+});
diff --git a/cms/static/js/spec/models/xblock_validation_spec.js b/cms/static/js/spec/models/xblock_validation_spec.js
new file mode 100644
index 0000000000..5b1fc5e9b1
--- /dev/null
+++ b/cms/static/js/spec/models/xblock_validation_spec.js
@@ -0,0 +1,152 @@
+define(['js/models/xblock_validation'],
+    function(XBlockValidationModel) {
+        var verifyModel;
+
+        verifyModel = function(model, expected_empty, expected_summary, expected_messages, expected_xblock_id) {
+            expect(model.get("empty")).toBe(expected_empty);
+            expect(model.get("summary")).toEqual(expected_summary);
+            expect(model.get("messages")).toEqual(expected_messages);
+            expect(model.get("xblock_id")).toBe(expected_xblock_id);
+        };
+
+        describe('XBlockValidationModel', function() {
+            it('handles empty variable', function() {
+                verifyModel(new XBlockValidationModel({parse: true}), true, {}, [], null);
+                verifyModel(new XBlockValidationModel({"empty": true}, {parse: true}), true, {}, [], null);
+
+                // It is assumed that the "empty" state on the JSON object passed in is correct
+                // (no attempt is made to correct other variables based on empty==true).
+                verifyModel(
+                    new XBlockValidationModel(
+                        {"empty": true, "messages": [{"text": "Bad JSON case"}], "xblock_id": "id"},
+                        {parse: true}
+                    ),
+                    true,
+                    {},
+                    [{"text": "Bad JSON case"}], "id"
+                );
+            });
+
+            it('creates a summary if not defined', function() {
+                // Single warning message.
+                verifyModel(
+                    new XBlockValidationModel({
+                        "empty": false,
+                        "xblock_id": "id"
+                    }, {parse: true}),
+                    false,
+                    {"text": "This component has validation issues.", "type": "warning"},
+                    [],
+                    "id"
+                );
+                // Two messages that compute to a "warning" state in the summary.
+                verifyModel(
+                    new XBlockValidationModel({
+                        "empty": false,
+                        "messages": [{"text": "one", "type": "not-configured"}, {"text": "two", "type": "warning"}],
+                        "xblock_id": "id"
+                    }, {parse: true}),
+                    false,
+                    {"text": "This component has validation issues.", "type": "warning"},
+                    [{"text": "one", "type": "not-configured"}, {"text": "two", "type": "warning"}],
+                    "id"
+                );
+                // Two messages, with one of them "error", resulting in an "error" state in the summary.
+                verifyModel(
+                    new XBlockValidationModel({
+                        "empty": false,
+                        "messages": [{"text": "one", "type": "warning"}, {"text": "two", "type": "error"}],
+                        "xblock_id": "id"
+                    }, {parse: true}),
+                    false,
+                    {"text": "This component has validation issues.", "type": "error"},
+                    [{"text": "one", "type": "warning"}, {"text": "two", "type": "error"}],
+                    "id"
+                );
+            });
+
+            it('respects summary properties that are defined', function() {
+                // Summary already present (both text and type), no messages.
+                verifyModel(
+                    new XBlockValidationModel({
+                        "empty": false,
+                        "xblock_id": "id",
+                        "summary": {"text": "my summary", "type": "custom type"}
+                    }, {parse: true}),
+                    false,
+                    {"text": "my summary", "type": "custom type"},
+                    [],
+                    "id"
+                );
+                // Summary text present, but not type (will get default value of warning).
+                verifyModel(
+                    new XBlockValidationModel({
+                        "empty": false,
+                        "xblock_id": "id",
+                        "summary": {"text": "my summary"}
+                    }, {parse: true}),
+                    false,
+                    {"text": "my summary", "type": "warning"},
+                    [],
+                    "id"
+                );
+                // Summary type present, but not text.
+                verifyModel(
+                    new XBlockValidationModel({
+                        "empty": false,
+                        "summary": {"type": "custom type"},
+                        "messages": [{"text": "one", "type": "not-configured"}, {"text": "two", "type": "warning"}],
+                        "xblock_id": "id"
+                    }, {parse: true}),
+                    false,
+                    {"text": "This component has validation issues.", "type": "custom type"},
+                    [{"text": "one", "type": "not-configured"}, {"text": "two", "type": "warning"}],
+                    "id"
+                );
+                // Summary text present, type will be computed as error.
+                verifyModel(
+                    new XBlockValidationModel({
+                        "empty": false,
+                        "summary": {"text": "my summary"},
+                        "messages": [{"text": "one", "type": "warning"}, {"text": "two", "type": "error"}],
+                        "xblock_id": "id"
+                    }, {parse: true}),
+                    false,
+                    {"text": "my summary", "type": "error"},
+                    [{"text": "one", "type": "warning"}, {"text": "two", "type": "error"}],
+                    "id"
+                );
+            });
+
+            it('clears messages if showSummaryOnly is true', function() {
+                verifyModel(
+                    new XBlockValidationModel({
+                        "empty": false,
+                        "xblock_id": "id",
+                        "summary": {"text": "my summary"},
+                        "messages": [{"text": "one", "type": "warning"}, {"text": "two", "type": "error"}],
+                        "showSummaryOnly": true
+                    }, {parse: true}),
+                    false,
+                    {"text": "my summary", "type": "error"},
+                    [],
+                    "id"
+                );
+
+                verifyModel(
+                    new XBlockValidationModel({
+                        "empty": false,
+                        "xblock_id": "id",
+                        "summary": {"text": "my summary"},
+                        "messages": [{"text": "one", "type": "warning"}, {"text": "two", "type": "error"}],
+                        "showSummaryOnly": false
+                    }, {parse: true}),
+                    false,
+                    {"text": "my summary", "type": "error"},
+                    [{"text": "one", "type": "warning"}, {"text": "two", "type": "error"}],
+                    "id"
+                );
+            });
+        });
+    }
+);
diff --git a/cms/static/js/spec/views/group_configuration_spec.js b/cms/static/js/spec/views/group_configuration_spec.js
index 9bc0ea3c9e..6a7abbf041 100644
--- a/cms/static/js/spec/views/group_configuration_spec.js
+++ b/cms/static/js/spec/views/group_configuration_spec.js
@@ -215,7 +215,7 @@ define([
                     'label': 'label1',
                     'url': 'url1',
                     'validation': {
-                        'message': "Warning message",
+                        'text': "Warning message",
                         'type': 'warning'
                     }
                 }
@@ -233,7 +233,7 @@ define([
                     'label': 'label1',
                     'url': 'url1',
                     'validation': {
-                        'message': "Error message",
+                        'text': "Error message",
                         'type': 'error'
                     }
                 }
diff --git a/cms/static/js/spec/views/unit_outline_spec.js b/cms/static/js/spec/views/unit_outline_spec.js
index 085cb36202..d0205dc445 100644
--- a/cms/static/js/spec/views/unit_outline_spec.js
+++ b/cms/static/js/spec/views/unit_outline_spec.js
@@ -88,6 +88,17 @@ define(["jquery", "js/common_helpers/ajax_helpers", "js/common_helpers/template_
                 expect(unitOutlineView.$('.list-units')).toExist();
             });
 
+            it('highlights the current unit', function() {
+                createUnitOutlineView(this,  createMockXBlockInfo('Mock Unit'));
+                $('.outline-unit').each(function(i) {
+                    if ($(this).data('locator') === model.get('id')) {
+                        expect($(this)).toHaveClass('is-current');
+                    } else {
+                        expect($(this)).not.toHaveClass('is-current');
+                    }
+                });
+            });
+
             it('can add a unit', function() {
                 var redirectSpy;
                 createUnitOutlineView(this, createMockXBlockInfo('Mock Unit'));
diff --git a/cms/static/js/spec/views/xblock_spec.js b/cms/static/js/spec/views/xblock_spec.js
index 64d8e31392..feb4746aac 100644
--- a/cms/static/js/spec/views/xblock_spec.js
+++ b/cms/static/js/spec/views/xblock_spec.js
@@ -102,6 +102,14 @@ define([ "jquery", "js/common_helpers/ajax_helpers", "URI", "js/views/xblock", "
                     ]);
                     expect(promise.isRejected()).toBe(true);
                 });
+
+                it('Triggers an event to the runtime when a notification-action-button is clicked', function () {
+                    var notifySpy = spyOn(xblockView, "notifyRuntime").andCallThrough();
+
+                    postXBlockRequest(AjaxHelpers.requests(this), []);
+                    xblockView.$el.find(".notification-action-button").click();
+                    expect(notifySpy).toHaveBeenCalledWith("add-missing-groups", model.get("id"));
+                })
             });
         });
     });
diff --git a/cms/static/js/spec/views/xblock_validation_spec.js b/cms/static/js/spec/views/xblock_validation_spec.js
new file mode 100644
index 0000000000..66e579f109
--- /dev/null
+++ b/cms/static/js/spec/views/xblock_validation_spec.js
@@ -0,0 +1,132 @@
+define(['jquery', 'js/models/xblock_validation', 'js/views/xblock_validation', 'js/common_helpers/template_helpers'],
+    function($, XBlockValidationModel, XBlockValidationView, TemplateHelpers) {
+
+        beforeEach(function () {
+           TemplateHelpers.installTemplate('xblock-validation-messages');
+        });
+
+        describe('XBlockValidationView helper methods', function() {
+            var model, view;
+
+            beforeEach(function () {
+                model = new XBlockValidationModel({parse: true});
+                view = new XBlockValidationView({model: model});
+                view.render();
+            });
+
+            it('has a getIcon method', function() {
+                var getIcon = view.getIcon.bind(view);
+
+                expect(getIcon(model.WARNING)).toBe('icon-warning-sign');
+                expect(getIcon(model.NOT_CONFIGURED)).toBe('icon-warning-sign');
+                expect(getIcon(model.ERROR)).toBe('icon-exclamation-sign');
+                expect(getIcon("unknown")).toBeNull();
+            });
+
+            it('has a getDisplayName method', function() {
+                var getDisplayName = view.getDisplayName.bind(view);
+
+                expect(getDisplayName(model.WARNING)).toBe("Warning");
+                expect(getDisplayName(model.NOT_CONFIGURED)).toBe("Warning");
+                expect(getDisplayName(model.ERROR)).toBe("Error");
+                expect(getDisplayName("unknown")).toBeNull();
+            });
+
+            it('can add additional classes', function() {
+                var noContainerContent = "no-container-content", notConfiguredModel, nonRootView, rootView;
+
+                expect(view.getAdditionalClasses()).toBe("");
+                expect(view.$('.validation')).not.toHaveClass(noContainerContent);
+
+                notConfiguredModel = new XBlockValidationModel({
+                     "empty": false, "summary": {"text": "Not configured", "type": model.NOT_CONFIGURED},
+                     "xblock_id": "id"
+                    },
+                    {parse: true}
+                );
+                nonRootView = new XBlockValidationView({model: notConfiguredModel});
+                nonRootView.render();
+                expect(nonRootView.getAdditionalClasses()).toBe("");
+                expect(view.$('.validation')).not.toHaveClass(noContainerContent);
+
+                rootView = new XBlockValidationView({model: notConfiguredModel, root: true});
+                rootView.render();
+                expect(rootView.getAdditionalClasses()).toBe(noContainerContent);
+                expect(rootView.$('.validation')).toHaveClass(noContainerContent);
+            });
+
+        });
+
+        describe('XBlockValidationView rendering', function() {
+            var model, view;
+
+            beforeEach(function () {
+                model = new XBlockValidationModel({
+                     "empty": false,
+                     "summary": {
+                         "text": "Summary message", "type": "error",
+                         "action_label": "Summary Action", "action_class": "edit-button"
+                     },
+                     "messages": [
+                         {
+                             "text": "First message", "type": "warning",
+                             "action_label": "First Message Action", "action_runtime_event": "fix-up"
+                         },
+                         {"text": "Second message", "type": "error"}
+                     ],
+                     "xblock_id": "id"
+                    });
+                view = new XBlockValidationView({model: model});
+                view.render();
+            });
+
+            it('renders summary and detailed messages types', function() {
+                var details;
+
+                expect(view.$('.xblock-message')).toHaveClass("has-errors");
+                details = view.$('.xblock-message-item');
+                expect(details.length).toBe(2);
+                expect(details[0]).toHaveClass("warning");
+                expect(details[1]).toHaveClass("error");
+            });
+
+            it('renders summary and detailed messages text', function() {
+                var details;
+
+                expect(view.$('.xblock-message').text()).toContain("Summary message");
+
+                details = view.$('.xblock-message-item');
+                expect(details.length).toBe(2);
+                expect($(details[0]).text()).toContain("Warning");
+                expect($(details[0]).text()).toContain("First message");
+                expect($(details[1]).text()).toContain("Error");
+                expect($(details[1]).text()).toContain("Second message");
+            });
+
+            it('renders action info', function() {
+                expect(view.$('a.edit-button .action-button-text').text()).toContain("Summary Action");
+
+                expect(view.$('a.notification-action-button .action-button-text').text()).
+                    toContain("First Message Action");
+                expect(view.$('a.notification-action-button').data("notification-action")).toBe("fix-up");
+            });
+
+            it('renders a summary only', function() {
+                var summaryOnlyModel = new XBlockValidationModel({
+                     "empty": false,
+                     "summary": {"text": "Summary message", "type": "warning"},
+                     "xblock_id": "id"
+                    }), summaryOnlyView, details;
+
+                summaryOnlyView = new XBlockValidationView({model: summaryOnlyModel});
+                summaryOnlyView.render();
+
+                expect(summaryOnlyView.$('.xblock-message')).toHaveClass("has-warnings");
+                expect(view.$('.xblock-message').text()).toContain("Summary message");
+
+                details = summaryOnlyView.$('.xblock-message-item');
+                expect(details.length).toBe(0);
+            });
+        });
+    }
+);
diff --git a/cms/static/js/views/course_outline.js b/cms/static/js/views/course_outline.js
index d693bd5aee..1a5e26dde4 100644
--- a/cms/static/js/views/course_outline.js
+++ b/cms/static/js/views/course_outline.js
@@ -35,15 +35,8 @@ define(["jquery", "underscore", "js/views/xblock_outline", "js/views/utils/view_
                 return !this.model.isVertical();
             },
 
-            createChildView: function(xblockInfo, parentInfo, parentView) {
-                return new CourseOutlineView({
-                    model: xblockInfo,
-                    parentInfo: parentInfo,
-                    initialState: this.initialState,
-                    expandedLocators: this.expandedLocators,
-                    template: this.template,
-                    parentView: parentView || this
-                });
+            getChildViewClass: function() {
+                return CourseOutlineView;
             },
 
             /**
@@ -112,7 +105,7 @@ define(["jquery", "underscore", "js/views/xblock_outline", "js/views/utils/view_
                     });
                     // Fetch the full xblock info for the section and then create a view for it
                     sectionInfo.fetch().done(function() {
-                        sectionView = self.createChildView(sectionInfo, self.model, self);
+                        sectionView = self.createChildView(sectionInfo, self.model, {parentView: self});
                         sectionView.initialState = initialState;
                         sectionView.expandedLocators = self.expandedLocators;
                         sectionView.render();
diff --git a/cms/static/js/views/import.js b/cms/static/js/views/import.js
index 4ded865a47..00aa7826ff 100644
--- a/cms/static/js/views/import.js
+++ b/cms/static/js/views/import.js
@@ -49,6 +49,7 @@ define(
          */
         var getStatus = function (url, timeout, stage) {
             var currentStage = stage || 0;
+            if (currentStage > 1) { CourseImport.okayToNavigateAway = true; }
             if (CourseImport.stopGetStatus) { return ;}
 
             if (currentStage === 4) {
@@ -87,6 +88,10 @@ define(
              * progress.
              */
             stopGetStatus: false,
+            /**
+             * Whether its fine to navigate away while import is in progress
+             */
+            okayToNavigateAway: false,
 
             /**
              * Update DOM to set all stages as not-started (for retrying an upload that
diff --git a/cms/static/js/views/pages/container.js b/cms/static/js/views/pages/container.js
index bce220ee2b..7a62e53591 100644
--- a/cms/static/js/views/pages/container.js
+++ b/cms/static/js/views/pages/container.js
@@ -13,6 +13,12 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views
         var XBlockContainerPage = BasePage.extend({
             // takes XBlockInfo as a model
 
+            events: {
+                "click .edit-button": "editXBlock",
+                "click .duplicate-button": "duplicateXBlock",
+                "click .delete-button": "deleteXBlock"
+            },
+
             options: {
                 collapsedClass: 'is-collapsed'
             },
@@ -81,12 +87,6 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views
                 // Hide both blocks until we know which one to show
                 xblockView.$el.addClass(hiddenCss);
 
-                if (!options || !options.refresh) {
-                    // Add actions to any top level buttons, e.g. "Edit" of the container itself.
-                    // Do not add the actions on "refresh" though, as the handlers are already registered.
-                    self.addButtonActions(this.$el);
-                }
-
                 // Render the xblock
                 xblockView.render({
                     done: function() {
@@ -119,7 +119,6 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views
             },
 
             onXBlockRefresh: function(xblockView) {
-                this.addButtonActions(xblockView.$el);
                 this.xblockView.refresh();
                 // Update publish and last modified information from the server.
                 this.model.fetch();
@@ -137,25 +136,12 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views
                 });
             },
 
-            addButtonActions: function(element) {
-                var self = this;
-                element.find('.edit-button').click(function(event) {
-                    event.preventDefault();
-                    self.editComponent(self.findXBlockElement(event.target));
-                });
-                element.find('.duplicate-button').click(function(event) {
-                    event.preventDefault();
-                    self.duplicateComponent(self.findXBlockElement(event.target));
-                });
-                element.find('.delete-button').click(function(event) {
-                    event.preventDefault();
-                    self.deleteComponent(self.findXBlockElement(event.target));
-                });
-            },
-
-            editComponent: function(xblockElement) {
-                var self = this,
+            editXBlock: function(event) {
+                var xblockElement = this.findXBlockElement(event.target),
+                    self = this,
                     modal = new EditXBlockModal({ });
+                event.preventDefault();
+
                 modal.edit(xblockElement, this.model, {
                     refresh: function() {
                         self.refreshXBlock(xblockElement);
@@ -163,6 +149,16 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views
                 });
             },
 
+            duplicateXBlock: function(event) {
+                event.preventDefault();
+                this.duplicateComponent(this.findXBlockElement(event.target));
+            },
+
+            deleteXBlock: function(event) {
+                event.preventDefault();
+                this.deleteComponent(this.findXBlockElement(event.target));
+            },
+
             createPlaceholderElement: function() {
                 return $("<div/>", { class: "studio-xblock-wrapper" });
             },
diff --git a/cms/static/js/views/unit_outline.js b/cms/static/js/views/unit_outline.js
index cea6b91b68..041986a4a6 100644
--- a/cms/static/js/views/unit_outline.js
+++ b/cms/static/js/views/unit_outline.js
@@ -3,9 +3,8 @@
  * the ancestors of the unit along with its direct siblings. It also has a single "New Unit"
  * button to allow a new sibling unit to be added.
  */
-define(['js/views/xblock_outline'],
-    function(XBlockOutlineView) {
-
+define(['underscore', 'js/views/xblock_outline', 'js/views/unit_outline_child'],
+    function(_, XBlockOutlineView, UnitOutlineChildView) {
         var UnitOutlineView = XBlockOutlineView.extend({
             // takes XBlockInfo as a model
 
@@ -29,7 +28,11 @@ define(['js/views/xblock_outline'],
                     // i.e. subsection and then section.
                     for (i=ancestors.length - 1; i >= 0; i--) {
                         ancestor = ancestors[i];
-                        ancestorView = this.createChildView(ancestor, previousAncestor, ancestorView);
+                        ancestorView = this.createChildView(
+                            ancestor,
+                            previousAncestor,
+                            {parentView: ancestorView, currentUnitId: this.model.get('id')}
+                        );
                         ancestorView.render();
                         listElement.append(ancestorView.$el);
                         previousAncestor = ancestor;
@@ -37,6 +40,17 @@ define(['js/views/xblock_outline'],
                     }
                 }
                 return ancestorView;
+            },
+
+            getChildViewClass: function() {
+                return UnitOutlineChildView;
+            },
+
+            getTemplateContext: function() {
+                return _.extend(
+                    XBlockOutlineView.prototype.getTemplateContext.call(this),
+                    {currentUnitId: this.model.get('id')}
+                );
             }
         });
 
diff --git a/cms/static/js/views/unit_outline_child.js b/cms/static/js/views/unit_outline_child.js
new file mode 100644
index 0000000000..f327c6367e
--- /dev/null
+++ b/cms/static/js/views/unit_outline_child.js
@@ -0,0 +1,34 @@
+/**
+ * The UnitOutlineChildView is used to render each Section,
+ * Subsection, and Unit within the Unit Outline component on the unit
+ * page.
+ */
+define(['underscore', 'js/views/xblock_outline'],
+    function(_, XBlockOutlineView) {
+        var UnitOutlineChildView = XBlockOutlineView.extend({
+            initialize: function() {
+                XBlockOutlineView.prototype.initialize.call(this);
+                this.currentUnitId = this.options.currentUnitId;
+            },
+
+            getTemplateContext: function() {
+                return _.extend(
+                    XBlockOutlineView.prototype.getTemplateContext.call(this),
+                    {currentUnitId: this.currentUnitId}
+                );
+            },
+
+            getChildViewClass: function() {
+                return UnitOutlineChildView;
+            },
+
+            createChildView: function(childInfo, parentInfo, options) {
+                options = _.isUndefined(options) ? {} : options;
+                return XBlockOutlineView.prototype.createChildView.call(
+                    this, childInfo, parentInfo, _.extend(options, {currentUnitId: this.currentUnitId})
+                );
+            }
+        });
+
+        return UnitOutlineChildView;
+    }); // end define()
diff --git a/cms/static/js/views/xblock.js b/cms/static/js/views/xblock.js
index 78d1f08b84..797cc8cb45 100644
--- a/cms/static/js/views/xblock.js
+++ b/cms/static/js/views/xblock.js
@@ -4,6 +4,10 @@ define(["jquery", "underscore", "js/views/baseview", "xblock/runtime.v1"],
         var XBlockView = BaseView.extend({
             // takes XBlockInfo as a model
 
+            events: {
+                "click .notification-action-button": "fireNotificationActionEvent"
+            },
+
             initialize: function() {
                 BaseView.prototype.initialize.call(this);
                 this.view = this.options.view;
@@ -195,6 +199,14 @@ define(["jquery", "underscore", "js/views/baseview", "xblock/runtime.v1"],
                 }
                 // Return an already resolved promise for synchronous updates
                 return $.Deferred().resolve().promise();
+            },
+
+            fireNotificationActionEvent: function(event) {
+               var eventName = $(event.currentTarget).data("notification-action");
+               if (eventName) {
+                   event.preventDefault();
+                   this.notifyRuntime(eventName, this.model.get("id"));
+               }
             }
         });
 
diff --git a/cms/static/js/views/xblock_outline.js b/cms/static/js/views/xblock_outline.js
index 8d92da1dc9..7daaf3b34c 100644
--- a/cms/static/js/views/xblock_outline.js
+++ b/cms/static/js/views/xblock_outline.js
@@ -54,6 +54,15 @@ define(["jquery", "underscore", "gettext", "js/views/baseview", "js/views/utils/
             },
 
             renderTemplate: function() {
+                var html = this.template(this.getTemplateContext());
+                if (this.parentInfo) {
+                    this.setElement($(html));
+                } else {
+                    this.$el.html(html);
+                }
+            },
+
+            getTemplateContext: function() {
                 var xblockInfo = this.model,
                     childInfo = xblockInfo.get('child_info'),
                     parentInfo = this.parentInfo,
@@ -62,7 +71,6 @@ define(["jquery", "underscore", "gettext", "js/views/baseview", "js/views/utils/
                     parentType = parentInfo ? XBlockViewUtils.getXBlockType(parentInfo.get('category')) : null,
                     addChildName = null,
                     defaultNewChildName = null,
-                    html,
                     isCollapsed = this.shouldRenderChildren() && !this.shouldExpandChildren();
                 if (childInfo) {
                     addChildName = interpolate(gettext('New %(component_type)s'), {
@@ -70,7 +78,7 @@ define(["jquery", "underscore", "gettext", "js/views/baseview", "js/views/utils/
                     }, true);
                     defaultNewChildName = childInfo.display_name;
                 }
-                html = this.template({
+                return {
                     xblockInfo: xblockInfo,
                     visibilityClass: XBlockViewUtils.getXBlockVisibilityClass(xblockInfo.get('visibility_state')),
                     typeListClass: XBlockViewUtils.getXBlockListTypeClass(xblockType),
@@ -86,20 +94,15 @@ define(["jquery", "underscore", "gettext", "js/views/baseview", "js/views/utils/
                     includesChildren: this.shouldRenderChildren(),
                     hasExplicitStaffLock: this.model.get('has_explicit_staff_lock'),
                     staffOnlyMessage: this.model.get('staff_only_message')
-                });
-                if (this.parentInfo) {
-                    this.setElement($(html));
-                } else {
-                    this.$el.html(html);
-                }
+                };
             },
 
             renderChildren: function() {
                 var self = this,
-                    xblockInfo = this.model;
-                if (xblockInfo.get('child_info')) {
-                    _.each(this.model.get('child_info').children, function(child) {
-                        var childOutlineView = self.createChildView(child, xblockInfo);
+                    parentInfo = this.model;
+                if (parentInfo.get('child_info')) {
+                    _.each(this.model.get('child_info').children, function(childInfo) {
+                        var childOutlineView = self.createChildView(childInfo, parentInfo);
                         childOutlineView.render();
                         self.addChildView(childOutlineView);
                     });
@@ -182,15 +185,20 @@ define(["jquery", "underscore", "gettext", "js/views/baseview", "js/views/utils/
                 return true;
             },
 
-            createChildView: function(xblockInfo, parentInfo, parentView) {
-                return new XBlockOutlineView({
-                    model: xblockInfo,
+            getChildViewClass: function() {
+                return XBlockOutlineView;
+            },
+
+            createChildView: function(childInfo, parentInfo, options) {
+                var viewClass = this.getChildViewClass();
+                return new viewClass(_.extend({
+                    model: childInfo,
                     parentInfo: parentInfo,
+                    parentView: this,
                     initialState: this.initialState,
                     expandedLocators: this.expandedLocators,
-                    template: this.template,
-                    parentView: parentView || this
-                });
+                    template: this.template
+                }, options));
             },
 
             onSync: function(event) {
@@ -273,7 +281,7 @@ define(["jquery", "underscore", "gettext", "js/views/baseview", "js/views/utils/
 
             handleAddEvent: function(event) {
                 var self = this,
-                    target = $(event.target),
+                    target = $(event.currentTarget),
                     category = target.data('category');
                 event.preventDefault();
                 XBlockViewUtils.addXBlock(target).done(function(locator) {
diff --git a/cms/static/js/views/xblock_validation.js b/cms/static/js/views/xblock_validation.js
new file mode 100644
index 0000000000..4febbc734b
--- /dev/null
+++ b/cms/static/js/views/xblock_validation.js
@@ -0,0 +1,76 @@
+define(["jquery", "underscore", "js/views/baseview", "gettext"],
+    function ($, _, BaseView, gettext) {
+        /**
+         * View for xblock validation messages as displayed in Studio.
+         */
+        var XBlockValidationView = BaseView.extend({
+
+            // Takes XBlockValidationModel as a model
+            initialize: function(options) {
+                BaseView.prototype.initialize.call(this);
+                this.template = this.loadTemplate('xblock-validation-messages');
+                this.root = options.root;
+            },
+
+            render: function () {
+                this.$el.html(this.template({
+                    validation: this.model,
+                    additionalClasses: this.getAdditionalClasses(),
+                    getIcon: this.getIcon.bind(this),
+                    getDisplayName: this.getDisplayName.bind(this)
+                }));
+                return this;
+            },
+
+            /**
+             * Returns the icon css class based on the message type.
+             * @param messageType
+             * @returns string representation of css class that will render the correct icon, or null if unknown type
+             */
+            getIcon: function (messageType) {
+                if (messageType === this.model.ERROR) {
+                    return 'icon-exclamation-sign';
+                }
+                else if (messageType === this.model.WARNING || messageType === this.model.NOT_CONFIGURED) {
+                    return 'icon-warning-sign';
+                }
+                return null;
+            },
+
+            /**
+             * Returns a display name for a message (useful for screen readers), based on the message type.
+             * @param messageType
+             * @returns string display name (translated)
+             */
+            getDisplayName: function (messageType) {
+                if (messageType === this.model.WARNING || messageType === this.model.NOT_CONFIGURED) {
+                    // Translators: This message will be added to the front of messages of type warning,
+                    // e.g. "Warning: this component has not been configured yet".
+                    return gettext("Warning");
+                }
+                else if (messageType === this.model.ERROR) {
+                    // Translators: This message will be added to the front of messages of type error,
+                    // e.g. "Error: required field is missing".
+                    return gettext("Error");
+                }
+                return null;
+            },
+
+            /**
+             * Returns additional css classes that can be added to HTML containing the validation messages.
+             * Useful for rendering NOT_CONFIGURED in a special way.
+             *
+             * @returns string of additional css classes (or empty string)
+             */
+            getAdditionalClasses: function () {
+                if (this.root && this.model.get("summary").type === this.model.NOT_CONFIGURED &&
+                    this.model.get("messages").length === 0) {
+
+                    return "no-container-content";
+                }
+                return "";
+            }
+        });
+
+        return XBlockValidationView;
+    });
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 329ecad33f..26b5e7d90d 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -569,11 +569,6 @@ hr.divide {
 }
 
 .window {
-  // border-radius: 3px;
-  // box-shadow: 0 1px 1px $shadow-l1;
-  // margin-bottom: $baseline;
-  // border: 1px solid $gray-l2;
-  // background: $white;
 
   .window-contents {
     padding: 20px;
@@ -615,162 +610,6 @@ hr.divide {
   }
 }
 
-// ====================
-
-// system notifications
-.toast-notification {
-  @include transition(all $tmg-f2 linear 0s);
-  @include linear-gradient(top, rgba(255, 255, 255, .1), rgba(255, 255, 255, 0));
-  @extend %t-copy-sub1;
-  display: none;
-  position: fixed;
-  top: 20px;
-  right: 20px;
-  z-index: 99999;
-  max-width: 350px;
-  padding: 15px 20px 17px;
-  border-radius: 3px;
-  border: 1px solid #333;
-  background-color: rgba(30, 30, 30, .92);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, .3), 0 1px 0 rgba(255, 255, 255, .1) inset;
-  text-align: center;
-  color: #fff;
-
-  p, span {
-    color: #fff;
-  }
-
-  strong {
-    @extend %t-copy-base;
-    @extend %t-strong;
-    display: block;
-    margin-bottom: 10px;
-    text-align: center;
-  }
-
-  .close-button {
-    @extend %t-action1;
-    @extend %t-strong;
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 27px;
-    height: 27px;
-    line-height: 25px;
-    color: #aaa;
-    text-align: center;
-
-    .close-icon {
-      @extend %t-action2;
-      @extend %t-strong;
-    }
-  }
-
-  .action-button {
-    @include blue-button;
-    @include box-sizing(border-box);
-    @extend %t-action4;
-    width: 100%;
-    margin-top: 10px;
-    text-align: center;
-  }
-}
-
-.waiting {
-  position: relative;
-
-  &:before {
-    content: '';
-    display: block;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 999998;
-    width: 100%;
-    height: 100%;
-    border-radius: inherit;
-    background: rgba(255, 255, 255, .9);
-  }
-
-  &:after {
-    @extend .spinner-icon;
-    content: '';
-    display: block;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    margin-left: -10px;
-    margin-top: -10px;
-    z-index: 999999;
-  }
-}
-
-.waiting-inline {
-  &:after {
-    content: '';
-    @extend .spinner-icon;
-  }
-}
-
-.new-button {
-  @include green-button;
-  @extend %t-action4;
-  padding: 8px 20px 10px;
-  text-align: center;
-
-  &.big {
-    display: block;
-  }
-
-  .icon-plus {
-    margin-top: -2px;
-    line-height: 0;
-  }
-}
-
-.view-button {
-  @include blue-button;
-  @extend %t-action4;
-  text-align: center;
-
-  &.big {
-    display: block;
-  }
-
-  .icon-eye-open {
-    @extend %t-action2;
-    display: inline-block;
-    vertical-align: middle;
-    margin-right: 8px;
-    margin-top: -3px;
-    line-height: 0;
-  }
-}
-
-.edit-button.standard,
-.delete-button.standard,
-.duplicate-button.standard {
-  @include white-button;
-  @extend %t-regular;
-  @extend %t-action4;
-  float: left;
-  padding: 3px 10px 4px;
-  margin-left: 7px;
-
-  .edit-icon,
-  .delete-icon,
-  .duplicate-icon{
-    margin-right: 4px;
-  }
-}
-
-.delete-button.standard {
-
-  &:hover {
-    background-color: tint($orange, 75%);
-  }
-}
-
 .tooltip {
   @include transition(opacity $tmg-f3 ease-out 0s);
   @include font-size(12);
@@ -818,19 +657,6 @@ hr.divide {
   @extend %ui-disabled;
 }
 
-.non-list {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.wrap {
-  text-wrap: wrap;
-  white-space: pre-wrap;
-  white-space: -moz-pre-wrap;
-  word-wrap: break-word;
-}
-
 // ui - semantic + visual divider
 hr.divider {
   @extend %cont-text-sr;
@@ -922,13 +748,3 @@ body.js {
     }
   }
 }
-
-// ====================
-
-// works in progress & testing
-body.hide-wip {
-
-  .wip-box {
-    display: none;
-  }
-}
diff --git a/cms/static/sass/_shame.scss b/cms/static/sass/_shame.scss
index 1be5d2a836..86b926a881 100644
--- a/cms/static/sass/_shame.scss
+++ b/cms/static/sass/_shame.scss
@@ -124,6 +124,23 @@ div.wrapper-comp-editor.is-inactive ~ div.launch-latex-compiler{
 
 // ====================
 
+// xblock message UI override
+// (to fake the Studio no-content pattern design since validation classes cannot be removed in logic layer)
+.wrapper-xblock .xblock-message.no-container-content.xblock-message.no-container-content {
+  border: 0;
+  padding: ($baseline*1.5) ($baseline*2);
+  background-color: $gray-l4;
+  text-align: center;
+  color: $gray;
+
+  .button,
+  .action {
+    @extend %btn-primary-green;
+  }
+}
+
+// ====================
+
 // TODOs:
 
 // * font-weight syncing
diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss
index c046742721..c310f4296f 100644
--- a/cms/static/sass/_variables.scss
+++ b/cms/static/sass/_variables.scss
@@ -15,9 +15,7 @@ $fg-min-width: 900px;
 // ====================
 
 // fonts
-$f-serif: 'Bree Serif', Georgia, Cambria, 'Times New Roman', Times, serif;
 $f-sans-serif: 'Open Sans','Helvetica Neue', Helvetica, Arial, sans-serif;
-$f-decorative: '';
 $f-monospace: 'Bitstream Vera Sans Mono', Consolas, Courier, monospace;
 
 // ====================
@@ -230,6 +228,3 @@ $body-line-height: golden-ratio(.875em, 1);
 // carried over from LMS for xmodules
 $action-primary-active-bg: #1AA1DE; // $m-blue
 $very-light-text: #fff;
-
-
-
diff --git a/cms/static/sass/assets/_content-types.scss b/cms/static/sass/assets/_content-types.scss
deleted file mode 100644
index 5ca067bf40..0000000000
--- a/cms/static/sass/assets/_content-types.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-%content-type {
-  display: inline-block;
-  width: 14px;
-  height: 16px;
-  padding-left: 14px;
-  background-position: 8px center;
-  background-repeat: no-repeat;
-  vertical-align: middle;
-}
-
-.videosequence-icon {
-  @extend %content-type;
-  background-image: url('../img/content-types/videosequence.png');
-}
-
-.video-icon {
-  @extend %content-type;
-  background-image: url('../img/content-types/video.png');
-}
-
-.problemset-icon {
-  @extend %content-type;
-  background-image: url('../img/content-types/problemset.png');
-}
-
-.problem-icon {
-  @extend %content-type;
-  background-image: url('../img/content-types/problem.png');
-}
-
-.lab-icon {
-  @extend %content-type;
-  background-image: url('../img/content-types/lab.png');
-}
-
-.tab-icon {
-  @extend %content-type;
-  background-image: url('../img/content-types/lab.png');
-}
-
-.html-icon {
-  @extend %content-type;
-  background-image: url('../img/content-types/html.png');
-}
-
-.vertical-icon {
-  @extend %content-type;
-  background-image: url('../img/content-types/vertical.png');
-}
-
-.sequential-icon {
-  @extend %content-type;
-  background-image: url('../img/content-types/sequential.png');
-}
-
-.chapter-icon {
-  @extend %content-type;
-  background-image: url('../img/content-types/chapter.png');
-}
-
-.module-icon {
-  @extend %content-type;
-  background-image: url('../img/content-types/module.png');
-}
-
-.module-icon {
-  @extend %content-type;
-  background-image: url('../img/content-types/module.png');
-}
diff --git a/cms/static/sass/assets/_graphics.scss b/cms/static/sass/assets/_graphics.scss
index a3d5d26ab4..c7647ac12d 100644
--- a/cms/static/sass/assets/_graphics.scss
+++ b/cms/static/sass/assets/_graphics.scss
@@ -1,148 +1,3 @@
-.expand-collapse-icon {
-	@include transition(none);
-	position: relative;
-	display: inline-block;
-	width: 9px;
-	height: 11px;
-	margin-right: 10px;
-	background: url(../img/expand-collapse-icons.png) no-repeat;
-
-	&.expand {
-		top: 1px;
-		background-position: 0 0;
-	}
-
-	&.collapse {
-		top: -1px;
-		background-position: 0 -11px;
-	}
-}
-
-.sequence-icon {
-	display: inline-block;
-	width: 15px;
-	height: 9px;
-	margin-right: 5px;
-	background: url(../img/sequence-icon.png) no-repeat;
-}
-
-.video-icon {
-	display: inline-block;
-	width: 14px;
-	height: 12px;
-	margin-right: 5px;
-	background: url(../img/video-icon.png) no-repeat;
-}
-
-.upload-icon {
-	display: inline-block;
-	width: 22px;
-	height: 13px;
-	margin-right: 5px;
-	background: url(../img/upload-icon.png) no-repeat;
-}
-
-.list-icon {
-	display: inline-block;
-	width: 14px;
-	height: 10px;
-	margin-right: 5px;
-	background: url(../img/list-icon.png) no-repeat;
-}
-
-.close-icon {
-	display: inline-block;
-	width: 13px;
-	height: 12px;
-	background: url(../img/close-icon.png) no-repeat;
-}
-
-.home-icon {
-	display: inline-block;
-	width: 19px;
-	height: 16px;
-	background: url(../img/home-icon.png) no-repeat;
-}
-
-.small-home-icon {
-	display: inline-block;
-	width: 16px;
-	height: 14px;
-	background: url(../img/small-home-icon.png) no-repeat;
-}
-
-.log-out-icon {
-	display: inline-block;
-	width: 15px;
-	height: 13px;
-	background: url(../img/log-out-icon.png) no-repeat;
-}
-
-.collapse-all-icon {
-	display: inline-block;
-	width: 15px;
-	height: 9px;
-	background: url(../img/collapse-all-icon.png) no-repeat;
-}
-
-.calendar-icon {
-	display: inline-block;
-	width: 12px;
-	height: 11px;
-	margin-right: 5px;
-	background: url(../img/calendar-icon.png) no-repeat;
-}
-
-.edit-icon {
-	display: inline-block;
-	width: 12px;
-	height: 12px;
-	margin-right: 2px;
-	background: url(../img/edit-icon.png) no-repeat;
-
-	&.white {
-		background: url(../img/edit-icon-white.png) no-repeat;
-	}
-}
-
-.duplicate-icon {
-   display: inline-block;
-   width: 12px;
-   height: 12px;
-   margin-right: 2px;
-}
-
-.visibility-toggle {
-	.toggle-icon {
-		display: inline-block;
-		width: 27px;
-		height: 20px;
-		background: url(../img/small-toggle-icons.png) no-repeat;
-		background-position: 0 -34px;
-	}
-
-	&.hidden .toggle-icon {
-		background-position: 0 -4px;
-	}
-
-	&.both .toggle-icon {
-		background-position: 0 -64px;
-	}
-}
-
-
-.delete-icon {
-	display: inline-block;
-	width: 10px;
-	height: 11px;
-	margin-right: 2px;
-	background: url(../img/delete-icon.png) no-repeat;
-
-	&.white {
-		background: url(../img/delete-icon-white.png) no-repeat;
-	}
-}
-
 .drag-handle {
 	display: inline-block;
 	float: right;
@@ -153,130 +8,6 @@
 	cursor: move;
 }
 
-.draft-tag,
-.public-tag,
-.private-tag {
-	@extend %t-action5;
-	@extend %t-strong;
-	margin-left: 3px;
-	text-transform: uppercase;
-	color: #a4aab7;
-}
-
-.draft-tag {
-	color: #9f7d10;
-}
-
-.plus-icon {
-	display: inline-block;
-	width: 11px;
-	height: 11px;
-	margin-right: 8px;
-	background: url(../img/plus-icon.png) no-repeat;
-
-	&.white {
-		background: url(../img/plus-icon-white.png) no-repeat;
-	}
-}
-
-.plus-icon-small {
-	display: inline-block;
-	width: 6px;
-	height: 6px;
-	margin-right: 8px;
-	background: url(../img/plus-icon-small.png) no-repeat center;
-}
-
-.folder-icon {
-	display: inline-block;
-	width: 15px;
-	height: 11px;
-	margin-right: 4px;
-	background: url(../img/folder-icon.png) no-repeat;
-}
-
-.new-folder-icon {
-	display: inline-block;
-	width: 23px;
-	height: 11px;
-	margin-right: 8px;
-	background: url(../img/new-folder-icon.png) no-repeat;
-}
-
-.file-icon {
-	display: inline-block;
-	width: 10px;
-	height: 11px;
-	margin-right: 8px;
-	background: url(../img/file-icon.png) no-repeat;
-}
-
-.new-unit-icon {
-	display: inline-block;
-	width: 23px;
-	height: 12px;
-	margin-right: 8px;
-	background: url(../img/new-unit-icon.png) right no-repeat;
-}
-
-.new-policy-icon {
-	display: inline-block;
-	width: 23px;
-	height: 12px;
-	margin-right: 8px;
-	background: url(../img/new-unit-icon.png) right no-repeat;
-}
-
-.textbook-icon {
-	display: inline-block;
-	width: 32px;
-	height: 32px;
-	margin-right: 8px;
-	vertical-align: middle;
-	background: url(../img/textbook-icon.png) no-repeat;
-}
-
-.slides-icon {
-	display: inline-block;
-	width: 32px;
-	height: 32px;
-	margin-right: 8px;
-	vertical-align: middle;
-	background: url(../img/slides-icon.png) no-repeat;
-}
-
-.large-slide-icon {
-	display: inline-block;
-	width: 100px;
-	height: 60px;
-	margin-right: 5px;
-	background: url(../img/large-slide-icon.png) center no-repeat;
-}
-
-.large-html-icon {
-	display: inline-block;
-	width: 100px;
-	height: 60px;
-	margin-right: 5px;
-	background: url(../img/html-icon.png) center no-repeat;
-}
-
-.large-openended-icon {
-	display: inline-block;
-	width: 100px;
-	height: 60px;
-	margin-right: 5px;
-	background: url(../img/large-openended-icon.png) center no-repeat;
-}
-
-.large-annotations-icon {
-	display: inline-block;
-	width: 100px;
-	height: 60px;
-	margin-right: 5px;
-	background: url(../img/large-annotations-icon.png) center no-repeat;
-}
-
 .large-advanced-icon {
 	display: inline-block;
 	width: 100px;
@@ -285,14 +16,6 @@
 	background: url(../img/large-advanced-icon.png) center no-repeat;
 }
 
-.large-textbook-icon {
-	display: inline-block;
-	width: 100px;
-	height: 60px;
-	margin-right: 5px;
-	background: url(../img/large-textbook-icon.png) center no-repeat;
-}
-
 .large-discussion-icon {
 	display: inline-block;
 	width: 100px;
@@ -301,12 +24,12 @@
 	background: url(../img/large-discussion-icon.png) center no-repeat;
 }
 
-.large-freeform-icon {
+.large-html-icon {
 	display: inline-block;
 	width: 100px;
 	height: 60px;
 	margin-right: 5px;
-	background: url(../img/large-freeform-icon.png) center no-repeat;
+	background: url(../img/large-html-icon.png) center no-repeat;
 }
 
 .large-problem-icon {
@@ -324,20 +47,3 @@
 	margin-right: 5px;
 	background: url(../img/large-video-icon.png) center no-repeat;
 }
-
-.spinner-icon {
-	display: inline-block;
-  width: 20px;
-  height: 20px;
-  margin-left: 10px;
-  vertical-align: middle;
-  background: url(../img/blue-spinner.gif) no-repeat;
-}
-
-.spinner-in-field-icon {
-	display: inline-block;
-  width: 14px;
-  height: 14px;
-  vertical-align: middle;
-  background: url(../img/spinner-in-field.gif) no-repeat;
-}
diff --git a/cms/static/sass/elements/_modules.scss b/cms/static/sass/elements/_modules.scss
index 421f97ff29..dfbad361d9 100644
--- a/cms/static/sass/elements/_modules.scss
+++ b/cms/static/sass/elements/_modules.scss
@@ -373,7 +373,7 @@ $outline-indent-width: $baseline;
   }
 
   .item-title a {
-      color: $color-heading-base;
+    color: $color-heading-base;
 
     &:hover {
       color: $blue;
diff --git a/cms/static/sass/elements/_navigation.scss b/cms/static/sass/elements/_navigation.scss
index 70289057ea..6606066f3d 100644
--- a/cms/static/sass/elements/_navigation.scss
+++ b/cms/static/sass/elements/_navigation.scss
@@ -22,6 +22,29 @@ nav {
 
 // ====================
 
+// skip navigation
+.nav-skip {
+  @include font-size(13);
+  display: block;
+  position: absolute;
+  left: 0px;
+  top: -($baseline*30);
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+  background: $white;
+  border-bottom: 1px solid $gray-l4;
+  padding: ($baseline*0.75) ($baseline/2);
+
+  &:focus, &:active {
+    position: static;
+    width: auto;
+    height: auto;
+  }
+}
+
+// ====================
+
 // dropdown
 .nav-dd {
 
diff --git a/cms/static/sass/elements/_tender-widget.scss b/cms/static/sass/elements/_tender-widget.scss
index 056bb405b3..e1ef119252 100644
--- a/cms/static/sass/elements/_tender-widget.scss
+++ b/cms/static/sass/elements/_tender-widget.scss
@@ -210,7 +210,7 @@
 
 .widget-layout dl#brain_buster_captcha dd #captcha_answer {
   display: block;
-  width: 97%%;
+  width: 97%;
 }
 
 .widget-layout .form-actions .btn-post_topic {
diff --git a/cms/static/sass/elements/_xblocks.scss b/cms/static/sass/elements/_xblocks.scss
index bd44611a74..d98506f6df 100644
--- a/cms/static/sass/elements/_xblocks.scss
+++ b/cms/static/sass/elements/_xblocks.scss
@@ -11,8 +11,8 @@
   background: $white;
   box-shadow: 0px 1px 1px $shadow-l1;
 
-
-  &:hover {
+  // STATE: hover/focus
+  &:hover, &:focus {
     box-shadow: 0 0 1px $shadow;
   }
 
@@ -165,7 +165,7 @@
     .xblock-message {
       @extend %t-copy-sub1;
       background-color: $gray-d2;
-      padding: ($baseline/2) ($baseline*.75);
+      padding: ($baseline*0.75);
       color: $white;
 
       [class^="icon-"] {
@@ -187,7 +187,7 @@
         }
 
         &.has-warnings {
-          border-bottom: 3px solid $orange;
+          border-top: 3px solid $orange;
 
           .icon-warning-sign {
             margin-right: ($baseline/2);
@@ -196,7 +196,7 @@
         }
 
         &.has-errors {
-          border-bottom: 3px solid $red-l2;
+          border-top: 3px solid $red-l2;
 
           .icon-exclamation-sign {
             margin-right: ($baseline/2);
@@ -231,14 +231,13 @@
     }
 
     .xblock-message {
-      border-radius: 3px 3px 0 0;
 
       &.validation {
-        padding-top: ($baseline*.75);
+        padding-top: ($baseline*0.75);
       }
 
       .xblock-message-list {
-        margin: ($baseline/5) ($baseline*2.5);
+        margin: 0 ($baseline*2.25);
         list-style-type: disc;
         color: $gray-l3;
       }
@@ -248,7 +247,7 @@
       }
 
       &.information {
-        padding: 0 0 ($baseline/2) 0;
+        padding: ($baseline/2) 0;
         background-color: $gray-l5;
         color: $gray-d1;
       }
@@ -342,28 +341,12 @@
     .wrapper-xblock-message {
 
       .xblock-message {
-        border-radius: 0 0 3px 3px;
-
-        .xblock-message-list {
-          margin: 0;
-          list-style-type: none;
-        }
 
         &.information {
           @extend %t-copy-sub2;
-          padding: 0 0 ($baseline/2) $baseline;
+          padding: 0 $baseline ($baseline*0.75) $baseline;
           color: $gray-l1;
         }
-
-        &.validation.has-warnings {
-          border: 0;
-          border-top: 3px solid $orange;
-        }
-
-        &.validation.has-errors {
-          border: 0;
-          border-top: 3px solid $red-l2;
-        }
       }
     }
   }
diff --git a/cms/static/sass/style-app-extend1-rtl.scss b/cms/static/sass/style-app-extend1-rtl.scss
index db601f8bca..42a0a41425 100644
--- a/cms/static/sass/style-app-extend1-rtl.scss
+++ b/cms/static/sass/style-app-extend1-rtl.scss
@@ -55,8 +55,5 @@
 // base - contexts
 @import 'contexts/ie'; // ie-specific rules (mostly for known/older bugs)
 
-// temp - inherited
-@import 'assets/content-types';
-
 @import 'developer'; // used for any developer-created scss that needs further polish/refactoring
 @import 'shame';     // used for any bad-form/orphaned scss
diff --git a/cms/static/sass/style-app-extend1.scss b/cms/static/sass/style-app-extend1.scss
index 99460e4b29..7dbb6d2a8d 100644
--- a/cms/static/sass/style-app-extend1.scss
+++ b/cms/static/sass/style-app-extend1.scss
@@ -56,8 +56,5 @@
 // base - contexts
 @import 'contexts/ie'; // ie-specific rules (mostly for known/older bugs)
 
-// temp - inherited
-@import 'assets/content-types';
-
 @import 'developer'; // used for any developer-created scss that needs further polish/refactoring
 @import 'shame';     // used for any bad-form/orphaned scss
diff --git a/cms/static/sass/views/_container.scss b/cms/static/sass/views/_container.scss
index 7a2163939c..7780d04850 100644
--- a/cms/static/sass/views/_container.scss
+++ b/cms/static/sass/views/_container.scss
@@ -262,6 +262,47 @@
 
         .item-title {
           @extend %cont-text-wrap;
+
+          a {
+            color: $blue;
+
+            &:hover {
+              color: $orange-d1;
+            }
+          }
+        }
+
+        // CASE: is current item being edited/viewed
+        .is-current {
+          background: $gray-l4;
+
+          .unit-title a {
+            @extend %ui-disabled;
+            @extend %t-strong;
+            color: $color-heading-base;
+          }
+        }
+
+        // typographical overrides (based off of outline-simple)
+        .section-header, .subsection-header {
+          line-height: 0;
+          margin-bottom: ($baseline/2);
+        }
+
+        .section-header {
+          border-bottom: 1px solid $gray-l4;
+          padding-bottom: ($baseline/2);
+        }
+
+        // subsections overrides (based off of outline-simple)
+        .outline-subsection {
+          border: none;
+          padding: 0;
+        }
+
+        // units overrides (based off of outline-simple)
+        .outline-unit {
+          padding: 3px 6px;
         }
       }
     }
diff --git a/cms/static/sass/views/_dashboard.scss b/cms/static/sass/views/_dashboard.scss
index fc95b229b5..494500fd4d 100644
--- a/cms/static/sass/views/_dashboard.scss
+++ b/cms/static/sass/views/_dashboard.scss
@@ -418,8 +418,15 @@
         pointer-events: auto;
       }
 
-      .course-title {
-        color: $orange-d1;
+      .view-live-button {
+        @extend %ui-depth3;
+        @extend %btn-primary-blue;
+        @extend %sizing;
+        @include transition(opacity $tmg-f2 ease-in-out 0);
+        @include box-sizing(border-box);
+        padding: ($baseline/2);
+        opacity: 0.0;
+        pointer-events: none;
       }
 
       .course-metadata {
diff --git a/cms/templates/base.html b/cms/templates/base.html
index ecd68e593a..8a8a70c0de 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -40,7 +40,7 @@
     <%block name="header_extras"></%block>
   </head>
 
-  <body class="${dir_rtl} <%block name='bodyclass'></%block> hide-wip lang_${LANGUAGE_CODE}">
+  <body class="${dir_rtl} <%block name='bodyclass'></%block> lang_${LANGUAGE_CODE}">
   <%block name="view_notes"></%block>
 
     <a class="nav-skip" href="#content">${_("Skip to this view's content")}</a>
diff --git a/cms/templates/export.html b/cms/templates/export.html
index 0d8f783f2b..fded3810f4 100644
--- a/cms/templates/export.html
+++ b/cms/templates/export.html
@@ -41,6 +41,7 @@
         <div class="copy">
           ## Translators: ".tar.gz" is a file extension, and should not be translated
           <p>${_("You can export courses and edit them outside of Studio. The exported file is a .tar.gz file (that is, a .tar file compressed with GNU Zip) that contains the course structure and content. You can also re-import courses that you've exported.").format(em_start='<strong>', em_end="</strong>")}</p>
+          <p>${_("{em_start}Caution:{em_end} When you export a course, information such as MATLAB API keys, LTI passports, annotation secret token strings, and annotation storage URLs are included in the exported data. If you share your exported files, you may also be sharing sensitive or license-specific information.").format(em_start='<strong>', em_end="</strong>")}</p>
         </div>
       </div>
 
@@ -61,6 +62,7 @@
         <div class="export-includes">
           <h3 class="title-3">${_("Data {em_start}exported with{em_end} your course:").format(em_start='<strong>', em_end="</strong>")}</h3>
           <ul class="list-details list-export-includes">
+            <li class="item-detail">${_("Values from Advanced Settings, including MATLAB API keys and LTI passports")}</li>
             <li class="item-detail">${_("Course Content (all Sections, Sub-sections, and Units)")}</li>
             <li class="item-detail">${_("Course Structure")}</li>
             <li class="item-detail">${_("Individual Problems")}</li>
@@ -91,7 +93,7 @@
       <div class="bit">
         <h3 class="title-3">${_("What content is exported?")}</h3>
 
-        <p>${_("Only the course content and structure (including sections, subsections, and units) are exported. Other data, including student data, grading information, discussion forum data, course settings, and course team information, is not exported.")}</p>
+        <p>${_("The course content and structure (including sections, subsections, and units) are exported. Values from Advanced Settings, including MATLAB API keys and LTI passports, are also exported. Other data, including student data, grading information, discussion forum data, course settings, and course team information, is not exported.")}</p>
       </div>
 
       <div class="bit">
@@ -99,6 +101,9 @@
         ## Translators: ".tar.gz" is a file extension, and should not be translated
         <p>${_("Use an archive program to extract the data from the .tar.gz file. Extracted data includes the course.xml file, as well as subfolders that contain course content.")}</p>
       </div>
+      <div class="bit external-help">
+          <a href="${get_online_help_info(online_help_token())['doc_url']}" target="_blank" class="button external-help-button">${_("Learn more about exporting a course")}</a>
+      </div>
     </aside>
   </section>
 </div>
diff --git a/cms/templates/js/group-configuration-details.underscore b/cms/templates/js/group-configuration-details.underscore
index 929b2ce609..fc8042bd40 100644
--- a/cms/templates/js/group-configuration-details.underscore
+++ b/cms/templates/js/group-configuration-details.underscore
@@ -71,7 +71,7 @@
                   <i class="icon-exclamation-sign"></i>
                 <% } %>
                 <span class="group-configuration-validation-message">
-                  <%= unit.validation.message %>
+                  <%= unit.validation.text %>
                 </span>
               </p>
             <% } %>
diff --git a/cms/templates/js/mock/mock-xblock.underscore b/cms/templates/js/mock/mock-xblock.underscore
index 652aa17001..386b4b8bf8 100644
--- a/cms/templates/js/mock/mock-xblock.underscore
+++ b/cms/templates/js/mock/mock-xblock.underscore
@@ -9,6 +9,9 @@
                     <span data-tooltip="Drag to reorder" class="drag-handle action"></span>
                 </li>
             </ul>
+            <a href="#" class="button action-button notification-action-button" data-notification-action="add-missing-groups">
+                <span class="action-button-text">Add Missing Groups</span>
+            </a>
         </div>
     </header>
     <article class="xblock-render">
diff --git a/cms/templates/js/unit-outline.underscore b/cms/templates/js/unit-outline.underscore
index b4cfc66c26..9579a81150 100644
--- a/cms/templates/js/unit-outline.underscore
+++ b/cms/templates/js/unit-outline.underscore
@@ -1,5 +1,5 @@
 <% if (parentInfo) { %>
-    <li class="outline-item outline-<%= xblockType %> <%= visibilityClass %>"
+    <li class="outline-item outline-<%= xblockType %> <%= visibilityClass %> <%= xblockInfo.get('id') === currentUnitId ? 'is-current' : '' %>"
         data-parent="<%= parentInfo.get('id') %>" data-locator="<%= xblockInfo.get('id') %>">
         <div class="<%= xblockType %>-header">
             <h3 class="<%= xblockType %>-header-details">
diff --git a/cms/templates/js/xblock-validation-messages.underscore b/cms/templates/js/xblock-validation-messages.underscore
new file mode 100644
index 0000000000..716f619312
--- /dev/null
+++ b/cms/templates/js/xblock-validation-messages.underscore
@@ -0,0 +1,49 @@
+<%
+var summaryMessage = validation.get("summary");
+var aggregateMessageType = summaryMessage.type;
+var aggregateValidationClass = aggregateMessageType === "error"? "has-errors" : "has-warnings";
+%>
+    <div class="xblock-message validation <%= aggregateValidationClass %> <%= additionalClasses %>">
+        <p class="<%= aggregateMessageType %>"><i class="<%= getIcon(aggregateMessageType) %>"></i>
+        <%- summaryMessage.text %>
+        <% if (summaryMessage.action_class) { %>
+            <a href="#" class="button action-button <%- summaryMessage.action_class %>">
+                <span class="action-button-text"><%- summaryMessage.action_label %></span>
+            </a>
+        <% } else if (summaryMessage.action_runtime_event) {%>
+            <a href="#" class="button action-button notification-action-button" data-notification-action="<%- summaryMessage.action_runtime_event %>">
+                <span class="action-button-text"><%- summaryMessage.action_label %></span>
+            </a>
+        <% } %>
+        </p>
+        <% var detailedMessages = validation.get("messages"); %>
+        <% if (detailedMessages.length > 0) { %>
+            <ul class="xblock-message-list">
+                <% for (var i = 0; i < detailedMessages.length; i++) { %>
+                <%
+                var message = detailedMessages[i];
+                var messageType = message.type
+                var messageTypeDisplayName = getDisplayName(messageType)
+                %>
+                <li class="xblock-message-item <%= messageType %>">
+                    <span class="message-text">
+                        <% if (messageTypeDisplayName) { %>
+                            <span class="sr"><%- messageTypeDisplayName %>:</span>
+                        <% } %>
+                        <%- message.text %>
+
+                    <% if (message.action_class) { %>
+                        <a href="#" class="button action-button <%- message.action_class %>">
+                            <span class="action-button-text"><%- message.action_label %></span>
+                        </a>
+                    <% } else if (message.action_runtime_event) {%>
+                       <a href="#" class="button action-button notification-action-button" data-notification-action="<%- message.action_runtime_event %>">
+                            <span class="action-button-text"><%- message.action_label %></span>
+                        </a>
+                    <% } %>
+                    </span>
+                </li>
+                <% } %>
+            </ul>
+        <% } %>
+    </div>
diff --git a/cms/templates/studio_xblock_wrapper.html b/cms/templates/studio_xblock_wrapper.html
index 1f578f405c..1573773561 100644
--- a/cms/templates/studio_xblock_wrapper.html
+++ b/cms/templates/studio_xblock_wrapper.html
@@ -1,16 +1,51 @@
+
 <%!
 from django.utils.translation import ugettext as _
 from contentstore.views.helpers import xblock_studio_url
+import json
 %>
-
 <%
 xblock_url = xblock_studio_url(xblock)
 show_inline = xblock.has_children and not xblock_url
 section_class = "level-nesting" if show_inline else "level-element"
 collapsible_class = "is-collapsible" if xblock.has_children else ""
 label = xblock.display_name or xblock.scope_ids.block_type
+messages = json.dumps(xblock.validate().to_json())
 %>
 
+<%namespace name='static' file='static_content.html'/>
+
+<%block name="header_extras">
+<script type="text/template" id="xblock-validation-messages-tpl">
+    <%static:include path="js/xblock-validation-messages.underscore" />
+</script>
+</%block>
+
+<script type='text/javascript'>
+    require(["js/views/xblock_validation", "js/models/xblock_validation"],
+            function (XBlockValidationView, XBlockValidationModel) {
+                var validationMessages = ${messages};
+                % if xblock_url and not is_root:
+                validationMessages.showSummaryOnly = true;
+                % endif
+
+                var model = new XBlockValidationModel(validationMessages, {parse: true});
+                if (!model.get("empty")) {
+                    var validationEle = $('div.xblock-validation-messages[data-locator="${xblock.location | h}"]');
+                    var viewOptions = {
+                        el: validationEle,
+                        model: model
+                    };
+                    % if is_root:
+                    viewOptions.root = true;
+                    % endif
+                    var view = new XBlockValidationView(viewOptions);
+                    view.render();
+                }
+            });
+</script>
+
+
 % if not is_root:
     % if is_reorderable:
     <li class="studio-xblock-wrapper is-draggable" data-locator="${xblock.location | h}" data-course-key="${xblock.location.course_key | h}">
@@ -64,21 +99,29 @@ label = xblock.display_name or xblock.scope_ids.block_type
             </ul>
         </div>
     </div>
-    % if xblock_url and not is_root:
-    <div class="xblock-header-secondary">
-        <div class="meta-info">${_('This block contains multiple components.')}</div>
-        <ul class="actions-list">
-            <li class="action-item action-view">
-                <a href="${xblock_url}" class="action-button">
-                    ## Translators: this is a verb describing the action of viewing more details
-                    <span class="action-button-text">${_('View')}</span>
-                    <i class="icon-arrow-right"></i>
-                </a>
-            </li>
-        </ul>
-    </div>
+    % if not is_root:
+        <div class="wrapper-xblock-message xblock-validation-messages" data-locator="${xblock.location | h}"/>
+        % if xblock_url:
+        <div class="xblock-header-secondary">
+            <div class="meta-info">${_('This block contains multiple components.')}</div>
+            <ul class="actions-list">
+                <li class="action-item action-view">
+                    <a href="${xblock_url}" class="action-button">
+                        ## Translators: this is a verb describing the action of viewing more details
+                        <span class="action-button-text">${_('View')}</span>
+                        <i class="icon-arrow-right"></i>
+                    </a>
+                </li>
+            </ul>
+        </div>
+        % endif
     % endif
  </header>
+
+% if is_root:
+    <div class="wrapper-xblock-message xblock-validation-messages" data-locator="${xblock.location | h}"/>
+% endif
+
 % if is_root or not xblock_url:
     <article class="xblock-render">
     ${content}
@@ -86,7 +129,6 @@ label = xblock.display_name or xblock.scope_ids.block_type
 % else:
     <div class="xblock-message-area">
     ${content}
-    </div>
 % endif
 
 % if not is_root:
diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index 3f42d06ace..a932fd6f13 100644
--- a/cms/templates/widgets/header.html
+++ b/cms/templates/widgets/header.html
@@ -11,7 +11,7 @@
 
     <div class="wrapper wrapper-l">
       ## "edX Studio" should not be translated
-      <h1 class="branding"><a href="/"><img src="${static.url("img/logo-edx-studio.png")}" alt="edX Studio" /></a></h1>
+      <h1 class="branding"><a href="/"><img src="${static.url("img/edx-studio-logo.png")}" alt="edX Studio" /></a></h1>
 
       % if context_course:
       <%
diff --git a/cms/templates/widgets/source-edit.html b/cms/templates/widgets/source-edit.html
index 60c59e87fa..6998193a31 100644
--- a/cms/templates/widgets/source-edit.html
+++ b/cms/templates/widgets/source-edit.html
@@ -54,7 +54,7 @@ require(["jquery", "jquery.leanModal", "codemirror/stex"], function($) {
       ## need to insert this only after hls triggered, because otherwise it
       ## causes other <form> elements to become multipart/form-data,
       ## thus breaking multiple-choice input forms, for example.
-      $('#hls-finput').append('<input type="file" name="hlsfile" id="hlsfile" />');
+      $('#hls-finput').html('<input type="file" name="hlsfile" id="hlsfile" />');
 
       var el = $('#hls-modal-${hlskey}');
       setup_autoupload(el);
diff --git a/common/djangoapps/contentserver/middleware.py b/common/djangoapps/contentserver/middleware.py
index 27804734d9..4ece37e656 100644
--- a/common/djangoapps/contentserver/middleware.py
+++ b/common/djangoapps/contentserver/middleware.py
@@ -9,7 +9,7 @@ from django.http import (
 )
 from student.models import CourseEnrollment
 
-from xmodule.contentstore.django import contentstore
+from xmodule.assetstore.assetmgr import AssetManager
 from xmodule.contentstore.content import StaticContent, XASSET_LOCATION_TAG
 from xmodule.modulestore import InvalidLocationError
 from opaque_keys import InvalidKeyError
@@ -42,7 +42,7 @@ class StaticContentServer(object):
             if content is None:
                 # nope, not in cache, let's fetch from DB
                 try:
-                    content = contentstore().find(loc, as_stream=True)
+                    content = AssetManager.find(loc, as_stream=True)
                 except NotFoundError:
                     response = HttpResponse()
                     response.status_code = 404
@@ -94,7 +94,7 @@ class StaticContentServer(object):
             if request.META.get('HTTP_RANGE'):
                 # Data from cache (StaticContent) has no easy byte management, so we use the DB instead (StaticContentStream)
                 if type(content) == StaticContent:
-                    content = contentstore().find(loc, as_stream=True)
+                    content = AssetManager.find(loc, as_stream=True)
 
                 header_value = request.META['HTTP_RANGE']
                 try:
diff --git a/common/djangoapps/contentserver/tests/test.py b/common/djangoapps/contentserver/tests/test.py
index 8ecb14cc13..872dea3af8 100644
--- a/common/djangoapps/contentserver/tests/test.py
+++ b/common/djangoapps/contentserver/tests/test.py
@@ -25,6 +25,8 @@ log = logging.getLogger(__name__)
 TEST_DATA_CONTENTSTORE = copy.deepcopy(settings.CONTENTSTORE)
 TEST_DATA_CONTENTSTORE['DOC_STORE_CONFIG']['db'] = 'test_xcontent_%s' % uuid4().hex
 
+TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
+
 
 @ddt.ddt
 @override_settings(CONTENTSTORE=TEST_DATA_CONTENTSTORE)
@@ -47,7 +49,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         self.course_key = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall')
 
         import_from_xml(
-            modulestore(), self.user.id, 'common/test/data/', ['toy'],
+            modulestore(), self.user.id, TEST_DATA_DIR, ['toy'],
             static_content_store=self.contentstore, verbose=True
         )
 
diff --git a/common/djangoapps/course_groups/views.py b/common/djangoapps/course_groups/views.py
index 4326a839c9..fa92262486 100644
--- a/common/djangoapps/course_groups/views.py
+++ b/common/djangoapps/course_groups/views.py
@@ -1,10 +1,9 @@
 from django_future.csrf import ensure_csrf_cookie
 from django.views.decorators.http import require_POST
 from django.contrib.auth.models import User
-from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from django.core.paginator import Paginator, EmptyPage
 from django.core.urlresolvers import reverse
 from django.http import Http404, HttpResponse, HttpResponseBadRequest
-from django.utils.translation import ugettext as _
 import json
 import logging
 import re
@@ -27,11 +26,11 @@ def json_http_response(data):
     return HttpResponse(json.dumps(data), content_type="application/json")
 
 
-def split_by_comma_and_whitespace(s):
+def split_by_comma_and_whitespace(cstr):
     """
     Split a string both by commas and whitespice.  Returns a list.
     """
-    return re.split(r'[\s,]+', s)
+    return re.split(r'[\s,]+', cstr)
 
 
 @ensure_csrf_cookie
@@ -84,19 +83,21 @@ def add_cohort(request, course_key_string):
     name = request.POST.get("name")
     if not name:
         return json_http_response({'success': False,
-                                'msg': "No name specified"})
+                                   'msg': "No name specified"})
 
     try:
         cohort = cohorts.add_cohort(course_key, name)
     except ValueError as err:
         return json_http_response({'success': False,
-                                'msg': str(err)})
+                                   'msg': str(err)})
 
-    return json_http_response({'success': 'True',
-                            'cohort': {
-                                'id': cohort.id,
-                                'name': cohort.name
-                                }})
+    return json_http_response({
+        'success': 'True',
+        'cohort': {
+            'id': cohort.id,
+            'name': cohort.name
+        }
+    })
 
 
 @ensure_csrf_cookie
@@ -126,10 +127,11 @@ def users_in_cohort(request, course_key_string, cohort_id):
     try:
         page = int(request.GET.get('page'))
     except (TypeError, ValueError):
-        return HttpResponseBadRequest(_('Requested page must be numeric'))
+        # These strings aren't user-facing so don't translate them
+        return HttpResponseBadRequest('Requested page must be numeric')
     else:
         if page < 0:
-            return HttpResponseBadRequest(_('Requested page must be greater than zero'))
+            return HttpResponseBadRequest('Requested page must be greater than zero')
 
     try:
         users = paginator.page(page)
diff --git a/common/djangoapps/edxmako/management/commands/preprocess_assets.py b/common/djangoapps/edxmako/management/commands/preprocess_assets.py
index 5791437fac..43efd4537d 100644
--- a/common/djangoapps/edxmako/management/commands/preprocess_assets.py
+++ b/common/djangoapps/edxmako/management/commands/preprocess_assets.py
@@ -16,6 +16,7 @@ from django.conf import settings
 from mako.template import Template
 import textwrap
 
+
 class Command(NoArgsCommand):
     """
     Basic management command to preprocess asset template files.
@@ -45,7 +46,6 @@ class Command(NoArgsCommand):
                         self.__preprocess(os.path.join(root, filename),
                                           os.path.join(root, outfile))
 
-
     def __context(self):
         """
         Return a dict that contains all of the available context
@@ -55,10 +55,9 @@ class Command(NoArgsCommand):
         # TODO: do this with the django-settings-context-processor
         return {
             "FEATURES": settings.FEATURES,
-            "THEME_NAME" : getattr(settings, "THEME_NAME", None),
+            "THEME_NAME": getattr(settings, "THEME_NAME", None),
         }
 
-
     def __preprocess(self, infile, outfile):
         """
         Run `infile` through the Mako template engine, storing the
@@ -73,4 +72,3 @@ class Command(NoArgsCommand):
              */
             """ % infile))
             _outfile.write(Template(filename=str(infile)).render(env=self.__context()))
-
diff --git a/common/djangoapps/microsite_configuration/microsite.py b/common/djangoapps/microsite_configuration/microsite.py
index 27f513ebe1..05409fe9e4 100644
--- a/common/djangoapps/microsite_configuration/microsite.py
+++ b/common/djangoapps/microsite_configuration/microsite.py
@@ -63,7 +63,7 @@ def get_template_path(relative_path):
         search_path = os.path.join(microsite_template_path, relative_path)
 
         if os.path.isfile(search_path):
-            path = '{0}/templates/{1}'.format(
+            path = '/{0}/templates/{1}'.format(
                 get_value('microsite_name'),
                 relative_path
             )
diff --git a/common/djangoapps/student/tests/test_login.py b/common/djangoapps/student/tests/test_login.py
index ad715a8dff..b35be740bf 100644
--- a/common/djangoapps/student/tests/test_login.py
+++ b/common/djangoapps/student/tests/test_login.py
@@ -12,8 +12,14 @@ from django.conf import settings
 from django.core.cache import cache
 from django.core.urlresolvers import reverse, NoReverseMatch
 from django.http import HttpResponseBadRequest, HttpResponse
+import httpretty
+from social.apps.django_app.default.models import UserSocialAuth
 from student.tests.factories import UserFactory, RegistrationFactory, UserProfileFactory
-from student.views import _parse_course_id_from_string, _get_course_enrollment_domain
+from student.views import (
+    _parse_course_id_from_string,
+    _get_course_enrollment_domain,
+    login_oauth_token,
+)
 
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, mixed_store_config
@@ -430,3 +436,89 @@ class ExternalAuthShibTest(ModuleStoreTestCase):
         self.assertEqual(shib_response.redirect_chain[-2],
                          ('http://testserver{url}'.format(url=TARGET_URL_SHIB), 302))
         self.assertEqual(shib_response.status_code, 200)
+
+
+@httpretty.activate
+class LoginOAuthTokenMixin(object):
+    """
+    Mixin with tests for the login_oauth_token view. A TestCase that includes
+    this must define the following:
+
+    BACKEND: The name of the backend from python-social-auth
+    USER_URL: The URL of the endpoint that the backend retrieves user data from
+    UID_FIELD: The field in the user data that the backend uses as the user id
+    """
+
+    def setUp(self):
+        self.client = Client()
+        self.url = reverse(login_oauth_token, kwargs={"backend": self.BACKEND})
+        self.social_uid = "social_uid"
+        self.user = UserFactory()
+        UserSocialAuth.objects.create(user=self.user, provider=self.BACKEND, uid=self.social_uid)
+
+    def _setup_user_response(self, success):
+        """
+        Register a mock response for the third party user information endpoint;
+        success indicates whether the response status code should be 200 or 400
+        """
+        if success:
+            status = 200
+            body = json.dumps({self.UID_FIELD: self.social_uid})
+        else:
+            status = 400
+            body = json.dumps({})
+        httpretty.register_uri(
+            httpretty.GET,
+            self.USER_URL,
+            body=body,
+            status=status,
+            content_type="application/json"
+        )
+
+    def _assert_error(self, response, status_code, error):
+        """Assert that the given response was a 400 with the given error code"""
+        self.assertEqual(response.status_code, status_code)
+        self.assertEqual(json.loads(response.content), {"error": error})
+        self.assertNotIn("partial_pipeline", self.client.session)
+
+    def test_success(self):
+        self._setup_user_response(success=True)
+        response = self.client.post(self.url, {"access_token": "dummy"})
+        self.assertEqual(response.status_code, 204)
+
+    def test_invalid_token(self):
+        self._setup_user_response(success=False)
+        response = self.client.post(self.url, {"access_token": "dummy"})
+        self._assert_error(response, 401, "invalid_token")
+
+    def test_missing_token(self):
+        response = self.client.post(self.url)
+        self._assert_error(response, 400, "invalid_request")
+
+    def test_unlinked_user(self):
+        UserSocialAuth.objects.all().delete()
+        self._setup_user_response(success=True)
+        response = self.client.post(self.url, {"access_token": "dummy"})
+        self._assert_error(response, 401, "invalid_token")
+
+    def test_get_method(self):
+        response = self.client.get(self.url, {"access_token": "dummy"})
+        self.assertEqual(response.status_code, 405)
+
+
+# This is necessary because cms does not implement third party auth
+@unittest.skipUnless(settings.FEATURES.get("ENABLE_THIRD_PARTY_AUTH"), "third party auth not enabled")
+class LoginOAuthTokenTestFacebook(LoginOAuthTokenMixin, TestCase):
+    """Tests login_oauth_token with the Facebook backend"""
+    BACKEND = "facebook"
+    USER_URL = "https://graph.facebook.com/me"
+    UID_FIELD = "id"
+
+
+# This is necessary because cms does not implement third party auth
+@unittest.skipUnless(settings.FEATURES.get("ENABLE_THIRD_PARTY_AUTH"), "third party auth not enabled")
+class LoginOAuthTokenTestGoogle(LoginOAuthTokenMixin, TestCase):
+    """Tests login_oauth_token with the Google backend"""
+    BACKEND = "google-oauth2"
+    USER_URL = "https://www.googleapis.com/oauth2/v1/userinfo"
+    UID_FIELD = "email"
diff --git a/common/djangoapps/student/tests/test_recent_enrollments.py b/common/djangoapps/student/tests/test_recent_enrollments.py
index 34ec6e38b9..ccba26e903 100644
--- a/common/djangoapps/student/tests/test_recent_enrollments.py
+++ b/common/djangoapps/student/tests/test_recent_enrollments.py
@@ -154,3 +154,17 @@ class TestRecentEnrollments(ModuleStoreTestCase):
             self.assertContains(response, "donate-container")
         else:
             self.assertNotContains(response, "donate-container")
+
+    def test_donate_button_honor_with_price(self):
+        # Enable the enrollment success message and donations
+        self._configure_message_timeout(10000)
+        DonationConfiguration(enabled=True).save()
+
+        # Create a white-label course mode
+        # (honor mode with a price set)
+        CourseModeFactory(mode_slug="honor", course_id=self.course.id, min_price=100)
+
+        # Check that the donate button is NOT displayed
+        self.client.login(username=self.student.username, password=self.PASSWORD)
+        response = self.client.get(reverse("dashboard"))
+        self.assertNotContains(response, "donate-container")
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 9cf27d9c42..b36341a755 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -39,6 +39,11 @@ from django.template.response import TemplateResponse
 
 from ratelimitbackend.exceptions import RateLimitException
 
+from requests import HTTPError
+
+from social.apps.django_app import utils as social_utils
+from social.backends import oauth as social_oauth
+
 from edxmako.shortcuts import render_to_response, render_to_string
 from mako.exceptions import TopLevelLookupException
 
@@ -1110,6 +1115,35 @@ def login_user(request, error=""):  # pylint: disable-msg=too-many-statements,un
     })  # TODO: this should be status code 400  # pylint: disable=fixme
 
 
+@require_POST
+@social_utils.strategy("social:complete")
+def login_oauth_token(request, backend):
+    """
+    Authenticate the client using an OAuth access token by using the token to
+    retrieve information from a third party and matching that information to an
+    existing user.
+    """
+    backend = request.social_strategy.backend
+    if isinstance(backend, social_oauth.BaseOAuth1) or isinstance(backend, social_oauth.BaseOAuth2):
+        if "access_token" in request.POST:
+            # Tell third party auth pipeline that this is an API call
+            request.session[pipeline.AUTH_ENTRY_KEY] = pipeline.AUTH_ENTRY_API
+            user = None
+            try:
+                user = backend.do_auth(request.POST["access_token"])
+            except HTTPError:
+                pass
+            # do_auth can return a non-User object if it fails
+            if user and isinstance(user, User):
+                return JsonResponse(status=204)
+            else:
+                # Ensure user does not re-enter the pipeline
+                request.social_strategy.clean_partial_pipeline()
+                return JsonResponse({"error": "invalid_token"}, status=401)
+        else:
+            return JsonResponse({"error": "invalid_request"}, status=400)
+    raise Http404
+
 
 @ensure_csrf_cookie
 def logout_user(request):
diff --git a/common/djangoapps/terrain/stubs/tests/test_youtube_stub.py b/common/djangoapps/terrain/stubs/tests/test_youtube_stub.py
index 3afe6308d4..aded4808f0 100644
--- a/common/djangoapps/terrain/stubs/tests/test_youtube_stub.py
+++ b/common/djangoapps/terrain/stubs/tests/test_youtube_stub.py
@@ -4,7 +4,7 @@ Unit test for stub YouTube implementation.
 
 import unittest
 import requests
-from ..youtube import StubYouTubeService, IFRAME_API_RESPONSE
+from ..youtube import StubYouTubeService
 
 
 class StubYouTubeServiceTest(unittest.TestCase):
diff --git a/common/djangoapps/terrain/stubs/youtube.py b/common/djangoapps/terrain/stubs/youtube.py
index 83e997f1e2..823b78fd02 100644
--- a/common/djangoapps/terrain/stubs/youtube.py
+++ b/common/djangoapps/terrain/stubs/youtube.py
@@ -24,7 +24,7 @@ from urlparse import urlparse
 from collections import OrderedDict
 
 
-IFRAME_API_RESPONSE = requests.get('https://www.youtube.com/iframe_api').content.strip("\n")
+IFRAME_API_RESPONSE = None
 
 
 class StubYouTubeHandler(StubHttpRequestHandler):
@@ -51,6 +51,11 @@ class StubYouTubeHandler(StubHttpRequestHandler):
         Handle a GET request from the client and sends response back.
         """
 
+        # Initialize only once if IFRAME_API_RESPONSE is none.
+        global IFRAME_API_RESPONSE  # pylint: disable=W0603
+        if IFRAME_API_RESPONSE is None:
+            IFRAME_API_RESPONSE = requests.get('https://www.youtube.com/iframe_api').content.strip("\n")
+
         self.log_message(
             "Youtube provider received GET request to path {}".format(self.path)
         )
diff --git a/common/djangoapps/third_party_auth/pipeline.py b/common/djangoapps/third_party_auth/pipeline.py
index 41be2a20e6..966fae9497 100644
--- a/common/djangoapps/third_party_auth/pipeline.py
+++ b/common/djangoapps/third_party_auth/pipeline.py
@@ -66,6 +66,7 @@ from eventtracking import tracker
 
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
+from django.http import HttpResponseBadRequest
 from django.shortcuts import redirect
 from social.apps.django_app.default import models
 from social.exceptions import AuthException
@@ -116,6 +117,8 @@ AUTH_ENTRY_REGISTER = 'register'
 AUTH_ENTRY_LOGIN_2 = 'account_login'
 AUTH_ENTRY_REGISTER_2 = 'account_register'
 
+AUTH_ENTRY_API = 'api'
+
 _AUTH_ENTRY_CHOICES = frozenset([
     AUTH_ENTRY_DASHBOARD,
     AUTH_ENTRY_LOGIN,
@@ -128,6 +131,8 @@ _AUTH_ENTRY_CHOICES = frozenset([
     # delete these constants from the choices list.
     AUTH_ENTRY_LOGIN_2,
     AUTH_ENTRY_REGISTER_2,
+
+    AUTH_ENTRY_API,
 ])
 
 _DEFAULT_RANDOM_PASSWORD_LENGTH = 12
@@ -411,6 +416,8 @@ def parse_query_params(strategy, response, *args, **kwargs):
         'is_register': auth_entry == AUTH_ENTRY_REGISTER,
         # Whether the auth pipeline entered from /profile.
         'is_profile': auth_entry == AUTH_ENTRY_PROFILE,
+        # Whether the auth pipeline entered from an API
+        'is_api': auth_entry == AUTH_ENTRY_API,
 
         # TODO (ECOM-369): Delete these once the A/B test
         # for the combined login/registration form completes.
@@ -427,16 +434,29 @@ def parse_query_params(strategy, response, *args, **kwargs):
 # these should redirect to the same location as "is_login" and "is_register"
 # (whichever login/registration end-points win in the test).
 @partial.partial
-def redirect_to_supplementary_form(
-    strategy, details, response, uid,
-    is_dashboard=None, is_login=None, is_profile=None, is_register=None,
-    is_login_2=None, is_register_2=None,
-    user=None, *args, **kwargs
+def ensure_user_information(
+    strategy,
+    details,
+    response,
+    uid,
+    is_dashboard=None,
+    is_login=None,
+    is_profile=None,
+    is_register=None,
+    is_login_2=None,
+    is_register_2=None,
+    is_api=None,
+    user=None,
+    *args,
+    **kwargs
 ):
-    """Dispatches user to views outside the pipeline if necessary."""
+    """
+    Ensure that we have the necessary information about a user (either an
+    existing account or registration data) to proceed with the pipeline.
+    """
 
     # We're deliberately verbose here to make it clear what the intended
-    # dispatch behavior is for the four pipeline entry points, given the
+    # dispatch behavior is for the various pipeline entry points, given the
     # current state of the pipeline. Keep in mind the pipeline is re-entrant
     # and values will change on repeated invocations (for example, the first
     # time through the login flow the user will be None so we dispatch to the
@@ -449,6 +469,11 @@ def redirect_to_supplementary_form(
     user_inactive = user and not user.is_active
     user_unset = user is None
     dispatch_to_login = is_login and (user_unset or user_inactive)
+    reject_api_request = is_api and (user_unset or user_inactive)
+
+    if reject_api_request:
+        # Content doesn't matter; we just want to exit the pipeline
+        return HttpResponseBadRequest()
 
     # TODO (ECOM-369): Consolidate this with `dispatch_to_login`
     # once the A/B test completes.
@@ -475,7 +500,7 @@ def redirect_to_supplementary_form(
 
 
 @partial.partial
-def set_logged_in_cookie(backend=None, user=None, request=None, *args, **kwargs):
+def set_logged_in_cookie(backend=None, user=None, request=None, is_api=None, *args, **kwargs):
     """This pipeline step sets the "logged in" cookie for authenticated users.
 
     Some installations have a marketing site front-end separate from
@@ -500,7 +525,7 @@ def set_logged_in_cookie(backend=None, user=None, request=None, *args, **kwargs)
     to the next pipeline step.
 
     """
-    if user is not None and user.is_authenticated():
+    if user is not None and user.is_authenticated() and not is_api:
         if request is not None:
             # Check that the cookie isn't already set.
             # This ensures that we allow the user to continue to the next
diff --git a/common/djangoapps/third_party_auth/settings.py b/common/djangoapps/third_party_auth/settings.py
index 421d335b2c..a94cb10da3 100644
--- a/common/djangoapps/third_party_auth/settings.py
+++ b/common/djangoapps/third_party_auth/settings.py
@@ -111,7 +111,7 @@ def _set_global_settings(django_settings):
         'social.pipeline.social_auth.auth_allowed',
         'social.pipeline.social_auth.social_user',
         'social.pipeline.user.get_username',
-        'third_party_auth.pipeline.redirect_to_supplementary_form',
+        'third_party_auth.pipeline.ensure_user_information',
         'social.pipeline.user.create_user',
         'social.pipeline.social_auth.associate_user',
         'social.pipeline.social_auth.load_extra_data',
diff --git a/common/djangoapps/track/shim.py b/common/djangoapps/track/shim.py
index 4318f19069..dd0b885a7c 100644
--- a/common/djangoapps/track/shim.py
+++ b/common/djangoapps/track/shim.py
@@ -1,5 +1,14 @@
 """Map new event context values to old top-level field values. Ensures events can be parsed by legacy parsers."""
 
+import json
+import logging
+
+from opaque_keys import InvalidKeyError
+from opaque_keys.edx.keys import UsageKey
+
+
+log = logging.getLogger(__name__)
+
 CONTEXT_FIELDS_TO_INCLUDE = [
     'username',
     'session',
@@ -13,33 +22,39 @@ class LegacyFieldMappingProcessor(object):
     """Ensures all required fields are included in emitted events"""
 
     def __call__(self, event):
+        context = event.get('context', {})
         if 'context' in event:
-            context = event['context']
             for field in CONTEXT_FIELDS_TO_INCLUDE:
-                if field in context:
-                    event[field] = context[field]
-                else:
-                    event[field] = ''
+                self.move_from_context(field, event)
             remove_shim_context(event)
 
-        if 'event_type' in event.get('context', {}):
-            event['event_type'] = event['context']['event_type']
-            del event['context']['event_type']
-        else:
-            event['event_type'] = event.get('name', '')
-
         if 'data' in event:
             event['event'] = event['data']
             del event['data']
         else:
             event['event'] = {}
 
-        if 'timestamp' in event:
+        if 'timestamp' in context:
+            event['time'] = context['timestamp']
+            del context['timestamp']
+        elif 'timestamp' in event:
             event['time'] = event['timestamp']
+
+        if 'timestamp' in event:
             del event['timestamp']
 
-        event['event_source'] = 'server'
-        event['page'] = None
+        self.move_from_context('event_type', event, event.get('name', ''))
+        self.move_from_context('event_source', event, 'server')
+        self.move_from_context('page', event, None)
+
+    def move_from_context(self, field, event, default_value=''):
+        """Move a field from the context to the top level of the event."""
+        context = event.get('context', {})
+        if field in context:
+            event[field] = context[field]
+            del context[field]
+        else:
+            event[field] = default_value
 
 
 def remove_shim_context(event):
@@ -52,3 +67,66 @@ def remove_shim_context(event):
         for field in context_fields_to_remove:
             if field in context:
                 del context[field]
+
+
+NAME_TO_EVENT_TYPE_MAP = {
+    'edx.video.played': 'play_video',
+    'edx.video.paused': 'pause_video',
+    'edx.video.stopped': 'stop_video',
+    'edx.video.loaded': 'load_video',
+    'edx.video.transcript.shown': 'show_transcript',
+    'edx.video.transcript.hidden': 'hide_transcript',
+}
+
+
+class VideoEventProcessor(object):
+    """
+    Converts new format video events into the legacy video event format.
+
+    Mobile devices cannot actually emit events that exactly match their counterparts emitted by the LMS javascript
+    video player. Instead of attempting to get them to do that, we instead insert a shim here that converts the events
+    they *can* easily emit and converts them into the legacy format.
+
+    TODO: Remove this shim and perform the conversion as part of some batch canonicalization process.
+
+    """
+
+    def __call__(self, event):
+        name = event.get('name')
+        if not name:
+            return
+
+        if name not in NAME_TO_EVENT_TYPE_MAP:
+            return
+
+        event['event_type'] = NAME_TO_EVENT_TYPE_MAP[name]
+
+        if 'event' not in event:
+            return
+
+        payload = event['event']
+
+        if 'module_id' in payload:
+            module_id = payload['module_id']
+            try:
+                usage_key = UsageKey.from_string(module_id)
+            except InvalidKeyError:
+                log.warning('Unable to parse module_id "%s"', module_id, exc_info=True)
+            else:
+                payload['id'] = usage_key.html_id()
+
+            del payload['module_id']
+
+        if 'current_time' in payload:
+            payload['currentTime'] = payload.pop('current_time')
+
+        event['event'] = json.dumps(payload)
+
+        if 'context' not in event:
+            return
+
+        context = event['context']
+
+        if 'browser_page' in context:
+            page, _sep, _tail = context.pop('browser_page').rpartition('/')
+            event['page'] = page
diff --git a/common/djangoapps/track/tests/__init__.py b/common/djangoapps/track/tests/__init__.py
index e69de29bb2..3efbb4343c 100644
--- a/common/djangoapps/track/tests/__init__.py
+++ b/common/djangoapps/track/tests/__init__.py
@@ -0,0 +1,69 @@
+"""Helpers for tests related to emitting events to the tracking logs."""
+
+from datetime import datetime
+
+from django.test import TestCase
+from django.test.utils import override_settings
+from freezegun import freeze_time
+from pytz import UTC
+
+from eventtracking import tracker
+from eventtracking.django import DjangoTracker
+
+
+FROZEN_TIME = datetime(2013, 10, 3, 8, 24, 55, tzinfo=UTC)
+IN_MEMORY_BACKEND_CONFIG = {
+    'mem': {
+        'ENGINE': 'track.tests.InMemoryBackend'
+    }
+}
+
+
+class InMemoryBackend(object):
+    """A backend that simply stores all events in memory"""
+
+    def __init__(self):
+        super(InMemoryBackend, self).__init__()
+        self.events = []
+
+    def send(self, event):
+        """Store the event in a list"""
+        self.events.append(event)
+
+
+@freeze_time(FROZEN_TIME)
+@override_settings(
+    EVENT_TRACKING_BACKENDS=IN_MEMORY_BACKEND_CONFIG
+)
+class EventTrackingTestCase(TestCase):
+    """
+    Supports capturing of emitted events in memory and inspecting them.
+
+    Each test gets a "clean slate" and can retrieve any events emitted during their execution.
+
+    """
+
+    # Make this more robust to the addition of new events that the test doesn't care about.
+
+    def setUp(self):
+        super(EventTrackingTestCase, self).setUp()
+
+        self.tracker = DjangoTracker()
+        tracker.register_tracker(self.tracker)
+
+    @property
+    def backend(self):
+        """A reference to the in-memory backend that stores the events."""
+        return self.tracker.backends['mem']
+
+    def get_event(self, idx=0):
+        """Retrieve an event emitted up to this point in the test."""
+        return self.backend.events[idx]
+
+    def assert_no_events_emitted(self):
+        """Ensure no events were emitted at this point in the test."""
+        self.assertEquals(len(self.backend.events), 0)
+
+    def assert_events_emitted(self):
+        """Ensure at least one event has been emitted at this point in the test."""
+        self.assertGreaterEqual(len(self.backend.events), 1)
diff --git a/common/djangoapps/track/tests/test_shim.py b/common/djangoapps/track/tests/test_shim.py
index 12d8f21ae8..b30731fc72 100644
--- a/common/djangoapps/track/tests/test_shim.py
+++ b/common/djangoapps/track/tests/test_shim.py
@@ -1,42 +1,25 @@
 """Ensure emitted events contain the fields legacy processors expect to find."""
 
-from datetime import datetime
-
-from freezegun import freeze_time
 from mock import sentinel
-from django.test import TestCase
 from django.test.utils import override_settings
-from pytz import UTC
 
-from eventtracking.django import DjangoTracker
+from track.tests import EventTrackingTestCase, FROZEN_TIME
 
 
-IN_MEMORY_BACKEND = {
-    'mem': {
-        'ENGINE': 'track.tests.test_shim.InMemoryBackend'
-    }
-}
-
 LEGACY_SHIM_PROCESSOR = [
     {
         'ENGINE': 'track.shim.LegacyFieldMappingProcessor'
     }
 ]
 
-FROZEN_TIME = datetime(2013, 10, 3, 8, 24, 55, tzinfo=UTC)
 
-
-@freeze_time(FROZEN_TIME)
-class LegacyFieldMappingProcessorTestCase(TestCase):
+class LegacyFieldMappingProcessorTestCase(EventTrackingTestCase):
     """Ensure emitted events contain the fields legacy processors expect to find."""
 
     @override_settings(
-        EVENT_TRACKING_BACKENDS=IN_MEMORY_BACKEND,
         EVENT_TRACKING_PROCESSORS=LEGACY_SHIM_PROCESSOR,
     )
     def test_event_field_mapping(self):
-        django_tracker = DjangoTracker()
-
         data = {sentinel.key: sentinel.value}
 
         context = {
@@ -49,16 +32,15 @@ class LegacyFieldMappingProcessorTestCase(TestCase):
             'user_id': sentinel.user_id,
             'course_id': sentinel.course_id,
             'org_id': sentinel.org_id,
-            'event_type': sentinel.event_type,
             'client_id': sentinel.client_id,
         }
-        with django_tracker.context('test', context):
-            django_tracker.emit(sentinel.name, data)
+        with self.tracker.context('test', context):
+            self.tracker.emit(sentinel.name, data)
 
-        emitted_event = django_tracker.backends['mem'].get_event()
+        emitted_event = self.get_event()
 
         expected_event = {
-            'event_type': sentinel.event_type,
+            'event_type': sentinel.name,
             'name': sentinel.name,
             'context': {
                 'user_id': sentinel.user_id,
@@ -79,15 +61,12 @@ class LegacyFieldMappingProcessorTestCase(TestCase):
         self.assertEqual(expected_event, emitted_event)
 
     @override_settings(
-        EVENT_TRACKING_BACKENDS=IN_MEMORY_BACKEND,
         EVENT_TRACKING_PROCESSORS=LEGACY_SHIM_PROCESSOR,
     )
     def test_missing_fields(self):
-        django_tracker = DjangoTracker()
+        self.tracker.emit(sentinel.name)
 
-        django_tracker.emit(sentinel.name)
-
-        emitted_event = django_tracker.backends['mem'].get_event()
+        emitted_event = self.get_event()
 
         expected_event = {
             'event_type': sentinel.name,
@@ -104,19 +83,3 @@ class LegacyFieldMappingProcessorTestCase(TestCase):
             'session': '',
         }
         self.assertEqual(expected_event, emitted_event)
-
-
-class InMemoryBackend(object):
-    """A backend that simply stores all events in memory"""
-
-    def __init__(self):
-        super(InMemoryBackend, self).__init__()
-        self.events = []
-
-    def send(self, event):
-        """Store the event in a list"""
-        self.events.append(event)
-
-    def get_event(self):
-        """Return the first event that was emitted."""
-        return self.events[0]
diff --git a/common/djangoapps/track/views/segmentio.py b/common/djangoapps/track/views/segmentio.py
index d89d32ff88..b613a75289 100644
--- a/common/djangoapps/track/views/segmentio.py
+++ b/common/djangoapps/track/views/segmentio.py
@@ -6,27 +6,25 @@ import logging
 
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.http import HttpResponse
 from django.views.decorators.http import require_POST
 from django_future.csrf import csrf_exempt
 
-from eventtracking import tracker as eventtracker
+from eventtracking import tracker
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys import InvalidKeyError
 from util.json_request import expect_json, JsonResponse
 
-from track import tracker
-from track import shim
-
 log = logging.getLogger(__name__)
 
 
 ERROR_UNAUTHORIZED = 'Unauthorized'
-WARNING_IGNORED_CHANNEL = 'Channel ignored'
-WARNING_IGNORED_ACTION = 'Action ignored'
+WARNING_IGNORED_SOURCE = 'Source ignored'
+WARNING_IGNORED_TYPE = 'Type ignored'
 ERROR_MISSING_USER_ID = 'Required user_id missing from context'
 ERROR_USER_NOT_EXIST = 'Specified user does not exist'
 ERROR_INVALID_USER_ID = 'Unable to parse userId as an integer'
-ERROR_MISSING_EVENT_TYPE = 'The event_type field must be specified in the properties dictionary'
+ERROR_MISSING_NAME = 'The name field must be specified in the properties dictionary'
 ERROR_MISSING_TIMESTAMP = 'Required timestamp field not found'
 ERROR_MISSING_RECEIVED_AT = 'Required receivedAt field not found'
 
@@ -34,7 +32,7 @@ ERROR_MISSING_RECEIVED_AT = 'Required receivedAt field not found'
 @require_POST
 @expect_json
 @csrf_exempt
-def track_segmentio_event(request):
+def segmentio_event(request):
     """
     An endpoint for logging events using segment.io's webhook integration.
 
@@ -50,34 +48,9 @@ def track_segmentio_event(request):
     Many of the root fields of a standard edX tracking event are read out of the "properties" dictionary provided by the
     segment.io event, which is, in turn, provided by the client that emitted the event.
 
-    In order for an event to be logged the following preconditions must be met:
-
-    * The "key" query string parameter must exactly match the django setting TRACKING_SEGMENTIO_WEBHOOK_SECRET. While
-      the endpoint is public, we want to limit access to it to the segment.io servers only.
-    * The value of the "channel" field of the event must be included in the list specified by the django setting
-      TRACKING_SEGMENTIO_ALLOWED_CHANNELS. This is intended to restrict the set of events to specific channels. For
-      example: just mobile devices.
-    * The value of the "action" field of the event must be included in the list specified by the django setting
-      TRACKING_SEGMENTIO_ALLOWED_ACTIONS. In order to make use of *all* of the features segment.io offers we would have
-      to implement some sort of persistent storage of information contained in some actions (like identify). For now,
-      we defer support of those actions and just support a limited set that can be handled without storing information
-      in external state.
-    * The value of the standard "userId" field of the event must be an integer that can be used to look up the user
-      using the primary key of the User model.
-    * Include an "event_type" field in the properties dictionary that indicates the edX event type. Note this can differ
-      from the "event" field found in the root of a segment.io event. The "event" field at the root of the structure is
-      intended to be human readable, the "event_type" field is expected to conform to the standard for naming events
-      found in the edX data documentation.
-
-    Additionally the event can optionally:
-
-    * Provide a "context" dictionary in the properties dictionary. This dictionary will be applied to the
-      existing context on the server overriding any existing keys. This context dictionary should include a "course_id"
-      field when the event is scoped to a particular course. The value of this field should be a valid course key. The
-      context may contain other arbitrary data that will be logged with the event, for example: identification
-      information for the device that emitted the event.
-    * Provide a "page" parameter in the properties dictionary which indicates the page that was being displayed to the
-      user or the mobile application screen that was visible to the user at the time the event was emitted.
+    In order for an event to be accepted and logged the "key" query string parameter must exactly match the django
+    setting TRACKING_SEGMENTIO_WEBHOOK_SECRET. While the endpoint is public, we want to limit access to it to the
+    segment.io servers only.
 
     """
 
@@ -88,7 +61,59 @@ def track_segmentio_event(request):
     expected_secret = getattr(settings, 'TRACKING_SEGMENTIO_WEBHOOK_SECRET', None)
     provided_secret = request.GET.get('key')
     if not expected_secret or provided_secret != expected_secret:
-        return failure_response(ERROR_UNAUTHORIZED, status=401)
+        return HttpResponse(status=401)
+
+    try:
+        track_segmentio_event(request)
+    except EventValidationError as err:
+        log.warning(
+            'Unable to process event received from segment.io: message="%s" event="%s"',
+            str(err),
+            request.body
+        )
+        # Do not let the requestor know why the event wasn't saved. If the secret key is compromised this diagnostic
+        # information could be used to scrape useful information from the system.
+
+    return HttpResponse(status=200)
+
+
+class EventValidationError(Exception):
+    """Raised when an invalid event is received."""
+    pass
+
+
+def track_segmentio_event(request):  # pylint: disable=too-many-statements
+    """
+    Record an event received from segment.io to the tracking logs.
+
+    This method assumes that the event has come from a trusted source.
+
+    The received event must meet the following conditions in order to be logged:
+
+    * The value of the "type" field of the event must be included in the list specified by the django setting
+      TRACKING_SEGMENTIO_ALLOWED_TYPES. In order to make use of *all* of the features segment.io offers we would have
+      to implement some sort of persistent storage of information contained in some actions (like identify). For now,
+      we defer support of those actions and just support a limited set that can be handled without storing information
+      in external state.
+    * The value of the standard "userId" field of the event must be an integer that can be used to look up the user
+      using the primary key of the User model.
+    * Include a "name" field in the properties dictionary that indicates the edX event name. Note this can differ
+      from the "event" field found in the root of a segment.io event. The "event" field at the root of the structure is
+      intended to be human readable, the "name" field is expected to conform to the standard for naming events
+      found in the edX data documentation.
+    * Have originated from a known and trusted segment.io client library. The django setting
+      TRACKING_SEGMENTIO_SOURCE_MAP maps the known library names to internal "event_source" strings. In order to be
+      logged the event must have a library name that is a valid key in that map.
+
+    Additionally the event can optionally:
+
+    * Provide a "context" dictionary in the properties dictionary. This dictionary will be applied to the
+      existing context on the server overriding any existing keys. This context dictionary should include a "course_id"
+      field when the event is scoped to a particular course. The value of this field should be a valid course key. The
+      context may contain other arbitrary data that will be logged with the event, for example: identification
+      information for the device that emitted the event.
+
+    """
 
     # The POST body will contain the JSON encoded event
     full_segment_event = request.json
@@ -96,52 +121,51 @@ def track_segmentio_event(request):
     # We mostly care about the properties
     segment_event = full_segment_event.get('properties', {})
 
-    def logged_failure_response(*args, **kwargs):
-        """Indicate a failure and log information about the event that will aide debugging efforts"""
-        failed_response = failure_response(*args, **kwargs)
-        log.warning('Unable to process event received from segment.io: %s', json.dumps(full_segment_event))
-        return failed_response
-
-    # Selectively listen to particular channels, note that the client can set the "event_source" field in the
-    # "properties" dict to override the channel provided by segment.io. This is necessary because there is a bug in some
-    # segment.io client libraries that prevented them from sending correct channel fields.
-    channel = segment_event.get('event_source')
-    allowed_channels = [c.lower() for c in getattr(settings, 'TRACKING_SEGMENTIO_ALLOWED_CHANNELS', [])]
-    if not channel or channel.lower() not in allowed_channels:
-        return response(WARNING_IGNORED_CHANNEL, committed=False)
-
-    # Ignore actions that are unsupported
-    action = full_segment_event.get('action')
-    allowed_actions = [a.lower() for a in getattr(settings, 'TRACKING_SEGMENTIO_ALLOWED_ACTIONS', [])]
-    if not action or action.lower() not in allowed_actions:
-        return response(WARNING_IGNORED_ACTION, committed=False)
+    # Start with the context provided by segment.io in the "client" field if it exists
+    # We should tightly control which fields actually get included in the event emitted.
+    segment_context = full_segment_event.get('context')
 
+    # Build up the event context by parsing fields out of the event received from segment.io
     context = {}
 
-    # Start with the context provided by segment.io in the "client" field if it exists
-    segment_context = full_segment_event.get('context')
-    if segment_context:
-        context['client'] = segment_context
-        user_agent = segment_context.get('userAgent', '')
+    library_name = segment_context.get('library', {}).get('name')
+    source_map = getattr(settings, 'TRACKING_SEGMENTIO_SOURCE_MAP', {})
+    event_source = source_map.get(library_name)
+    if not event_source:
+        raise EventValidationError(WARNING_IGNORED_SOURCE)
     else:
-        user_agent = ''
+        context['event_source'] = event_source
+
+    # Ignore types that are unsupported
+    segment_event_type = full_segment_event.get('type')
+    allowed_types = [a.lower() for a in getattr(settings, 'TRACKING_SEGMENTIO_ALLOWED_TYPES', [])]
+    if not segment_event_type or segment_event_type.lower() not in allowed_types:
+        raise EventValidationError(WARNING_IGNORED_TYPE)
+
+    if segment_context:
+        context['client'] = dict(segment_context)
+        context['agent'] = segment_context.get('userAgent', '')
+        for field in ('traits', 'integrations', 'userAgent'):
+            if field in context['client']:
+                del context['client'][field]
 
     # Overlay any context provided in the properties
     context.update(segment_event.get('context', {}))
 
     user_id = full_segment_event.get('userId')
     if not user_id:
-        return logged_failure_response(ERROR_MISSING_USER_ID)
+        raise EventValidationError(ERROR_MISSING_USER_ID)
 
     # userId is assumed to be the primary key of the django User model
     try:
         user = User.objects.get(pk=user_id)
     except User.DoesNotExist:
-        return logged_failure_response(ERROR_USER_NOT_EXIST)
+        raise EventValidationError(ERROR_USER_NOT_EXIST)
     except ValueError:
-        return logged_failure_response(ERROR_INVALID_USER_ID)
+        raise EventValidationError(ERROR_INVALID_USER_ID)
     else:
         context['user_id'] = user.id
+        context['username'] = user.username
 
     # course_id is expected to be provided in the context when applicable
     course_id = context.get('course_id')
@@ -159,71 +183,22 @@ def track_segmentio_event(request):
             )
 
     if 'timestamp' in full_segment_event:
-        time = parse_iso8601_timestamp(full_segment_event['timestamp'])
+        context['timestamp'] = parse_iso8601_timestamp(full_segment_event['timestamp'])
     else:
-        return logged_failure_response(ERROR_MISSING_TIMESTAMP)
+        raise EventValidationError(ERROR_MISSING_TIMESTAMP)
 
     if 'receivedAt' in full_segment_event:
         context['received_at'] = parse_iso8601_timestamp(full_segment_event['receivedAt'])
     else:
-        return logged_failure_response(ERROR_MISSING_RECEIVED_AT)
+        raise EventValidationError(ERROR_MISSING_RECEIVED_AT)
 
-    if 'event_type' in segment_event:
-        event_type = segment_event['event_type']
-    else:
-        return logged_failure_response(ERROR_MISSING_EVENT_TYPE)
+    if 'name' not in segment_event:
+        raise EventValidationError(ERROR_MISSING_NAME)
 
-    with eventtracker.get_tracker().context('edx.segmentio', context):
-        complete_context = eventtracker.get_tracker().resolve_context()
-        event = {
-            "username": user.username,
-            "event_type": event_type,
-            "name": segment_event.get('name', ''),
-            # Will be either "mobile", "browser" or "server". These names happen to be identical to the names we already
-            # use so no mapping is necessary.
-            "event_source": channel,
-            # This timestamp is reported by the local clock on the device so it may be wildly incorrect.
-            "time": time,
-            "context": complete_context,
-            "page": segment_event.get('page'),
-            "host": complete_context.get('host', ''),
-            "agent": user_agent,
-            "ip": segment_event.get('ip', ''),
-            "event": segment_event.get('event', {}),
-        }
+    context['ip'] = segment_event.get('context', {}).get('ip', '')
 
-    # Some duplicated fields are passed into event-tracking via the context by track.middleware.
-    # Remove them from the event here since they are captured elsewhere.
-    shim.remove_shim_context(event)
-
-    tracker.send(event)
-
-    return response()
-
-
-def response(message=None, status=200, committed=True):
-    """
-    Produce a response from the segment.io event handler.
-
-    Returns: A JSON encoded string giving more information about what action was taken while processing the request.
-    """
-    result = {
-        'committed': committed
-    }
-
-    if message:
-        result['message'] = message
-
-    return JsonResponse(result, status=status)
-
-
-def failure_response(message, status=400):
-    """
-    Return a failure response when something goes wrong handling segment.io events.
-
-    Returns: A JSON encoded string giving more information about what went wrong when processing the request.
-    """
-    return response(message=message, status=status, committed=False)
+    with tracker.get_tracker().context('edx.segmentio', context):
+        tracker.emit(segment_event['name'], segment_event.get('data', {}))
 
 
 def parse_iso8601_timestamp(timestamp):
diff --git a/common/djangoapps/track/views/tests/test_segmentio.py b/common/djangoapps/track/views/tests/test_segmentio.py
index d3746067a8..5c61229faa 100644
--- a/common/djangoapps/track/views/tests/test_segmentio.py
+++ b/common/djangoapps/track/views/tests/test_segmentio.py
@@ -3,85 +3,99 @@
 from datetime import datetime
 import json
 
-from ddt import ddt, data
-from freezegun import freeze_time
-from mock import patch, sentinel
+from ddt import ddt, data, unpack
+from mock import sentinel
 
 from django.contrib.auth.models import User
-from django.test import TestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
 
 from track.middleware import TrackMiddleware
+from track.tests import EventTrackingTestCase
 from track.views import segmentio
 
 
-EXPECTED_TIME = datetime(2013, 10, 3, 8, 24, 55)
 SECRET = 'anything'
 ENDPOINT = '/segmentio/test/event'
 USER_ID = 10
 
+MOBILE_SHIM_PROCESSOR = [
+    {
+        'ENGINE': 'track.shim.LegacyFieldMappingProcessor'
+    },
+    {
+        'ENGINE': 'track.shim.VideoEventProcessor'
+    }
+]
+
+
+def expect_failure_with_message(message):
+    """Ensure the test raises an exception and does not emit an event"""
+    def test_decorator(func):
+        def test_decorated(self, *args, **kwargs):
+            self.assertRaisesRegexp(segmentio.EventValidationError, message, func, self, *args, **kwargs)
+            self.assert_no_events_emitted()
+        return test_decorated
+    return test_decorator
+
 
 @ddt
 @override_settings(
     TRACKING_SEGMENTIO_WEBHOOK_SECRET=SECRET,
     TRACKING_IGNORE_URL_PATTERNS=[ENDPOINT],
-    TRACKING_SEGMENTIO_ALLOWED_ACTIONS=['Track', 'Screen'],
-    TRACKING_SEGMENTIO_ALLOWED_CHANNELS=['mobile']
+    TRACKING_SEGMENTIO_ALLOWED_TYPES=['track'],
+    TRACKING_SEGMENTIO_SOURCE_MAP={'test-app': 'mobile'},
+    EVENT_TRACKING_PROCESSORS=MOBILE_SHIM_PROCESSOR,
 )
-@freeze_time(EXPECTED_TIME)
-class SegmentIOTrackingTestCase(TestCase):
+class SegmentIOTrackingTestCase(EventTrackingTestCase):
     """Test processing of segment.io events"""
 
     def setUp(self):
+        super(SegmentIOTrackingTestCase, self).setUp()
         self.request_factory = RequestFactory()
 
-        patcher = patch('track.views.segmentio.tracker')
-        self.mock_tracker = patcher.start()
-        self.addCleanup(patcher.stop)
-
     def test_get_request(self):
         request = self.request_factory.get(ENDPOINT)
-        response = segmentio.track_segmentio_event(request)
+        response = segmentio.segmentio_event(request)
         self.assertEquals(response.status_code, 405)
-        self.assertFalse(self.mock_tracker.send.called)  # pylint: disable=maybe-no-member
+        self.assert_no_events_emitted()
 
     @override_settings(
         TRACKING_SEGMENTIO_WEBHOOK_SECRET=None
     )
     def test_no_secret_config(self):
         request = self.request_factory.post(ENDPOINT)
-        response = segmentio.track_segmentio_event(request)
-        self.assert_segmentio_uncommitted_response(response, segmentio.ERROR_UNAUTHORIZED, 401)
-
-    def assert_segmentio_uncommitted_response(self, response, expected_message, expected_status=400):
-        """Assert that no event was emitted and an appropriate commit==false message was returned"""
-        self.assertEquals(response.status_code, expected_status)
-        parsed_content = json.loads(response.content)
-        self.assertEquals(parsed_content, {'committed': False, 'message': expected_message})
-        self.assertFalse(self.mock_tracker.send.called)  # pylint: disable=maybe-no-member
+        response = segmentio.segmentio_event(request)
+        self.assertEquals(response.status_code, 401)
+        self.assert_no_events_emitted()
 
     def test_no_secret_provided(self):
         request = self.request_factory.post(ENDPOINT)
-        response = segmentio.track_segmentio_event(request)
-        self.assert_segmentio_uncommitted_response(response, segmentio.ERROR_UNAUTHORIZED, 401)
+        response = segmentio.segmentio_event(request)
+        self.assertEquals(response.status_code, 401)
+        self.assert_no_events_emitted()
 
     def test_secret_mismatch(self):
         request = self.create_request(key='y')
-        response = segmentio.track_segmentio_event(request)
-        self.assert_segmentio_uncommitted_response(response, segmentio.ERROR_UNAUTHORIZED, 401)
+        response = segmentio.segmentio_event(request)
+        self.assertEquals(response.status_code, 401)
+        self.assert_no_events_emitted()
 
     def create_request(self, key=None, **kwargs):
         """Create a fake request that emulates a request from the segment.io servers to ours"""
         if key is None:
             key = SECRET
 
-        return self.request_factory.post(ENDPOINT + "?key=" + key, **kwargs)
+        request = self.request_factory.post(ENDPOINT + "?key=" + key, **kwargs)
+        if 'data' in kwargs:
+            request.json = json.loads(kwargs['data'])
 
-    @data('Identify', 'Group', 'Alias', 'Page', 'identify')
+        return request
+
+    @data('identify', 'Group', 'Alias', 'Page', 'identify', 'screen')
+    @expect_failure_with_message(segmentio.WARNING_IGNORED_TYPE)
     def test_segmentio_ignore_actions(self, action):
-        response = self.post_segmentio_event(action=action)
-        self.assert_segmentio_uncommitted_response(response, segmentio.WARNING_IGNORED_ACTION, 200)
+        self.post_segmentio_event(action=action)
 
     def post_segmentio_event(self, **kwargs):
         """Post a fake segment.io event to the view that processes it"""
@@ -89,12 +103,7 @@ class SegmentIOTrackingTestCase(TestCase):
             data=self.create_segmentio_event_json(**kwargs),
             content_type='application/json'
         )
-        return segmentio.track_segmentio_event(request)
-
-    @data('server', 'browser', 'Browser')
-    def test_segmentio_ignore_channels(self, channel):
-        response = self.post_segmentio_event(event_source=channel)
-        self.assert_segmentio_uncommitted_response(response, segmentio.WARNING_IGNORED_CHANNEL, 200)
+        segmentio.track_segmentio_event(request)
 
     def create_segmentio_event(self, **kwargs):
         """Populate a fake segment.io event with data of interest"""
@@ -103,18 +112,16 @@ class SegmentIOTrackingTestCase(TestCase):
             "userId": kwargs.get('user_id', USER_ID),
             "event": "Did something",
             "properties": {
-                'event_type': kwargs.get('event_type', ''),
-                'event_source': kwargs.get('event_source', 'mobile'),
-                'event': kwargs.get('event', {}),
+                'name': kwargs.get('name', str(sentinel.name)),
+                'data': kwargs.get('data', {}),
                 'context': {
                     'course_id': kwargs.get('course_id') or '',
-                },
-                'name': str(sentinel.name),
+                }
             },
-            "channel": kwargs.get('channel', 'mobile'),
+            "channel": 'server',
             "context": {
                 "library": {
-                    "name": "unknown",
+                    "name": kwargs.get('library_name', 'test-app'),
                     "version": "unknown"
                 },
                 'userAgent': str(sentinel.user_agent),
@@ -133,42 +140,50 @@ class SegmentIOTrackingTestCase(TestCase):
             "action": action
         }
 
+        if 'context' in kwargs:
+            sample_event['properties']['context'].update(kwargs['context'])
+
         return sample_event
 
     def create_segmentio_event_json(self, **kwargs):
         """Return a json string containing a fake segment.io event"""
         return json.dumps(self.create_segmentio_event(**kwargs))
 
-    def test_no_user_for_user_id(self):
-        response = self.post_segmentio_event(user_id=40)
-        self.assert_segmentio_uncommitted_response(response, segmentio.ERROR_USER_NOT_EXIST, 400)
+    @expect_failure_with_message(segmentio.WARNING_IGNORED_SOURCE)
+    def test_segmentio_ignore_unknown_libraries(self):
+        self.post_segmentio_event(library_name='foo')
 
+    @expect_failure_with_message(segmentio.ERROR_USER_NOT_EXIST)
+    def test_no_user_for_user_id(self):
+        self.post_segmentio_event(user_id=40)
+
+    @expect_failure_with_message(segmentio.ERROR_INVALID_USER_ID)
     def test_invalid_user_id(self):
-        response = self.post_segmentio_event(user_id='foobar')
-        self.assert_segmentio_uncommitted_response(response, segmentio.ERROR_INVALID_USER_ID, 400)
+        self.post_segmentio_event(user_id='foobar')
 
     @data('foo/bar/baz', 'course-v1:foo+bar+baz')
     def test_success(self, course_id):
         middleware = TrackMiddleware()
 
         request = self.create_request(
-            data=self.create_segmentio_event_json(event_type=str(sentinel.event_type), event={'foo': 'bar'}, course_id=course_id),
+            data=self.create_segmentio_event_json(data={'foo': 'bar'}, course_id=course_id),
             content_type='application/json'
         )
         User.objects.create(pk=USER_ID, username=str(sentinel.username))
 
         middleware.process_request(request)
         # The middleware normally emits an event, make sure it doesn't in this case.
-        self.assertFalse(self.mock_tracker.send.called)  # pylint: disable=maybe-no-member
+        self.assert_no_events_emitted()
         try:
-            response = segmentio.track_segmentio_event(request)
+            response = segmentio.segmentio_event(request)
             self.assertEquals(response.status_code, 200)
 
             expected_event = {
                 'username': str(sentinel.username),
                 'ip': '',
+                'session': '',
                 'event_source': 'mobile',
-                'event_type': str(sentinel.event_type),
+                'event_type': str(sentinel.name),
                 'name': str(sentinel.name),
                 'event': {'foo': 'bar'},
                 'agent': str(sentinel.user_agent),
@@ -182,10 +197,9 @@ class SegmentIOTrackingTestCase(TestCase):
                     'path': ENDPOINT,
                     'client': {
                         'library': {
-                            'name': 'unknown',
+                            'name': 'test-app',
                             'version': 'unknown'
-                        },
-                        'userAgent': str(sentinel.user_agent)
+                        }
                     },
                     'received_at': datetime.strptime("2014-08-27T16:33:39.100Z", "%Y-%m-%dT%H:%M:%S.%fZ"),
                 },
@@ -193,7 +207,7 @@ class SegmentIOTrackingTestCase(TestCase):
         finally:
             middleware.process_response(request, None)
 
-        self.mock_tracker.send.assert_called_once_with(expected_event)  # pylint: disable=maybe-no-member
+        self.assertEquals(self.get_event(), expected_event)
 
     def test_invalid_course_id(self):
         request = self.create_request(
@@ -201,22 +215,22 @@ class SegmentIOTrackingTestCase(TestCase):
             content_type='application/json'
         )
         User.objects.create(pk=USER_ID, username=str(sentinel.username))
-        response = segmentio.track_segmentio_event(request)
-        self.assertEquals(response.status_code, 200)
-        self.assertTrue(self.mock_tracker.send.called)  # pylint: disable=maybe-no-member
+        segmentio.track_segmentio_event(request)
+        self.assert_events_emitted()
 
-    def test_missing_event_type(self):
+    @expect_failure_with_message(segmentio.ERROR_MISSING_NAME)
+    def test_missing_name(self):
         sample_event_raw = self.create_segmentio_event()
-        del sample_event_raw['properties']['event_type']
+        del sample_event_raw['properties']['name']
         request = self.create_request(
             data=json.dumps(sample_event_raw),
             content_type='application/json'
         )
         User.objects.create(pk=USER_ID, username=str(sentinel.username))
 
-        response = segmentio.track_segmentio_event(request)
-        self.assert_segmentio_uncommitted_response(response, segmentio.ERROR_MISSING_EVENT_TYPE, 400)
+        segmentio.track_segmentio_event(request)
 
+    @expect_failure_with_message(segmentio.ERROR_MISSING_TIMESTAMP)
     def test_missing_timestamp(self):
         sample_event_raw = self.create_event_without_fields('timestamp')
         request = self.create_request(
@@ -225,8 +239,18 @@ class SegmentIOTrackingTestCase(TestCase):
         )
         User.objects.create(pk=USER_ID, username=str(sentinel.username))
 
-        response = segmentio.track_segmentio_event(request)
-        self.assert_segmentio_uncommitted_response(response, segmentio.ERROR_MISSING_TIMESTAMP, 400)
+        segmentio.track_segmentio_event(request)
+
+    @expect_failure_with_message(segmentio.ERROR_MISSING_RECEIVED_AT)
+    def test_missing_received_at(self):
+        sample_event_raw = self.create_event_without_fields('receivedAt')
+        request = self.create_request(
+            data=json.dumps(sample_event_raw),
+            content_type='application/json'
+        )
+        User.objects.create(pk=USER_ID, username=str(sentinel.username))
+
+        segmentio.track_segmentio_event(request)
 
     def create_event_without_fields(self, *fields):
         """Create a fake event and remove some fields from it"""
@@ -238,28 +262,108 @@ class SegmentIOTrackingTestCase(TestCase):
 
         return event
 
-    def test_missing_received_at(self):
-        sample_event_raw = self.create_event_without_fields('receivedAt')
+    def test_string_user_id(self):
+        User.objects.create(pk=USER_ID, username=str(sentinel.username))
+        self.post_segmentio_event(user_id=str(USER_ID))
+        self.assert_events_emitted()
+
+    def test_hiding_failure(self):
+        sample_event_raw = self.create_event_without_fields('timestamp')
         request = self.create_request(
             data=json.dumps(sample_event_raw),
             content_type='application/json'
         )
         User.objects.create(pk=USER_ID, username=str(sentinel.username))
 
-        response = segmentio.track_segmentio_event(request)
-        self.assert_segmentio_uncommitted_response(response, segmentio.ERROR_MISSING_RECEIVED_AT, 400)
-
-    def test_string_user_id(self):
-        User.objects.create(pk=USER_ID, username=str(sentinel.username))
-        response = self.post_segmentio_event(user_id=str(USER_ID))
-        result = self.assert_segmentio_committed_response(response)
-        self.assertEquals(result['context']['user_id'], USER_ID)
-
-    def assert_segmentio_committed_response(self, response):
-        """Assert that an event was emitted"""
+        response = segmentio.segmentio_event(request)
         self.assertEquals(response.status_code, 200)
-        parsed_content = json.loads(response.content)
-        self.assertEquals(parsed_content, {'committed': True})
-        self.assertTrue(self.mock_tracker.send.called)  # pylint: disable=maybe-no-member
-        return self.mock_tracker.send.mock_calls[0][1][0]
+        self.assert_no_events_emitted()
 
+    @data(
+        ('edx.video.played', 'play_video'),
+        ('edx.video.paused', 'pause_video'),
+        ('edx.video.stopped', 'stop_video'),
+        ('edx.video.loaded', 'load_video'),
+        ('edx.video.transcript.shown', 'show_transcript'),
+        ('edx.video.transcript.hidden', 'hide_transcript'),
+    )
+    @unpack
+    def test_video_event(self, name, event_type):
+        course_id = 'foo/bar/baz'
+        middleware = TrackMiddleware()
+
+        input_payload = {
+            'current_time': 132.134456,
+            'module_id': 'i4x://foo/bar/baz/some_module',
+            'code': 'mobile'
+        }
+        if name == 'edx.video.loaded':
+            del input_payload['current_time']
+
+        request = self.create_request(
+            data=self.create_segmentio_event_json(
+                name=name,
+                data=input_payload,
+                context={
+                    'course_id': course_id,
+                    'browser_page': 'https://testserver/courses/foo/bar/baz/courseware/Week_1/Activity/2',
+                    'application': {
+                        'name': 'edx.mobileapp.android',
+                        'version': '29',
+                        'component': 'videoplayer'
+                    }
+                }),
+            content_type='application/json'
+        )
+        User.objects.create(pk=USER_ID, username=str(sentinel.username))
+
+        middleware.process_request(request)
+        try:
+            response = segmentio.segmentio_event(request)
+            self.assertEquals(response.status_code, 200)
+
+            expected_event_without_payload = {
+                'username': str(sentinel.username),
+                'ip': '',
+                'session': '',
+                'event_source': 'mobile',
+                'event_type': event_type,
+                'name': name,
+                'agent': str(sentinel.user_agent),
+                'page': 'https://testserver/courses/foo/bar/baz/courseware/Week_1/Activity',
+                'time': datetime.strptime("2014-08-27T16:33:39.215Z", "%Y-%m-%dT%H:%M:%S.%fZ"),
+                'host': 'testserver',
+                'context': {
+                    'user_id': USER_ID,
+                    'course_id': course_id,
+                    'org_id': 'foo',
+                    'path': ENDPOINT,
+                    'client': {
+                        'library': {
+                            'name': 'test-app',
+                            'version': 'unknown'
+                        }
+                    },
+                    'received_at': datetime.strptime("2014-08-27T16:33:39.100Z", "%Y-%m-%dT%H:%M:%S.%fZ"),
+                    'application': {
+                        'name': 'edx.mobileapp.android',
+                        'version': '29',
+                        'component': 'videoplayer'
+                    }
+                },
+            }
+            expected_payload = {
+                'currentTime': 132.134456,
+                'id': 'i4x-foo-bar-baz-some_module',
+                'code': 'mobile'
+            }
+            if name == 'edx.video.loaded':
+                del expected_payload['currentTime']
+        finally:
+            middleware.process_response(request, None)
+
+        actual_event = dict(self.get_event())
+        payload = json.loads(actual_event.pop('event'))
+
+        self.assertEquals(actual_event, expected_event_without_payload)
+        self.assertEquals(payload, expected_payload)
diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 2f30f634dd..0660340b41 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -1059,7 +1059,7 @@ class ImageInput(InputTypeBase):
                      self.value.strip().replace(' ', ''))
         if m:
             # Note: we subtract 15 to compensate for the size of the dot on the screen.
-            # (is a 30x30 image--lms/static/green-pointer.png).
+            # (is a 30x30 image--lms/static/images/green-pointer.png).
             (self.gx, self.gy) = [int(x) - 15 for x in m.groups()]
         else:
             (self.gx, self.gy) = (0, 0)
diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index 2e394e5e1b..00600573e7 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -715,12 +715,13 @@ class ChoiceResponse(LoncapaResponse):
         if not isinstance(student_answer, list):
             student_answer = [student_answer]
 
+        no_empty_answer = student_answer != []
         student_answer = set(student_answer)
 
         required_selected = len(self.correct_choices - student_answer) == 0
         no_extra_selected = len(student_answer - self.correct_choices) == 0
 
-        correct = required_selected & no_extra_selected
+        correct = required_selected & no_extra_selected & no_empty_answer
 
         if correct:
             return CorrectMap(self.answer_id, 'correct')
diff --git a/common/lib/capa/capa/safe_exec/tests/test_safe_exec.py b/common/lib/capa/capa/safe_exec/tests/test_safe_exec.py
index f8a8a32297..068fcea908 100644
--- a/common/lib/capa/capa/safe_exec/tests/test_safe_exec.py
+++ b/common/lib/capa/capa/safe_exec/tests/test_safe_exec.py
@@ -168,8 +168,8 @@ class TestSafeExecCaching(unittest.TestCase):
 
     def test_unicode_submission(self):
         # Check that using non-ASCII unicode does not raise an encoding error.
-        # Try several non-ASCII unicode characters
-        for code in [129, 500, 2**8 - 1, 2**16 - 1]:
+        # Try several non-ASCII unicode characters.
+        for code in [129, 500, 2 ** 8 - 1, 2 ** 16 - 1]:
             code_with_unichr = unicode("# ") + unichr(code)
             try:
                 safe_exec(code_with_unichr, {}, cache=DictCache({}))
@@ -194,7 +194,7 @@ class TestUpdateHash(unittest.TestCase):
         make them different.
 
         """
-        d1 = {k:1 for k in "abcdefghijklmnopqrstuvwxyz"}
+        d1 = {k: 1 for k in "abcdefghijklmnopqrstuvwxyz"}
         d2 = dict(d1)
         for i in xrange(10000):
             d2[i] = 1
@@ -216,8 +216,8 @@ class TestUpdateHash(unittest.TestCase):
         self.assertNotEqual(h1, hs1)
 
     def test_list_ordering(self):
-        h1 = self.hash_obj({'a': [1,2,3]})
-        h2 = self.hash_obj({'a': [3,2,1]})
+        h1 = self.hash_obj({'a': [1, 2, 3]})
+        h2 = self.hash_obj({'a': [3, 2, 1]})
         self.assertNotEqual(h1, h2)
 
     def test_dict_ordering(self):
@@ -228,8 +228,8 @@ class TestUpdateHash(unittest.TestCase):
 
     def test_deep_ordering(self):
         d1, d2 = self.equal_but_different_dicts()
-        o1 = {'a':[1, 2, [d1], 3, 4]}
-        o2 = {'a':[1, 2, [d2], 3, 4]}
+        o1 = {'a': [1, 2, [d1], 3, 4]}
+        o2 = {'a': [1, 2, [d2], 3, 4]}
         h1 = self.hash_obj(o1)
         h2 = self.hash_obj(o2)
         self.assertEqual(h1, h2)
diff --git a/common/lib/capa/capa/templates/imageinput.html b/common/lib/capa/capa/templates/imageinput.html
index 38dd42ba8d..b8e5d3aa46 100644
--- a/common/lib/capa/capa/templates/imageinput.html
+++ b/common/lib/capa/capa/templates/imageinput.html
@@ -19,7 +19,7 @@
         top: 0;"
     >
       <img
-        src="${STATIC_URL}green-pointer.png"
+        src="${STATIC_URL}images/green-pointer.png"
         id="cross_${id}"
         style="position: absolute; top: ${gy}px; left: ${gx}px;"
       />
diff --git a/common/lib/capa/capa/tests/response_xml_factory.py b/common/lib/capa/capa/tests/response_xml_factory.py
index 26c60db77d..f98704a0e3 100644
--- a/common/lib/capa/capa/tests/response_xml_factory.py
+++ b/common/lib/capa/capa/tests/response_xml_factory.py
@@ -134,9 +134,11 @@ class ResponseXMLFactory(object):
                         len(choice_names) == len(choices)
         """
         # Names of group elements
-        group_element_names = {'checkbox': 'checkboxgroup',
-                                'radio': 'radiogroup',
-                                'multiple': 'choicegroup'}
+        group_element_names = {
+            'checkbox': 'checkboxgroup',
+            'radio': 'radiogroup',
+            'multiple': 'choicegroup'
+        }
 
         # Retrieve **kwargs
         choices = kwargs.get('choices', [True])
@@ -441,7 +443,6 @@ class FormulaResponseXMLFactory(ResponseXMLFactory):
         sample_str = self._sample_str(sample_dict, num_samples, tolerance)
         response_element.set("samples", sample_str)
 
-
         # Set the tolerance
         responseparam_element = etree.SubElement(response_element, "responseparam")
         responseparam_element.set("type", "tolerance")
@@ -487,10 +488,12 @@ class FormulaResponseXMLFactory(ResponseXMLFactory):
         variables = [str(v) for v in sample_dict.keys()]
         low_range_vals = [str(f[0]) for f in sample_dict.values()]
         high_range_vals = [str(f[1]) for f in sample_dict.values()]
-        sample_str = (",".join(sample_dict.keys()) + "@" +
-                        ",".join(low_range_vals) + ":" +
-                        ",".join(high_range_vals) +
-                        "#" + str(num_samples))
+        sample_str = (
+            ",".join(sample_dict.keys()) + "@" +
+            ",".join(low_range_vals) + ":" +
+            ",".join(high_range_vals) +
+            "#" + str(num_samples)
+        )
         return sample_str
 
 
@@ -501,7 +504,6 @@ class ImageResponseXMLFactory(ResponseXMLFactory):
         """ Create the <imageresponse> element."""
         return etree.Element("imageresponse")
 
-
     def create_input_element(self, **kwargs):
         """ Create the <imageinput> element.
 
@@ -578,7 +580,7 @@ class JavascriptResponseXMLFactory(ResponseXMLFactory):
         # Both display_src and display_class given,
         # or neither given
         assert((display_src and display_class) or
-                (not display_src and not display_class))
+               (not display_src and not display_class))
 
         # Create the <javascriptresponse> element
         response_element = etree.Element("javascriptresponse")
@@ -764,7 +766,7 @@ class AnnotationResponseXMLFactory(ResponseXMLFactory):
         text_children = [
             {'tag': 'title', 'text': kwargs.get('title', 'super cool annotation')},
             {'tag': 'text', 'text': kwargs.get('text', 'texty text')},
-            {'tag': 'comment', 'text':kwargs.get('comment', 'blah blah erudite comment blah blah')},
+            {'tag': 'comment', 'text': kwargs.get('comment', 'blah blah erudite comment blah blah')},
             {'tag': 'comment_prompt', 'text': kwargs.get('comment_prompt', 'type a commentary below')},
             {'tag': 'tag_prompt', 'text': kwargs.get('tag_prompt', 'select one tag')}
         ]
@@ -772,7 +774,7 @@ class AnnotationResponseXMLFactory(ResponseXMLFactory):
         for child in text_children:
             etree.SubElement(input_element, child['tag']).text = child['text']
 
-        default_options = [('green', 'correct'),('eggs', 'incorrect'), ('ham', 'partially-correct')]
+        default_options = [('green', 'correct'), ('eggs', 'incorrect'), ('ham', 'partially-correct')]
         options = kwargs.get('options', default_options)
         options_element = etree.SubElement(input_element, 'options')
 
diff --git a/common/lib/capa/capa/tests/test_responsetypes.py b/common/lib/capa/capa/tests/test_responsetypes.py
index 77bdd640f6..c1124d187b 100644
--- a/common/lib/capa/capa/tests/test_responsetypes.py
+++ b/common/lib/capa/capa/tests/test_responsetypes.py
@@ -1075,6 +1075,17 @@ class ChoiceResponseTest(ResponseTest):
         # No choice 3 exists --> mark incorrect
         self.assert_grade(problem, 'choice_3', 'incorrect')
 
+    def test_grade_with_no_checkbox_selected(self):
+        """
+        Test that answer marked as incorrect if no checkbox selected.
+        """
+        problem = self.build_problem(
+            choice_type='checkbox', choices=[False, False, False]
+        )
+
+        correct_map = problem.grade_answers({})
+        self.assertEqual(correct_map.get_correctness('1_2_1'), 'incorrect')
+
 
 class JavascriptResponseTest(ResponseTest):
     from capa.tests.response_xml_factory import JavascriptResponseXMLFactory
diff --git a/common/lib/chem/chem/miller.py b/common/lib/chem/chem/miller.py
index 8dd47b6047..3be90117e9 100644
--- a/common/lib/chem/chem/miller.py
+++ b/common/lib/chem/chem/miller.py
@@ -96,9 +96,11 @@ def sub_miller(segments):
     '''
     fracts = [segment_to_fraction(segment) for segment in segments]
     common_denominator = reduce(lcm, [fract.denominator for fract in fracts])
-    miller = ([fract.numerator * math.fabs(common_denominator) /
-                                fract.denominator for fract in fracts])
-    return'(' + ','.join(map(str, map(decimal.Decimal, miller))) + ')'
+    miller_indices = ([
+        fract.numerator * math.fabs(common_denominator) / fract.denominator
+        for fract in fracts
+    ])
+    return'(' + ','.join(map(str, map(decimal.Decimal, miller_indices))) + ')'
 
 
 def miller(points):
@@ -145,19 +147,22 @@ def miller(points):
     O = np.array([0, 0, 0])
     P = points[0]  # point of plane
     Ccs = map(np.array, [[1.0, 0, 0], [0, 1.0, 0], [0, 0, 1.0]])
-    segments = ([np.dot(P - O, N) / np.dot(ort, N) if np.dot(ort, N) != 0 else
-                                            np.nan for ort in Ccs])
+    segments = ([
+        np.dot(P - O, N) / np.dot(ort, N) if np.dot(ort, N) != 0
+        else np.nan for ort in Ccs
+    ])
     if any(x == 0 for x in segments):  # Plane goes through origin.
-        vertices = [  # top:
-                    np.array([1.0, 1.0, 1.0]),
-                    np.array([0.0, 0.0, 1.0]),
-                    np.array([1.0, 0.0, 1.0]),
-                    np.array([0.0, 1.0, 1.0]),
-                    # bottom, except 0,0,0:
-                    np.array([1.0, 0.0, 0.0]),
-                    np.array([0.0, 1.0, 0.0]),
-                    np.array([1.0, 1.0, 1.0]),
-                ]
+        vertices = [
+            # top:
+            np.array([1.0, 1.0, 1.0]),
+            np.array([0.0, 0.0, 1.0]),
+            np.array([1.0, 0.0, 1.0]),
+            np.array([0.0, 1.0, 1.0]),
+            # bottom, except 0,0,0:
+            np.array([1.0, 0.0, 0.0]),
+            np.array([0.0, 1.0, 0.0]),
+            np.array([1.0, 1.0, 1.0]),
+        ]
         for vertex in vertices:
             if np.dot(vertex - O, N) != 0:  # vertex not in plane
                 new_origin = vertex
diff --git a/common/lib/extract_tar.py b/common/lib/extract_tar.py
index e8d7946583..ea464880ea 100644
--- a/common/lib/extract_tar.py
+++ b/common/lib/extract_tar.py
@@ -9,7 +9,8 @@ from os.path import abspath, realpath, dirname, join as joinpath
 from django.core.exceptions import SuspiciousOperation
 import logging
 
-log = logging.getLogger(__name__) # pylint: disable=C0103
+log = logging.getLogger(__name__)
+
 
 def resolved(rpath):
     """
@@ -17,12 +18,14 @@ def resolved(rpath):
     """
     return realpath(abspath(rpath))
 
+
 def _is_bad_path(path, base):
     """
     Is (the canonical absolute path of) `path` outside `base`?
     """
     return not resolved(joinpath(base, path)).startswith(base)
 
+
 def _is_bad_link(info, base):
     """
     Does the file sym- ord hard-link to files outside `base`?
@@ -31,6 +34,7 @@ def _is_bad_link(info, base):
     tip = resolved(joinpath(base, dirname(info.name)))
     return _is_bad_path(info.linkname, base=tip)
 
+
 def safemembers(members):
     """
     Check that all elements of a tar file are safe.
@@ -43,19 +47,20 @@ def safemembers(members):
             log.debug("File %r is blocked (illegal path)", finfo.name)
             raise SuspiciousOperation("Illegal path")
         elif finfo.issym() and _is_bad_link(finfo, base):
-            log.debug( "File %r is blocked: Hard link to %r", finfo.name, finfo.linkname)
+            log.debug("File %r is blocked: Hard link to %r", finfo.name, finfo.linkname)
             raise SuspiciousOperation("Hard link")
         elif finfo.islnk() and _is_bad_link(finfo, base):
             log.debug("File %r is blocked: Symlink to %r", finfo.name,
-                    finfo.linkname)
+                      finfo.linkname)
             raise SuspiciousOperation("Symlink")
         elif finfo.isdev():
             log.debug("File %r is blocked: FIFO, device or character file",
-                    finfo.name)
+                      finfo.name)
             raise SuspiciousOperation("Dev file")
 
     return members
 
+
 def safetar_extractall(tarf, *args, **kwargs):
     """
     Safe version of `tarf.extractall()`.
diff --git a/common/lib/symmath/symmath/symmath_check.py b/common/lib/symmath/symmath/symmath_check.py
index 3f09ebf659..e38da60b72 100644
--- a/common/lib/symmath/symmath/symmath_check.py
+++ b/common/lib/symmath/symmath/symmath_check.py
@@ -21,13 +21,14 @@ log = logging.getLogger(__name__)
 
 
 def symmath_check_simple(expect, ans, adict={}, symtab=None, extra_options=None):
-    '''
+    """
     Check a symbolic mathematical expression using sympy.
     The input is an ascii string (not MathML) converted to math using sympy.sympify.
-    '''
+    """
 
     options = {'__MATRIX__': False, '__ABC__': False, '__LOWER__': False}
-    if extra_options: options.update(extra_options)
+    if extra_options:
+        options.update(extra_options)
     for op in options:				# find options in expect string
         if op in expect:
             expect = expect.replace(op, '')
@@ -145,6 +146,7 @@ def make_error_message(msg):
     msg = '<div class="capa_alert">%s</div>' % msg
     return msg
 
+
 def is_within_tolerance(expected, actual, tolerance):
     if expected == 0:
         return (abs(actual) < tolerance)
@@ -158,7 +160,7 @@ def is_within_tolerance(expected, actual, tolerance):
 
 
 def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None):
-    '''
+    """
     Check a symbolic mathematical expression using sympy.
     The input may be presentation MathML.  Uses formula.
 
@@ -181,7 +183,7 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None
      -qubit - passed to my_sympify
      -imaginary - used in formla, presumably to signal to use i as sqrt(-1)?
      -numerical - force numerical comparison.
-    '''
+    """
 
     msg = ''
     # msg += '<p/>abname=%s' % abname
@@ -208,7 +210,6 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None
         msg += '<p>Error %s in parsing OUR expected answer "%s"</p>' % (err, expect)
         return {'ok': False, 'msg': make_error_message(msg)}
 
-
     ###### Sympy input #######
     # if expected answer is a number, try parsing provided answer as a number also
     try:
@@ -217,8 +218,8 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None
         fans = None
 
     # do a numerical comparison if both expected and answer are numbers
-    if (hasattr(fexpect, 'is_number') and fexpect.is_number 
-        and hasattr(fans, 'is_number') and fans.is_number):
+    if hasattr(fexpect, 'is_number') and fexpect.is_number \
+       and hasattr(fans, 'is_number') and fans.is_number:
         if is_within_tolerance(fexpect, fans, threshold):
             return {'ok': True, 'msg': msg}
         else:
@@ -236,7 +237,6 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None
         msg += '<p>You entered: %s</p>' % to_latex(fans)
         return {'ok': True, 'msg': msg}
 
-
     ###### PMathML input ######
     # convert mathml answer to formula
     try:
@@ -298,7 +298,8 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None
             return {'ok': False, 'msg': make_error_message(msg)}
         except Exception, err:
             msg += "<p>Error %s in comparing expected (a list) and your answer</p>" % str(err).replace('<', '&lt;')
-            if DEBUG: msg += "<p/><pre>%s</pre>" % traceback.format_exc()
+            if DEBUG:
+                msg += "<p/><pre>%s</pre>" % traceback.format_exc()
             return {'ok': False, 'msg': make_error_message(msg)}
 
     #diff = (fexpect-fsym).simplify()
diff --git a/common/lib/symmath/symmath/test_formula.py b/common/lib/symmath/symmath/test_formula.py
index d3f16ed6b3..c4cdca4aed 100644
--- a/common/lib/symmath/symmath/test_formula.py
+++ b/common/lib/symmath/symmath/test_formula.py
@@ -1,18 +1,18 @@
 """
 Tests of symbolic math
 """
-
-
 import unittest
 import formula
 import re
 from lxml import etree
 
+
 def stripXML(xml):
     xml = xml.replace('\n', '')
     xml = re.sub(r'\> +\<', '><', xml)
     return xml
 
+
 class FormulaTest(unittest.TestCase):
     # for readability later
     mathml_start = '<math xmlns="http://www.w3.org/1998/Math/MathML"><mstyle displaystyle="true">'
@@ -41,7 +41,6 @@ class FormulaTest(unittest.TestCase):
         # success?
         self.assertEqual(test, expected)
 
-
     def test_fix_simple_superscripts(self):
         expr = '''
 <msup>
@@ -91,7 +90,6 @@ class FormulaTest(unittest.TestCase):
         # success?
         self.assertEqual(test, expected)
 
-
     def test_fix_msubsup(self):
         expr = '''
 <msubsup>
@@ -100,7 +98,7 @@ class FormulaTest(unittest.TestCase):
   <mi>c</mi>
 </msubsup>'''
 
-        expected = '<msup><mi>a_b</mi><mi>c</mi></msup>' # which is (a_b)^c
+        expected = '<msup><mi>a_b</mi><mi>c</mi></msup>'  # which is (a_b)^c
 
         # wrap
         expr = stripXML(self.mathml_start + expr + self.mathml_end)
diff --git a/common/lib/xmodule/xmodule/assetstore/__init__.py b/common/lib/xmodule/xmodule/assetstore/__init__.py
index 63b98c7df3..c371205b1c 100644
--- a/common/lib/xmodule/xmodule/assetstore/__init__.py
+++ b/common/lib/xmodule/xmodule/assetstore/__init__.py
@@ -1,10 +1,11 @@
 """
-Classes representing asset & asset thumbnail metadata.
+Classes representing asset metadata.
 """
 
 from datetime import datetime
 import pytz
 from contracts import contract, new_contract
+from bisect import bisect_left, bisect_right
 from opaque_keys.edx.keys import CourseKey, AssetKey
 
 new_contract('AssetKey', AssetKey)
@@ -12,74 +13,70 @@ new_contract('datetime', datetime)
 new_contract('basestring', basestring)
 
 
-class IncorrectAssetIdType(Exception):
-    """
-    Raised when the asset ID passed-in to create an AssetMetadata or
-    AssetThumbnailMetadata is of the wrong type.
-    """
-    pass
-
-
 class AssetMetadata(object):
     """
     Stores the metadata associated with a particular course asset. The asset metadata gets stored
     in the modulestore.
     """
 
-    TOP_LEVEL_ATTRS = ['basename', 'internal_name', 'locked', 'contenttype', 'md5']
+    TOP_LEVEL_ATTRS = ['basename', 'internal_name', 'locked', 'contenttype', 'thumbnail', 'fields']
     EDIT_INFO_ATTRS = ['curr_version', 'prev_version', 'edited_by', 'edited_on']
     ALLOWED_ATTRS = TOP_LEVEL_ATTRS + EDIT_INFO_ATTRS
 
-    # All AssetMetadata objects should have AssetLocators with this type.
+    # Default type for AssetMetadata objects. A constant for convenience.
     ASSET_TYPE = 'asset'
 
-    @contract(asset_id='AssetKey', basename='basestring | None', internal_name='str | None', locked='bool | None', contenttype='basestring | None',
-              md5='str | None', curr_version='str | None', prev_version='str | None', edited_by='int | None', edited_on='datetime | None')
+    @contract(asset_id='AssetKey', basename='basestring|None', internal_name='basestring|None', locked='bool|None', contenttype='basestring|None',
+              fields='dict | None', curr_version='basestring|None', prev_version='basestring|None', edited_by='int|None', edited_on='datetime|None')
     def __init__(self, asset_id,
                  basename=None, internal_name=None,
-                 locked=None, contenttype=None, md5=None,
+                 locked=None, contenttype=None, thumbnail=None, fields=None,
                  curr_version=None, prev_version=None,
-                 edited_by=None, edited_on=None, field_decorator=None):
+                 edited_by=None, edited_on=None,
+                 field_decorator=None,):
         """
         Construct a AssetMetadata object.
 
         Arguments:
             asset_id (AssetKey): Key identifying this particular asset.
             basename (str): Original path to file at asset upload time.
-            internal_name (str): Name under which the file is stored internally.
+            internal_name (str): Name, url, or handle for the storage system to access the file.
             locked (bool): If True, only course participants can access the asset.
             contenttype (str): MIME type of the asset.
+            thumbnail (str): the internal_name for the thumbnail if one exists
+            fields (dict): fields to save w/ the metadata
             curr_version (str): Current version of the asset.
             prev_version (str): Previous version of the asset.
             edited_by (str): Username of last user to upload this asset.
             edited_on (datetime): Datetime of last upload of this asset.
-            field_decorator (function): used by strip_key to convert OpaqueKeys to the app's understanding
+            field_decorator (function): used by strip_key to convert OpaqueKeys to the app's understanding.
+                Not saved.
         """
-        if asset_id.asset_type != self.ASSET_TYPE:
-            raise IncorrectAssetIdType()
         self.asset_id = asset_id if field_decorator is None else field_decorator(asset_id)
         self.basename = basename  # Path w/o filename.
         self.internal_name = internal_name
         self.locked = locked
         self.contenttype = contenttype
-        self.md5 = md5
+        self.thumbnail = thumbnail
         self.curr_version = curr_version
         self.prev_version = prev_version
         self.edited_by = edited_by
         self.edited_on = edited_on or datetime.now(pytz.utc)
+        self.fields = fields or {}
 
     def __repr__(self):
         return """AssetMetadata{!r}""".format((
             self.asset_id,
             self.basename, self.internal_name,
-            self.locked, self.contenttype, self.md5,
+            self.locked, self.contenttype, self.fields,
             self.curr_version, self.prev_version,
             self.edited_by, self.edited_on
         ))
 
     def update(self, attr_dict):
         """
-        Set the attributes on the metadata. Ignore all those outside the known fields.
+        Set the attributes on the metadata. Any which are not in ALLOWED_ATTRS get put into
+        fields.
 
         Arguments:
             attr_dict: Prop, val dictionary of all attributes to set.
@@ -87,6 +84,8 @@ class AssetMetadata(object):
         for attr, val in attr_dict.iteritems():
             if attr in self.ALLOWED_ATTRS:
                 setattr(self, attr, val)
+            else:
+                self.fields[attr] = val
 
     def to_mongo(self):
         """
@@ -98,16 +97,15 @@ class AssetMetadata(object):
             'internal_name': self.internal_name,
             'locked': self.locked,
             'contenttype': self.contenttype,
-            'md5': self.md5,
-            'edit_info': {
-                'curr_version': self.curr_version,
-                'prev_version': self.prev_version,
-                'edited_by': self.edited_by,
-                'edited_on': self.edited_on
-            }
+            'thumbnail': self.thumbnail,
+            'fields': self.fields,
+            'curr_version': self.curr_version,
+            'prev_version': self.prev_version,
+            'edited_by': self.edited_by,
+            'edited_on': self.edited_on
         }
 
-    @contract(asset_doc='dict | None')
+    @contract(asset_doc='dict|None')
     def from_mongo(self, asset_doc):
         """
         Fill in all metadata fields from a MongoDB document.
@@ -120,55 +118,9 @@ class AssetMetadata(object):
         self.internal_name = asset_doc['internal_name']
         self.locked = asset_doc['locked']
         self.contenttype = asset_doc['contenttype']
-        self.md5 = asset_doc['md5']
-        edit_info = asset_doc['edit_info']
-        self.curr_version = edit_info['curr_version']
-        self.prev_version = edit_info['prev_version']
-        self.edited_by = edit_info['edited_by']
-        self.edited_on = edit_info['edited_on']
-
-
-class AssetThumbnailMetadata(object):
-    """
-    Stores the metadata associated with the thumbnail of a course asset.
-    """
-
-    # All AssetThumbnailMetadata objects should have AssetLocators with this type.
-    ASSET_TYPE = 'thumbnail'
-
-    @contract(asset_id='AssetKey', internal_name='str | unicode | None')
-    def __init__(self, asset_id, internal_name=None, field_decorator=None):
-        """
-        Construct a AssetThumbnailMetadata object.
-
-        Arguments:
-            asset_id (AssetKey): Key identifying this particular asset.
-            internal_name (str): Name under which the file is stored internally.
-        """
-        if asset_id.asset_type != self.ASSET_TYPE:
-            raise IncorrectAssetIdType()
-        self.asset_id = asset_id if field_decorator is None else field_decorator(asset_id)
-        self.internal_name = internal_name
-
-    def __repr__(self):
-        return """AssetMetadata{!r}""".format((self.asset_id, self.internal_name))
-
-    def to_mongo(self):
-        """
-        Converts metadata properties into a MongoDB-storable dict.
-        """
-        return {
-            'filename': self.asset_id.path,
-            'internal_name': self.internal_name
-        }
-
-    @contract(thumbnail_doc='dict | None')
-    def from_mongo(self, thumbnail_doc):
-        """
-        Fill in all metadata fields from a MongoDB document.
-
-        The asset_id prop is initialized upon construction only.
-        """
-        if thumbnail_doc is None:
-            return
-        self.internal_name = thumbnail_doc['internal_name']
+        self.thumbnail = asset_doc['thumbnail']
+        self.fields = asset_doc['fields']
+        self.curr_version = asset_doc['curr_version']
+        self.prev_version = asset_doc['prev_version']
+        self.edited_by = asset_doc['edited_by']
+        self.edited_on = asset_doc['edited_on']
diff --git a/common/lib/xmodule/xmodule/assetstore/assetmgr.py b/common/lib/xmodule/xmodule/assetstore/assetmgr.py
new file mode 100644
index 0000000000..601e827c77
--- /dev/null
+++ b/common/lib/xmodule/xmodule/assetstore/assetmgr.py
@@ -0,0 +1,62 @@
+"""
+Asset Manager
+
+Interface allowing course asset saving/retrieving.
+Handles:
+  - saving asset in the BlobStore -and- saving asset metadata in course modulestore.
+  - retrieving asset metadata from course modulestore -and- returning URL to asset -or- asset bytes.
+
+Phase 1: Checks to see if an asset's metadata can be found in the course's modulestore.
+    If not found, fails over to access the asset from the contentstore.
+    At first, the asset metadata will never be found, since saving isn't implemented yet.
+"""
+
+from contracts import contract, new_contract
+from opaque_keys.edx.keys import AssetKey
+from xmodule.modulestore.django import modulestore
+from xmodule.contentstore.django import contentstore
+
+
+new_contract('AssetKey', AssetKey)
+
+
+class AssetException(Exception):
+    """
+    Base exception class for all exceptions related to assets.
+    """
+    pass
+
+
+class AssetMetadataNotFound(AssetException):
+    """
+    Thrown when no asset metadata is present in the course modulestore for the particular asset requested.
+    """
+    pass
+
+
+class AssetMetadataFoundTemporary(AssetException):
+    """
+    TEMPORARY: Thrown if asset metadata is actually found in the course modulestore.
+    """
+    pass
+
+
+class AssetManager(object):
+    """
+    Manager for saving/loading course assets.
+    """
+    @staticmethod
+    @contract(asset_key='AssetKey', throw_on_not_found='bool', as_stream='bool')
+    def find(asset_key, throw_on_not_found=True, as_stream=False):
+        """
+        Finds a course asset either in the assetstore -or- in the deprecated contentstore.
+        """
+        content_md = modulestore().find_asset_metadata(asset_key)
+
+        # If found, raise an exception.
+        if content_md:
+            # For now, no asset metadata should be found in the modulestore.
+            raise AssetMetadataFoundTemporary()
+        else:
+            # If not found, load the asset via the contentstore.
+            return contentstore().find(asset_key, throw_on_not_found, as_stream)
diff --git a/common/lib/xmodule/xmodule/capa_base.py b/common/lib/xmodule/xmodule/capa_base.py
index cbbee5ecac..72fd88972b 100644
--- a/common/lib/xmodule/xmodule/capa_base.py
+++ b/common/lib/xmodule/xmodule/capa_base.py
@@ -811,7 +811,10 @@ class CapaMixin(CapaFields):
         new_answers = dict()
         for answer_id in answers:
             try:
-                new_answer = {answer_id: self.runtime.replace_urls(answers[answer_id])}
+                answer_content = self.runtime.replace_urls(answers[answer_id])
+                if self.runtime.replace_jump_to_id_urls:
+                    answer_content = self.runtime.replace_jump_to_id_urls(answer_content)
+                new_answer = {answer_id: answer_content}
             except TypeError:
                 log.debug(u'Unable to perform URL substitution on answers[%s]: %s',
                           answer_id, answers[answer_id])
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 5d66956461..3a829d37ca 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -24,6 +24,9 @@ _ = lambda text: text
 
 DEFAULT_START_DATE = datetime(2030, 1, 1, tzinfo=UTC())
 
+CATALOG_VISIBILITY_CATALOG_AND_ABOUT = "both"
+CATALOG_VISIBILITY_ABOUT = "about"
+CATALOG_VISIBILITY_NONE = "none"
 
 class StringOrDate(Date):
     def from_json(self, value):
@@ -559,6 +562,33 @@ class CourseFields(object):
                               default=False,
                               scope=Scope.settings)
 
+    course_survey_name = String(
+        display_name=_("Pre-Course Survey Name"),
+        help=_("Name of SurveyForm to display as a pre-course survey to the user."),
+        default=None,
+        scope=Scope.settings,
+        deprecated=True
+    )
+
+    course_survey_required = Boolean(
+        display_name=_("Pre-Course Survey Required"),
+        help=_("Specify whether students must complete a survey before they can view your course content. If you set this value to true, you must add a name for the survey to the Course Survey Name setting above."),
+        default=False,
+        scope=Scope.settings,
+        deprecated=True
+    )
+
+    catalog_visibility = String(
+        display_name=_("Course Visibility In Catalog"),
+        help=_("Defines the access permissions for showing the course in the course catalog. This can be set to one of three values: 'both' (show in catalog and allow access to about page), 'about' (only allow access to about page), 'none' (do not show in catalog and do not allow access to an about page)."),
+        default=CATALOG_VISIBILITY_CATALOG_AND_ABOUT,
+        scope=Scope.settings,
+        values=[
+            {"display_name": _("Both"), "value": CATALOG_VISIBILITY_CATALOG_AND_ABOUT},
+            {"display_name": _("About"), "value": CATALOG_VISIBILITY_ABOUT},
+            {"display_name": _("None"), "value": CATALOG_VISIBILITY_NONE}]
+    )
+
 class CourseDescriptor(CourseFields, SequenceDescriptor):
     module_class = SequenceModule
 
diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss
index bb31c6cebf..0da6d1d5d7 100644
--- a/common/lib/xmodule/xmodule/css/problem/edit.scss
+++ b/common/lib/xmodule/xmodule/css/problem/edit.scss
@@ -110,7 +110,7 @@
   width: 26px;
   height: 21px;
   vertical-align: middle;
-  background: url(../img/problem-editor-icons.png) no-repeat;
+  background: url(../images/problem-editor-icons.png) no-repeat;
 }
 
 .problem-editor-icon.heading1 {
diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py
index 4e736ac146..6c89d5520c 100644
--- a/common/lib/xmodule/xmodule/modulestore/__init__.py
+++ b/common/lib/xmodule/xmodule/modulestore/__init__.py
@@ -14,6 +14,8 @@ import collections
 from contextlib import contextmanager
 import functools
 import threading
+from operator import itemgetter
+from sortedcontainers import SortedListWithKey
 
 from abc import ABCMeta, abstractmethod
 from contracts import contract, new_contract
@@ -21,7 +23,7 @@ from xblock.plugin import default_select
 
 from .exceptions import InvalidLocationError, InsufficientSpecificationError
 from xmodule.errortracker import make_error_tracker
-from xmodule.assetstore import AssetMetadata, AssetThumbnailMetadata
+from xmodule.assetstore import AssetMetadata
 from opaque_keys.edx.keys import CourseKey, UsageKey, AssetKey
 from opaque_keys.edx.locations import Location  # For import backwards compatibility
 from opaque_keys import InvalidKeyError
@@ -34,7 +36,6 @@ log = logging.getLogger('edx.modulestore')
 new_contract('CourseKey', CourseKey)
 new_contract('AssetKey', AssetKey)
 new_contract('AssetMetadata', AssetMetadata)
-new_contract('AssetThumbnailMetadata', AssetThumbnailMetadata)
 
 
 class ModuleStoreEnum(object):
@@ -98,6 +99,13 @@ class ModuleStoreEnum(object):
         # user ID to use for tests that do not have a django user available
         test = -3
 
+    class SortOrder(object):
+        """
+        Values for sorting asset metadata.
+        """
+        ascending = 1
+        descending = 2
+
 
 class BulkOpsRecord(object):
     """
@@ -266,7 +274,192 @@ class BulkOperationsMixin(object):
         return self._get_bulk_ops_record(course_key, ignore_case).active
 
 
-class ModuleStoreRead(object):
+class ModuleStoreAssetInterface(object):
+    """
+    The methods for accessing assets and their metadata
+    """
+    def _find_course_assets(self, course_key):
+        """
+        Finds the persisted repr of the asset metadata not converted to AssetMetadata yet.
+        Returns the container holding a dict indexed by asset block_type whose values are a list
+        of raw metadata documents
+        """
+        raise NotImplementedError()
+
+    def _find_course_asset(self, asset_key):
+        """
+        Returns same as _find_course_assets plus the index to the given asset or None. Does not convert
+        to AssetMetadata; thus, is internal.
+
+        Arguments:
+            asset_key (AssetKey): what to look for
+
+        Returns:
+            AssetMetadata[] for all assets of the given asset_key's type, & the index of asset in list
+            (None if asset does not exist)
+        """
+        course_assets = self._find_course_assets(asset_key.course_key)
+        if course_assets is None:
+            return None, None
+
+        all_assets = SortedListWithKey([], key=itemgetter('filename'))
+        # Assets should be pre-sorted, so add them efficiently without sorting.
+        # extend() will raise a ValueError if the passed-in list is not sorted.
+        all_assets.extend(course_assets.setdefault(asset_key.block_type, []))
+        # See if this asset already exists by checking the external_filename.
+        # Studio doesn't currently support using multiple course assets with the same filename.
+        # So use the filename as the unique identifier.
+        idx = None
+        idx_left = all_assets.bisect_left({'filename': asset_key.block_id})
+        idx_right = all_assets.bisect_right({'filename': asset_key.block_id})
+        if idx_left != idx_right:
+            # Asset was found in the list.
+            idx = idx_left
+
+        return course_assets, idx
+
+    @contract(asset_key='AssetKey')
+    def find_asset_metadata(self, asset_key, **kwargs):
+        """
+        Find the metadata for a particular course asset.
+
+        Arguments:
+            asset_key (AssetKey): key containing original asset filename
+
+        Returns:
+            asset metadata (AssetMetadata) -or- None if not found
+        """
+        course_assets, asset_idx = self._find_course_asset(asset_key)
+        if asset_idx is None:
+            return None
+
+        info = asset_key.block_type
+        mdata = AssetMetadata(asset_key, asset_key.path, **kwargs)
+        all_assets = course_assets[info]
+        mdata.from_mongo(all_assets[asset_idx])
+        return mdata
+
+    @contract(course_key='CourseKey', start='int | None', maxresults='int | None', sort='tuple(str,(int,>=1,<=2))|None',)
+    def get_all_asset_metadata(self, course_key, asset_type, start=0, maxresults=-1, sort=None, **kwargs):
+        """
+        Returns a list of asset metadata for all assets of the given asset_type in the course.
+
+        Args:
+            course_key (CourseKey): course identifier
+            asset_type (str): the block_type of the assets to return
+            start (int): optional - start at this asset number. Zero-based!
+            maxresults (int): optional - return at most this many, -1 means no limit
+            sort (array): optional - None means no sort
+                (sort_by (str), sort_order (str))
+                sort_by - one of 'uploadDate' or 'displayname'
+                sort_order - one of SortOrder.ascending or SortOrder.descending
+
+        Returns:
+            List of AssetMetadata objects.
+        """
+        course_assets = self._find_course_assets(course_key)
+        if course_assets is None:
+            # If no course assets are found, return None instead of empty list
+            # to distinguish zero assets from "not able to retrieve assets".
+            return None
+
+        # Determine the proper sort - with defaults of ('displayname', SortOrder.ascending).
+        sort_field = 'filename'
+        sort_order = ModuleStoreEnum.SortOrder.ascending
+        if sort:
+            if sort[0] == 'uploadDate':
+                sort_field = 'edited_on'
+            if sort[1] == ModuleStoreEnum.SortOrder.descending:
+                sort_order = ModuleStoreEnum.SortOrder.descending
+
+        all_assets = SortedListWithKey(course_assets.get(asset_type, []), key=itemgetter(sort_field))
+        num_assets = len(all_assets)
+
+        start_idx = start
+        end_idx = min(num_assets, start + maxresults)
+        if maxresults < 0:
+            # No limit on the results.
+            end_idx = num_assets
+
+        step_incr = 1
+        if sort_order == ModuleStoreEnum.SortOrder.descending:
+            # Flip the indices and iterate backwards.
+            step_incr = -1
+            start_idx = (num_assets - 1) - start_idx
+            end_idx = (num_assets - 1) - end_idx
+
+        ret_assets = []
+        for idx in xrange(start_idx, end_idx, step_incr):
+            raw_asset = all_assets[idx]
+            new_asset = AssetMetadata(course_key.make_asset_key(asset_type, raw_asset['filename']))
+            new_asset.from_mongo(raw_asset)
+            ret_assets.append(new_asset)
+        return ret_assets
+
+
+class ModuleStoreAssetWriteInterface(ModuleStoreAssetInterface):
+    """
+    The write operations for assets and asset metadata
+    """
+    @contract(asset_metadata='AssetMetadata')
+    def save_asset_metadata(self, asset_metadata, user_id):
+        """
+        Saves the asset metadata for a particular course's asset.
+
+        Arguments:
+            asset_metadata (AssetMetadata): data about the course asset data (must have asset_id
+            set)
+
+        Returns:
+            True if metadata save was successful, else False
+        """
+        raise NotImplementedError()
+
+    def set_asset_metadata_attrs(self, asset_key, attrs, user_id):
+        """
+        Base method to over-ride in modulestore.
+        """
+        raise NotImplementedError()
+
+    def delete_asset_metadata(self, asset_key, user_id):
+        """
+        Base method to over-ride in modulestore.
+        """
+        raise NotImplementedError()
+
+    @contract(asset_key='AssetKey', attr=str)
+    def set_asset_metadata_attr(self, asset_key, attr, value, user_id):
+        """
+        Add/set the given attr on the asset at the given location. Value can be any type which pymongo accepts.
+
+        Arguments:
+            asset_key (AssetKey): asset identifier
+            attr (str): which attribute to set
+            value: the value to set it to (any type pymongo accepts such as datetime, number, string)
+
+        Raises:
+            ItemNotFoundError if no such item exists
+            AttributeError is attr is one of the build in attrs.
+        """
+        return self.set_asset_metadata_attrs(asset_key, {attr: value}, user_id)
+
+    @contract(source_course_key='CourseKey', dest_course_key='CourseKey')
+    def copy_all_asset_metadata(self, source_course_key, dest_course_key, user_id):
+        """
+        Copy all the course assets from source_course_key to dest_course_key.
+        NOTE: unlike get_all_asset_metadata, this does not take an asset type because
+        this function is intended for things like cloning or exporting courses not for
+        clients to list assets.
+
+        Arguments:
+            source_course_key (CourseKey): identifier of course to copy from
+            dest_course_key (CourseKey): identifier of course to copy to
+        """
+        pass
+
+
+# pylint: disable=abstract-method
+class ModuleStoreRead(ModuleStoreAssetInterface):
     """
     An abstract interface for a database backend that stores XModuleDescriptor
     instances and extends read-only functionality
@@ -316,18 +509,13 @@ class ModuleStoreRead(object):
         pass
 
     @abstractmethod
-    def get_items(self, location, course_id=None, depth=0, qualifiers=None, **kwargs):
+    def get_items(self, course_id, qualifiers=None, **kwargs):
         """
         Returns a list of XModuleDescriptor instances for the items
         that match location. Any element of location that is None is treated
         as a wildcard that matches any value
 
         location: Something that can be passed to Location
-
-        depth: An argument that some module stores may use to prefetch
-            descendents of the queried modules for more efficient results later
-            in the request. The depth is counted in the number of calls to
-            get_children() to cache. None indicates to cache all descendents
         """
         pass
 
@@ -382,14 +570,21 @@ class ModuleStoreRead(object):
         If target is a list, do any of the list elements meet the criteria
         If the criteria is a regex, does the target match it?
         If the criteria is a function, does invoking it on the target yield something truthy?
+        If criteria is a dict {($nin|$in): []}, then do (none|any) of the list elements meet the criteria
         Otherwise, is the target == criteria
         '''
         if isinstance(target, list):
             return any(self._value_matches(ele, criteria) for ele in target)
-        elif isinstance(criteria, re._pattern_type):
+        elif isinstance(criteria, re._pattern_type):  # pylint: disable=protected-access
             return criteria.search(target) is not None
         elif callable(criteria):
             return criteria(target)
+        elif isinstance(criteria, dict) and '$in' in criteria:
+            # note isn't handling any other things in the dict other than in
+            return any(self._value_matches(target, test_val) for test_val in criteria['$in'])
+        elif isinstance(criteria, dict) and '$nin' in criteria:
+            # note isn't handling any other things in the dict other than nin
+            return not any(self._value_matches(target, test_val) for test_val in criteria['$nin'])
         else:
             return criteria == target
 
@@ -504,7 +699,8 @@ class ModuleStoreRead(object):
         pass
 
 
-class ModuleStoreWrite(ModuleStoreRead):
+# pylint: disable=abstract-method
+class ModuleStoreWrite(ModuleStoreRead, ModuleStoreAssetWriteInterface):
     """
     An abstract interface for a database backend that stores XModuleDescriptor
     instances and extends both read and write functionality
@@ -621,12 +817,13 @@ class ModuleStoreWrite(ModuleStoreRead):
         pass
 
 
+# pylint: disable=abstract-method
 class ModuleStoreReadBase(BulkOperationsMixin, ModuleStoreRead):
     '''
     Implement interface functionality that can be shared.
     '''
-    # pylint: disable=W0613
 
+    # pylint: disable=invalid-name
     def __init__(
         self,
         contentstore=None,
@@ -643,6 +840,7 @@ class ModuleStoreReadBase(BulkOperationsMixin, ModuleStoreRead):
         '''
         super(ModuleStoreReadBase, self).__init__(**kwargs)
         self._course_errors = defaultdict(make_error_tracker)  # location -> ErrorLog
+        # pylint: disable=fixme
         # TODO move the inheritance_cache_subsystem to classes which use it
         self.metadata_inheritance_cache_subsystem = metadata_inheritance_cache_subsystem
         self.request_cache = request_cache
@@ -656,6 +854,7 @@ class ModuleStoreReadBase(BulkOperationsMixin, ModuleStoreRead):
         errors as get_item if course_key isn't present.
         """
         # check that item is present and raise the promised exceptions if needed
+        # pylint: disable=fixme
         # TODO (vshnayder): post-launch, make errors properties of items
         # self.get_item(location)
         assert(isinstance(course_key, CourseKey))
@@ -774,16 +973,13 @@ def hashvalue(arg):
         return unicode(arg)
 
 
+# pylint: disable=abstract-method
 class ModuleStoreWriteBase(ModuleStoreReadBase, ModuleStoreWrite):
     '''
     Implement interface functionality that can be shared.
     '''
     def __init__(self, contentstore, **kwargs):
         super(ModuleStoreWriteBase, self).__init__(contentstore=contentstore, **kwargs)
-
-        # TODO: Don't have a runtime just to generate the appropriate mixin classes (cpennington)
-        # This is only used by partition_fields_by_scope, which is only needed because
-        # the split mongo store is used for item creation as well as item persistence
         self.mixologist = Mixologist(self.xblock_mixins)
 
     def partition_fields_by_scope(self, category, fields):
@@ -873,276 +1069,6 @@ class ModuleStoreWriteBase(ModuleStoreReadBase, ModuleStoreWrite):
         parent.children.append(item.location)
         self.update_item(parent, user_id)
 
-    def _find_course_assets(self, course_key):
-        """
-        Base method to override.
-        """
-        raise NotImplementedError()
-
-    def _find_course_asset(self, course_key, filename, get_thumbnail=False):
-        """
-        Internal; finds or creates course asset info -and- finds existing asset (or thumbnail) metadata.
-
-        Arguments:
-            course_key (CourseKey): course identifier
-            filename (str): filename of the asset or thumbnail
-            get_thumbnail (bool): True gets thumbnail data, False gets asset data
-
-        Returns:
-            Asset info for the course, index of asset/thumbnail in list (None if asset/thumbnail does not exist)
-        """
-        course_assets = self._find_course_assets(course_key)
-
-        if get_thumbnail:
-            all_assets = course_assets['thumbnails']
-        else:
-            all_assets = course_assets['assets']
-
-        # See if this asset already exists by checking the external_filename.
-        # Studio doesn't currently support using multiple course assets with the same filename.
-        # So use the filename as the unique identifier.
-        for idx, asset in enumerate(all_assets):
-            if asset['filename'] == filename:
-                return course_assets, idx
-
-        return course_assets, None
-
-    def _save_asset_info(self, course_key, asset_metadata, user_id, thumbnail=False):
-        """
-        Base method to over-ride in modulestore.
-        """
-        raise NotImplementedError()
-
-    @contract(course_key='CourseKey', asset_metadata='AssetMetadata')
-    def save_asset_metadata(self, course_key, asset_metadata, user_id):
-        """
-        Saves the asset metadata for a particular course's asset.
-
-        Arguments:
-            course_key (CourseKey): course identifier
-            asset_metadata (AssetMetadata): data about the course asset data
-
-        Returns:
-            True if metadata save was successful, else False
-        """
-        return self._save_asset_info(course_key, asset_metadata, user_id, thumbnail=False)
-
-    @contract(course_key='CourseKey', asset_thumbnail_metadata='AssetThumbnailMetadata')
-    def save_asset_thumbnail_metadata(self, course_key, asset_thumbnail_metadata, user_id):
-        """
-        Saves the asset thumbnail metadata for a particular course asset's thumbnail.
-
-        Arguments:
-            course_key (CourseKey): course identifier
-            asset_thumbnail_metadata (AssetThumbnailMetadata): data about the course asset thumbnail
-
-        Returns:
-            True if thumbnail metadata save was successful, else False
-        """
-        return self._save_asset_info(course_key, asset_thumbnail_metadata, user_id, thumbnail=True)
-
-    @contract(asset_key='AssetKey')
-    def _find_asset_info(self, asset_key, thumbnail=False, **kwargs):
-        """
-        Find the info for a particular course asset/thumbnail.
-
-        Arguments:
-            asset_key (AssetKey): key containing original asset filename
-            thumbnail (bool): True if finding thumbnail, False if finding asset metadata
-
-        Returns:
-            asset/thumbnail metadata (AssetMetadata/AssetThumbnailMetadata) -or- None if not found
-        """
-        course_assets, asset_idx = self._find_course_asset(asset_key.course_key, asset_key.path, thumbnail)
-        if asset_idx is None:
-            return None
-
-        if thumbnail:
-            info = 'thumbnails'
-            mdata = AssetThumbnailMetadata(asset_key, asset_key.path, **kwargs)
-        else:
-            info = 'assets'
-            mdata = AssetMetadata(asset_key, asset_key.path, **kwargs)
-        all_assets = course_assets[info]
-        mdata.from_mongo(all_assets[asset_idx])
-        return mdata
-
-    @contract(asset_key='AssetKey')
-    def find_asset_metadata(self, asset_key, **kwargs):
-        """
-        Find the metadata for a particular course asset.
-
-        Arguments:
-            asset_key (AssetKey): key containing original asset filename
-
-        Returns:
-            asset metadata (AssetMetadata) -or- None if not found
-        """
-        return self._find_asset_info(asset_key, thumbnail=False, **kwargs)
-
-    @contract(asset_key='AssetKey')
-    def find_asset_thumbnail_metadata(self, asset_key, **kwargs):
-        """
-        Find the metadata for a particular course asset.
-
-        Arguments:
-            asset_key (AssetKey): key containing original asset filename
-
-        Returns:
-            asset metadata (AssetMetadata) -or- None if not found
-        """
-        return self._find_asset_info(asset_key, thumbnail=True, **kwargs)
-
-    @contract(course_key='CourseKey', start='int | None', maxresults='int | None', sort='list | None', get_thumbnails='bool')
-    def _get_all_asset_metadata(self, course_key, start=0, maxresults=-1, sort=None, get_thumbnails=False, **kwargs):
-        """
-        Returns a list of static asset (or thumbnail) metadata for a course.
-
-        Args:
-            course_key (CourseKey): course identifier
-            start (int): optional - start at this asset number
-            maxresults (int): optional - return at most this many, -1 means no limit
-            sort (array): optional - None means no sort
-                (sort_by (str), sort_order (str))
-                sort_by - one of 'uploadDate' or 'displayname'
-                sort_order - one of 'ascending' or 'descending'
-            get_thumbnails (bool): True if getting thumbnail metadata, else getting asset metadata
-
-        Returns:
-            List of AssetMetadata or AssetThumbnailMetadata objects.
-        """
-        course_assets = self._find_course_assets(course_key)
-        if course_assets is None:
-            # If no course assets are found, return None instead of empty list
-            # to distinguish zero assets from "not able to retrieve assets".
-            return None
-
-        if get_thumbnails:
-            all_assets = course_assets.get('thumbnails', [])
-        else:
-            all_assets = course_assets.get('assets', [])
-
-        # DO_NEXT: Add start/maxresults/sort functionality as part of https://openedx.atlassian.net/browse/PLAT-74
-        if start and maxresults and sort:
-            pass
-
-        ret_assets = []
-        for asset in all_assets:
-            if get_thumbnails:
-                thumb = AssetThumbnailMetadata(
-                    course_key.make_asset_key('thumbnail', asset['filename']),
-                    internal_name=asset['filename'], **kwargs
-                )
-                ret_assets.append(thumb)
-            else:
-                asset = AssetMetadata(
-                    course_key.make_asset_key('asset', asset['filename']),
-                    basename=asset['filename'],
-                    edited_on=asset['edit_info']['edited_on'],
-                    contenttype=asset['contenttype'],
-                    md5=str(asset['md5']), **kwargs
-                )
-                ret_assets.append(asset)
-        return ret_assets
-
-    @contract(course_key='CourseKey', start='int | None', maxresults='int | None', sort='list | None')
-    def get_all_asset_metadata(self, course_key, start=0, maxresults=-1, sort=None, **kwargs):
-        """
-        Returns a list of static assets for a course.
-        By default all assets are returned, but start and maxresults can be provided to limit the query.
-
-        Args:
-            course_key (CourseKey): course identifier
-            start (int): optional - start at this asset number
-            maxresults (int): optional - return at most this many, -1 means no limit
-            sort (array): optional - None means no sort
-                (sort_by (str), sort_order (str))
-                sort_by - one of 'uploadDate' or 'displayname'
-                sort_order - one of 'ascending' or 'descending'
-
-        Returns:
-            List of AssetMetadata objects.
-        """
-        return self._get_all_asset_metadata(course_key, start, maxresults, sort, get_thumbnails=False, **kwargs)
-
-    @contract(course_key='CourseKey')
-    def get_all_asset_thumbnail_metadata(self, course_key, **kwargs):
-        """
-        Returns a list of thumbnails for all course assets.
-
-        Args:
-            course_key (CourseKey): course identifier
-
-        Returns:
-            List of AssetThumbnailMetadata objects.
-        """
-        return self._get_all_asset_metadata(course_key, get_thumbnails=True, **kwargs)
-
-    def set_asset_metadata_attrs(self, asset_key, attrs, user_id):
-        """
-        Base method to over-ride in modulestore.
-        """
-        raise NotImplementedError()
-
-    def _delete_asset_data(self, asset_key, user_id, thumbnail=False):
-        """
-        Base method to over-ride in modulestore.
-        """
-        raise NotImplementedError()
-
-    @contract(asset_key='AssetKey', attr=str)
-    def set_asset_metadata_attr(self, asset_key, attr, value, user_id):
-        """
-        Add/set the given attr on the asset at the given location. Value can be any type which pymongo accepts.
-
-        Arguments:
-            asset_key (AssetKey): asset identifier
-            attr (str): which attribute to set
-            value: the value to set it to (any type pymongo accepts such as datetime, number, string)
-
-        Raises:
-            ItemNotFoundError if no such item exists
-            AttributeError is attr is one of the build in attrs.
-        """
-        return self.set_asset_metadata_attrs(asset_key, {attr: value}, user_id)
-
-    @contract(asset_key='AssetKey')
-    def delete_asset_metadata(self, asset_key, user_id):
-        """
-        Deletes a single asset's metadata.
-
-        Arguments:
-            asset_key (AssetKey): locator containing original asset filename
-
-        Returns:
-            Number of asset metadata entries deleted (0 or 1)
-        """
-        return self._delete_asset_data(asset_key, user_id, thumbnail=False)
-
-    @contract(asset_key='AssetKey')
-    def delete_asset_thumbnail_metadata(self, asset_key, user_id):
-        """
-        Deletes a single asset's metadata.
-
-        Arguments:
-            asset_key (AssetKey): locator containing original asset filename
-
-        Returns:
-            Number of asset metadata entries deleted (0 or 1)
-        """
-        return self._delete_asset_data(asset_key, user_id, thumbnail=True)
-
-    @contract(source_course_key='CourseKey', dest_course_key='CourseKey')
-    def copy_all_asset_metadata(self, source_course_key, dest_course_key, user_id):
-        """
-        Copy all the course assets from source_course_key to dest_course_key.
-
-        Arguments:
-            source_course_key (CourseKey): identifier of course to copy from
-            dest_course_key (CourseKey): identifier of course to copy to
-        """
-        pass
-
 
 def only_xmodules(identifier, entry_points):
     """Only use entry_points that are supplied by the xmodule package"""
diff --git a/common/lib/xmodule/xmodule/modulestore/inheritance.py b/common/lib/xmodule/xmodule/modulestore/inheritance.py
index 607ce2f967..97391130ef 100644
--- a/common/lib/xmodule/xmodule/modulestore/inheritance.py
+++ b/common/lib/xmodule/xmodule/modulestore/inheritance.py
@@ -158,8 +158,8 @@ class InheritanceMixin(XBlockMixin):
     default_reset_button = getattr(settings, reset_key) if hasattr(settings, reset_key) else False
     show_reset_button = Boolean(
         display_name=_("Show Reset Button for Problems"),
-        help=_("Enter true or false. If true, problems default to displaying a 'Reset' button. This value may be "
-               "overriden in each problem's settings. Existing problems whose reset setting have not been changed are affected."),
+        help=_("Enter true or false. If true, problems in the course default to always displaying a 'Reset' button. You can "
+               "override this in each problem's settings. All existing problems are affected when this course-wide setting is changed."),
         scope=Scope.settings,
         default=default_reset_button
     )
diff --git a/common/lib/xmodule/xmodule/modulestore/mixed.py b/common/lib/xmodule/xmodule/modulestore/mixed.py
index 419d7a4dfd..8fc565537b 100644
--- a/common/lib/xmodule/xmodule/modulestore/mixed.py
+++ b/common/lib/xmodule/xmodule/modulestore/mixed.py
@@ -14,7 +14,7 @@ from contracts import contract, new_contract
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey, AssetKey
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
-from xmodule.assetstore import AssetMetadata, AssetThumbnailMetadata
+from xmodule.assetstore import AssetMetadata
 
 from . import ModuleStoreWriteBase
 from . import ModuleStoreEnum
@@ -25,7 +25,6 @@ from .split_migrator import SplitMigrator
 new_contract('CourseKey', CourseKey)
 new_contract('AssetKey', AssetKey)
 new_contract('AssetMetadata', AssetMetadata)
-new_contract('AssetThumbnailMetadata', AssetThumbnailMetadata)
 
 log = logging.getLogger(__name__)
 
@@ -315,8 +314,8 @@ class MixedModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase):
         store = self._get_modulestore_for_courseid(course_key)
         return store.delete_course(course_key, user_id)
 
-    @contract(course_key='CourseKey', asset_metadata='AssetMetadata')
-    def save_asset_metadata(self, course_key, asset_metadata, user_id):
+    @contract(asset_metadata='AssetMetadata')
+    def save_asset_metadata(self, asset_metadata, user_id):
         """
         Saves the asset metadata for a particular course's asset.
 
@@ -324,20 +323,8 @@ class MixedModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase):
         course_key (CourseKey): course identifier
         asset_metadata (AssetMetadata): data about the course asset data
         """
-        store = self._get_modulestore_for_courseid(course_key)
-        return store.save_asset_metadata(course_key, asset_metadata, user_id)
-
-    @contract(course_key='CourseKey', asset_thumbnail_metadata='AssetThumbnailMetadata')
-    def save_asset_thumbnail_metadata(self, course_key, asset_thumbnail_metadata, user_id):
-        """
-        Saves the asset thumbnail metadata for a particular course asset's thumbnail.
-
-        Arguments:
-            course_key (CourseKey): course identifier
-            asset_thumbnail_metadata (AssetThumbnailMetadata): data about the course asset thumbnail
-        """
-        store = self._get_modulestore_for_courseid(course_key)
-        return store.save_asset_thumbnail_metadata(course_key, asset_thumbnail_metadata, user_id)
+        store = self._get_modulestore_for_courseid(asset_metadata.asset_id.course_key)
+        return store.save_asset_metadata(asset_metadata, user_id)
 
     @strip_key
     @contract(asset_key='AssetKey')
@@ -355,23 +342,8 @@ class MixedModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase):
         return store.find_asset_metadata(asset_key, **kwargs)
 
     @strip_key
-    @contract(asset_key='AssetKey')
-    def find_asset_thumbnail_metadata(self, asset_key, **kwargs):
-        """
-        Find the metadata for a particular course asset.
-
-        Arguments:
-            asset_key (AssetKey): key containing original asset filename
-
-        Returns:
-            asset metadata (AssetMetadata) -or- None if not found
-        """
-        store = self._get_modulestore_for_courseid(asset_key.course_key)
-        return store.find_asset_thumbnail_metadata(asset_key, **kwargs)
-
-    @strip_key
-    @contract(course_key='CourseKey', start=int, maxresults=int, sort='list | None')
-    def get_all_asset_metadata(self, course_key, start=0, maxresults=-1, sort=None, **kwargs):
+    @contract(course_key='CourseKey', start=int, maxresults=int, sort='tuple|None')
+    def get_all_asset_metadata(self, course_key, asset_type, start=0, maxresults=-1, sort=None, **kwargs):
         """
         Returns a list of static assets for a course.
         By default all assets are returned, but start and maxresults can be provided to limit the query.
@@ -394,22 +366,7 @@ class MixedModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase):
                 md5: An md5 hash of the asset content
         """
         store = self._get_modulestore_for_courseid(course_key)
-        return store.get_all_asset_metadata(course_key, start, maxresults, sort, **kwargs)
-
-    @strip_key
-    @contract(course_key='CourseKey')
-    def get_all_asset_thumbnail_metadata(self, course_key, **kwargs):
-        """
-        Returns a list of thumbnails for all course assets.
-
-        Args:
-            course_key (CourseKey): course identifier
-
-        Returns:
-            List of AssetThumbnailMetadata objects.
-        """
-        store = self._get_modulestore_for_courseid(course_key)
-        return store.get_all_asset_thumbnail_metadata(course_key, **kwargs)
+        return store.get_all_asset_metadata(course_key, asset_type, start, maxresults, sort, **kwargs)
 
     @contract(asset_key='AssetKey')
     def delete_asset_metadata(self, asset_key, user_id):
@@ -425,31 +382,6 @@ class MixedModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase):
         store = self._get_modulestore_for_courseid(asset_key.course_key)
         return store.delete_asset_metadata(asset_key, user_id)
 
-    @contract(asset_key='AssetKey')
-    def delete_asset_thumbnail_metadata(self, asset_key, user_id):
-        """
-        Deletes a single asset's metadata.
-
-        Arguments:
-            asset_key (AssetKey): locator containing original asset filename
-
-        Returns:
-            Number of asset metadata entries deleted (0 or 1)
-        """
-        store = self._get_modulestore_for_courseid(asset_key.course_key)
-        return store.delete_asset_thumbnail_metadata(asset_key, user_id)
-
-    @contract(course_key='CourseKey')
-    def delete_all_asset_metadata(self, course_key, user_id):
-        """
-        Delete all of the assets which use this course_key as an identifier.
-
-        Arguments:
-            course_key (CourseKey): course_identifier
-        """
-        store = self._get_modulestore_for_courseid(course_key)
-        return store.delete_all_asset_metadata(course_key, user_id)
-
     @contract(source_course_key='CourseKey', dest_course_key='CourseKey')
     def copy_all_asset_metadata(self, source_course_key, dest_course_key, user_id):
         """
@@ -590,6 +522,10 @@ class MixedModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase):
             )
             # the super handles assets and any other necessities
             super(MixedModuleStore, self).clone_course(source_course_id, dest_course_id, user_id, fields, **kwargs)
+        else:
+            raise NotImplementedError("No code for cloning from {} to {}".format(
+                source_modulestore, dest_modulestore
+            ))
 
     @strip_key
     def create_item(self, user_id, course_key, block_type, block_id=None, fields=None, **kwargs):
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/base.py b/common/lib/xmodule/xmodule/modulestore/mongo/base.py
index ddffb0b70f..2eb3505c9d 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo/base.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo/base.py
@@ -20,39 +20,43 @@ import re
 from uuid import uuid4
 
 from bson.son import SON
-from fs.osfs import OSFS
-from path import path
+from contracts import contract, new_contract
 from datetime import datetime
+from fs.osfs import OSFS
+from mongodb_proxy import MongoProxy, autoretry_read
+from path import path
 from pytz import UTC
 from contracts import contract, new_contract
+from operator import itemgetter
+from sortedcontainers import SortedListWithKey
 
 from importlib import import_module
-from xmodule.errortracker import null_error_tracker, exc_info_to_str
-from xmodule.mako_module import MakoDescriptorSystem
-from xmodule.error_module import ErrorDescriptor
-from xblock.runtime import KvsFieldData
-from xblock.exceptions import InvalidScopeError
-from xblock.fields import Scope, ScopeIds, Reference, ReferenceList, ReferenceValueDict
-
-from xmodule.modulestore import ModuleStoreWriteBase, ModuleStoreEnum, BulkOperationsMixin, BulkOpsRecord
-from xmodule.modulestore.draft_and_published import ModuleStoreDraftAndPublished, DIRECT_ONLY_CATEGORIES
+from opaque_keys.edx.keys import UsageKey, CourseKey, AssetKey
 from opaque_keys.edx.locations import Location
-from xmodule.modulestore.exceptions import ItemNotFoundError, DuplicateCourseError, ReferentialIntegrityError
-from xmodule.modulestore.inheritance import InheritanceMixin, inherit_metadata, InheritanceKeyValueStore
-from xblock.core import XBlock
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from opaque_keys.edx.locator import CourseLocator
-from opaque_keys.edx.keys import UsageKey, CourseKey, AssetKey
+
+from xblock.core import XBlock
+from xblock.exceptions import InvalidScopeError
+from xblock.fields import Scope, ScopeIds, Reference, ReferenceList, ReferenceValueDict
+from xblock.runtime import KvsFieldData
+
+from xmodule.assetstore import AssetMetadata
+from xmodule.error_module import ErrorDescriptor
+from xmodule.errortracker import null_error_tracker, exc_info_to_str
 from xmodule.exceptions import HeartbeatFailure
+from xmodule.mako_module import MakoDescriptorSystem
+from xmodule.modulestore import ModuleStoreWriteBase, ModuleStoreEnum, BulkOperationsMixin, BulkOpsRecord
+from xmodule.modulestore.draft_and_published import ModuleStoreDraftAndPublished, DIRECT_ONLY_CATEGORIES
 from xmodule.modulestore.edit_info import EditInfoRuntimeMixin
-from xmodule.assetstore import AssetMetadata, AssetThumbnailMetadata
+from xmodule.modulestore.exceptions import ItemNotFoundError, DuplicateCourseError, ReferentialIntegrityError
+from xmodule.modulestore.inheritance import InheritanceMixin, inherit_metadata, InheritanceKeyValueStore
 
 log = logging.getLogger(__name__)
 
 new_contract('CourseKey', CourseKey)
 new_contract('AssetKey', AssetKey)
 new_contract('AssetMetadata', AssetMetadata)
-new_contract('AssetThumbnailMetadata', AssetThumbnailMetadata)
 
 # sort order that returns DRAFT items first
 SORT_REVISION_FAVOR_DRAFT = ('_id.revision', pymongo.DESCENDING)
@@ -441,6 +445,7 @@ class MongoModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase, Mongo
                  error_tracker=null_error_tracker,
                  i18n_service=None,
                  fs_service=None,
+                 retry_wait_time=0.1,
                  **kwargs):
         """
         :param doc_store_config: must have a host, db, and collection entries. Other common entries: port, tz_aware.
@@ -454,15 +459,18 @@ class MongoModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase, Mongo
             """
             Create & open the connection, authenticate, and provide pointers to the collection
             """
-            self.database = pymongo.database.Database(
-                pymongo.MongoClient(
-                    host=host,
-                    port=port,
-                    tz_aware=tz_aware,
-                    document_class=dict,
-                    **kwargs
+            self.database = MongoProxy(
+                pymongo.database.Database(
+                    pymongo.MongoClient(
+                        host=host,
+                        port=port,
+                        tz_aware=tz_aware,
+                        document_class=dict,
+                        **kwargs
+                    ),
+                    db
                 ),
-                db
+                wait_time=retry_wait_time
             )
             self.collection = self.database[collection]
 
@@ -515,9 +523,10 @@ class MongoModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase, Mongo
         super(MongoModuleStore, self)._drop_database()
 
         connection = self.collection.database.connection
-        connection.drop_database(self.collection.database)
+        connection.drop_database(self.collection.database.proxied_object)
         connection.close()
 
+    @autoretry_read()
     def fill_in_run(self, course_key):
         """
         In mongo some course_keys are used without runs. This helper function returns
@@ -691,6 +700,7 @@ class MongoModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase, Mongo
         item['location'] = item['_id']
         del item['_id']
 
+    @autoretry_read()
     def _query_children_for_cache_children(self, course_key, items):
         """
         Generate a pymongo in query for finding the items and return the payloads
@@ -795,6 +805,7 @@ class MongoModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase, Mongo
             for item in items
         ]
 
+    @autoretry_read()
     def get_courses(self, **kwargs):
         '''
         Returns a list of course descriptors.
@@ -926,6 +937,7 @@ class MongoModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase, Mongo
             for key in ('tag', 'org', 'course', 'category', 'name', 'revision')
         ])
 
+    @autoretry_read()
     def get_items(
             self,
             course_id,
@@ -1462,27 +1474,25 @@ class MongoModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase, Mongo
 
         # Using the course_key, find or insert the course asset metadata document.
         # A single document exists per course to store the course asset metadata.
+        course_key = self.fill_in_run(course_key)
         course_assets = self.asset_collection.find_one(
             {'course_id': unicode(course_key)},
-            fields=('course_id', 'storage', 'assets', 'thumbnails')
         )
 
         if course_assets is None:
             # Not found, so create.
-            course_assets = {'course_id': unicode(course_key), 'storage': 'FILLMEIN-TMP', 'assets': [], 'thumbnails': []}
+            course_assets = {'course_id': unicode(course_key), 'storage': 'FILLMEIN-TMP', 'assets': []}
             course_assets['_id'] = self.asset_collection.insert(course_assets)
 
         return course_assets
 
-    @contract(course_key='CourseKey', asset_metadata='AssetMetadata | AssetThumbnailMetadata')
-    def _save_asset_info(self, course_key, asset_metadata, user_id, thumbnail=False):
+    @contract(asset_metadata='AssetMetadata')
+    def save_asset_metadata(self, asset_metadata, user_id):
         """
-        Saves the info for a particular course's asset/thumbnail.
+        Saves the info for a particular course's asset.
 
         Arguments:
-            course_key (CourseKey): course identifier
-            asset_metadata (AssetMetadata/AssetThumbnailMetadata): data about the course asset/thumbnail
-            thumbnail (bool): True if saving thumbnail metadata, False if saving asset metadata
+            asset_metadata (AssetMetadata): data about the course asset
 
         Returns:
             True if info save was successful, else False
@@ -1490,28 +1500,49 @@ class MongoModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase, Mongo
         if self.asset_collection is None:
             return False
 
-        course_assets, asset_idx = self._find_course_asset(course_key, asset_metadata.asset_id.path, thumbnail)
-        info = 'thumbnails' if thumbnail else 'assets'
-        all_assets = course_assets[info]
-
-        # Set the edited information for assets only - not thumbnails.
-        if not thumbnail:
-            asset_metadata.update({'edited_by': user_id, 'edited_on': datetime.now(UTC)})
+        course_assets, asset_idx = self._find_course_asset(asset_metadata.asset_id)
+        all_assets = SortedListWithKey([], key=itemgetter('filename'))
+        # Assets should be pre-sorted, so add them efficiently without sorting.
+        # extend() will raise a ValueError if the passed-in list is not sorted.
+        all_assets.extend(course_assets[asset_metadata.asset_id.block_type])
+        asset_metadata.update({'edited_by': user_id, 'edited_on': datetime.now(UTC)})
 
         # Translate metadata to Mongo format.
         metadata_to_insert = asset_metadata.to_mongo()
         if asset_idx is None:
-            # Append new metadata.
-            # Future optimization: Insert in order & binary search to retrieve.
-            all_assets.append(metadata_to_insert)
+            # Add new metadata sorted into the list.
+            all_assets.add(metadata_to_insert)
         else:
             # Replace existing metadata.
             all_assets[asset_idx] = metadata_to_insert
 
         # Update the document.
-        self.asset_collection.update({'_id': course_assets['_id']}, {'$set': {info: all_assets}})
+        self.asset_collection.update(
+            {'_id': course_assets['_id']},
+            {'$set': {asset_metadata.asset_id.block_type: all_assets.as_list()}}
+        )
         return True
 
+    @contract(source_course_key='CourseKey', dest_course_key='CourseKey')
+    def copy_all_asset_metadata(self, source_course_key, dest_course_key, user_id):
+        """
+        Copy all the course assets from source_course_key to dest_course_key.
+        If dest_course already has assets, this removes the previous value.
+        It doesn't combine the assets in dest.
+
+        Arguments:
+            source_course_key (CourseKey): identifier of course to copy from
+            dest_course_key (CourseKey): identifier of course to copy to
+        """
+        source_assets = self._find_course_assets(source_course_key)
+        dest_assets = source_assets.copy()
+        dest_assets['course_id'] = unicode(dest_course_key)
+        del dest_assets['_id']
+
+        self.asset_collection.remove({'course_id': unicode(dest_course_key)})
+        # Update the document.
+        self.asset_collection.insert(dest_assets)
+
     @contract(asset_key='AssetKey', attr_dict=dict)
     def set_asset_metadata_attrs(self, asset_key, attr_dict, user_id):
         """
@@ -1528,12 +1559,12 @@ class MongoModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase, Mongo
         if self.asset_collection is None:
             return
 
-        course_assets, asset_idx = self._find_course_asset(asset_key.course_key, asset_key.path)
+        course_assets, asset_idx = self._find_course_asset(asset_key)
         if asset_idx is None:
             raise ItemNotFoundError(asset_key)
 
         # Form an AssetMetadata.
-        all_assets = course_assets['assets']
+        all_assets = course_assets[asset_key.block_type]
         md = AssetMetadata(asset_key, asset_key.path)
         md.from_mongo(all_assets[asset_idx])
         md.update(attr_dict)
@@ -1541,34 +1572,34 @@ class MongoModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase, Mongo
         # Generate a Mongo doc from the metadata and update the course asset info.
         all_assets[asset_idx] = md.to_mongo()
 
-        self.asset_collection.update({'_id': course_assets['_id']}, {"$set": {'assets': all_assets}})
+        self.asset_collection.update({'_id': course_assets['_id']}, {"$set": {asset_key.block_type: all_assets}})
 
     @contract(asset_key='AssetKey')
-    def _delete_asset_data(self, asset_key, user_id, thumbnail=False):
+    def delete_asset_metadata(self, asset_key, user_id):
         """
-        Internal; deletes a single asset's metadata -or- thumbnail.
+        Internal; deletes a single asset's metadata.
 
         Arguments:
-            asset_key (AssetKey): key containing original asset/thumbnail filename
-            thumbnail: True if thumbnail deletion, False if asset metadata deletion
+            asset_key (AssetKey): key containing original asset filename
 
         Returns:
-            Number of asset metadata/thumbnail entries deleted (0 or 1)
+            Number of asset metadata entries deleted (0 or 1)
         """
         if self.asset_collection is None:
             return 0
 
-        course_assets, asset_idx = self._find_course_asset(asset_key.course_key, asset_key.path, get_thumbnail=thumbnail)
+        course_assets, asset_idx = self._find_course_asset(asset_key)
         if asset_idx is None:
             return 0
 
-        info = 'thumbnails' if thumbnail else 'assets'
-
-        all_asset_info = course_assets[info]
+        all_asset_info = course_assets[asset_key.block_type]
         all_asset_info.pop(asset_idx)
 
         # Update the document.
-        self.asset_collection.update({'_id': course_assets['_id']}, {'$set': {info: all_asset_info}})
+        self.asset_collection.update(
+            {'_id': course_assets['_id']},
+            {'$set': {asset_key.block_type: all_asset_info}}
+        )
         return 1
 
     # pylint: disable=unused-argument
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/draft.py b/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
index cc904f5f6a..4f2c1360df 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
@@ -155,6 +155,7 @@ class DraftModuleStore(MongoModuleStore):
         # delete all of the db records for the course
         course_query = self._course_key_to_son(course_key)
         self.collection.remove(course_query, multi=True)
+        self.delete_all_asset_metadata(course_key, user_id)
 
     def clone_course(self, source_course_id, dest_course_id, user_id, fields=None, **kwargs):
         """
diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py
index b28e3f77a6..027e8c8a93 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py
@@ -2,6 +2,7 @@
 Segregation of pymongo functions from the data modeling mechanisms for split modulestore.
 """
 import re
+from mongodb_proxy import autoretry_read, MongoProxy
 import pymongo
 import time
 
@@ -68,50 +69,28 @@ def structure_to_mongo(structure):
     return new_structure
 
 
-def autoretry_read(wait=0.1, retries=5):
-    """
-    Automatically retry a read-only method in the case of a pymongo
-    AutoReconnect exception.
-
-    See http://emptysqua.re/blog/save-the-monkey-reliably-writing-to-mongodb/
-    for a discussion of this technique.
-    """
-    def decorate(fn):
-        @wraps(fn)
-        def wrapper(*args, **kwargs):
-            for attempt in xrange(retries):
-                try:
-                    return fn(*args, **kwargs)
-                    break
-                except AutoReconnect:
-                    # Reraise if we failed on our last attempt
-                    if attempt == retries - 1:
-                        raise
-
-                    if wait:
-                        time.sleep(wait)
-        return wrapper
-    return decorate
-
-
 class MongoConnection(object):
     """
     Segregation of pymongo functions from the data modeling mechanisms for split modulestore.
     """
     def __init__(
-        self, db, collection, host, port=27017, tz_aware=True, user=None, password=None, asset_collection=None, **kwargs
+        self, db, collection, host, port=27017, tz_aware=True, user=None, password=None,
+        asset_collection=None, retry_wait_time=0.1, **kwargs
     ):
         """
         Create & open the connection, authenticate, and provide pointers to the collections
         """
-        self.database = pymongo.database.Database(
-            pymongo.MongoClient(
-                host=host,
-                port=port,
-                tz_aware=tz_aware,
-                **kwargs
+        self.database = MongoProxy(
+            pymongo.database.Database(
+                pymongo.MongoClient(
+                    host=host,
+                    port=port,
+                    tz_aware=tz_aware,
+                    **kwargs
+                ),
+                db
             ),
-            db
+            wait_time=retry_wait_time
         )
 
         # Remove when adding official Split support for asset metadata storage.
@@ -142,7 +121,6 @@ class MongoConnection(object):
         else:
             raise HeartbeatFailure("Can't connect to {}".format(self.database.name))
 
-    @autoretry_read()
     def get_structure(self, key):
         """
         Get the structure from the persistence mechanism whose id is the given key
@@ -195,7 +173,6 @@ class MongoConnection(object):
         """
         self.structures.insert(structure_to_mongo(structure))
 
-    @autoretry_read()
     def get_course_index(self, key, ignore_case=False):
         """
         Get the course_index from the persistence mechanism whose id is the given key
@@ -212,7 +189,6 @@ class MongoConnection(object):
             }
         return self.course_index.find_one(query)
 
-    @autoretry_read()
     def find_matching_course_indexes(self, branch=None, search_targets=None):
         """
         Find the course_index matching particular conditions.
@@ -271,14 +247,12 @@ class MongoConnection(object):
             'run': course_index['run'],
         })
 
-    @autoretry_read()
     def get_definition(self, key):
         """
         Get the definition from the persistence mechanism whose id is the given key
         """
         return self.definitions.find_one({'_id': key})
 
-    @autoretry_read()
     def get_definitions(self, definitions):
         """
         Retrieve all definitions listed in `definitions`.
diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
index f8888b960c..0b3882ede0 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
@@ -56,6 +56,7 @@ import datetime
 import logging
 from contracts import contract, new_contract
 from importlib import import_module
+from mongodb_proxy import autoretry_read
 from path import path
 from pytz import UTC
 from bson.objectid import ObjectId
@@ -775,6 +776,7 @@ class SplitMongoModuleStore(SplitBulkWriteMixin, ModuleStoreWriteBase):
         # add it in the envelope for the structure.
         return CourseEnvelope(course_key.replace(version_guid=version_guid), entry)
 
+    @autoretry_read()
     def get_courses(self, branch, **kwargs):
         '''
         Returns a list of course descriptors matching any given qualifiers.
@@ -2125,26 +2127,30 @@ class SplitMongoModuleStore(SplitBulkWriteMixin, ModuleStoreWriteBase):
         """
         Split specific lookup
         """
-        return self._lookup_course(course_key).structure
+        return self._lookup_course(course_key).structure.get('assets', {})
 
-    def _find_course_asset(self, course_key, filename, get_thumbnail=False):
-        structure = self._lookup_course(course_key).structure
-        return structure, self._lookup_course_asset(structure, filename, get_thumbnail)
+    def _find_course_asset(self, asset_key):
+        """
+        Return the raw dict of assets type as well as the index to the one being sought from w/in
+        it's subvalue (or None)
+        """
+        assets = self._lookup_course(asset_key.course_key).structure.get('assets', {})
+        return assets, self._lookup_course_asset(assets, asset_key)
 
-    def _lookup_course_asset(self, structure, filename, get_thumbnail=False):
+    def _lookup_course_asset(self, structure, asset_key):
         """
         Find the course asset in the structure or return None if it does not exist
         """
         # See if this asset already exists by checking the external_filename.
         # Studio doesn't currently support using multiple course assets with the same filename.
         # So use the filename as the unique identifier.
-        accessor = 'thumbnails' if get_thumbnail else 'assets'
-        for idx, asset in enumerate(structure.get(accessor, [])):
-            if asset['filename'] == filename:
+        accessor = asset_key.block_type
+        for idx, asset in enumerate(structure.setdefault(accessor, [])):
+            if asset['filename'] == asset_key.block_id:
                 return idx
         return None
 
-    def _update_course_assets(self, user_id, asset_key, update_function, get_thumbnail=False):
+    def _update_course_assets(self, user_id, asset_key, update_function):
         """
         A wrapper for functions wanting to manipulate assets. Gets and versions the structure,
         passes the mutable array for either 'assets' or 'thumbnails' as well as the idx to the function for it to
@@ -2158,10 +2164,11 @@ class SplitMongoModuleStore(SplitBulkWriteMixin, ModuleStoreWriteBase):
             index_entry = self._get_index_if_valid(asset_key.course_key)
             new_structure = self.version_structure(asset_key.course_key, original_structure, user_id)
 
-            accessor = 'thumbnails' if get_thumbnail else 'assets'
-            asset_idx = self._lookup_course_asset(new_structure, asset_key.path, get_thumbnail)
+            asset_idx = self._lookup_course_asset(new_structure.setdefault('assets', {}), asset_key)
 
-            new_structure[accessor] = update_function(new_structure.get(accessor, []), asset_idx)
+            new_structure['assets'][asset_key.block_type] = update_function(
+                new_structure['assets'][asset_key.block_type], asset_idx
+            )
 
             # update index if appropriate and structures
             self.update_structure(asset_key.course_key, new_structure)
@@ -2170,7 +2177,7 @@ class SplitMongoModuleStore(SplitBulkWriteMixin, ModuleStoreWriteBase):
                 # update the index entry if appropriate
                 self._update_head(asset_key.course_key, index_entry, asset_key.branch, new_structure['_id'])
 
-    def _save_asset_info(self, course_key, asset_metadata, user_id, thumbnail=False):
+    def save_asset_metadata(self, asset_metadata, user_id):
         """
         The guts of saving a new or updated asset
         """
@@ -2186,7 +2193,7 @@ class SplitMongoModuleStore(SplitBulkWriteMixin, ModuleStoreWriteBase):
                 all_assets[asset_idx] = metadata_to_insert
             return all_assets
 
-        return self._update_course_assets(user_id, asset_metadata.asset_id, _internal_method, thumbnail)
+        return self._update_course_assets(user_id, asset_metadata.asset_id, _internal_method)
 
     @contract(asset_key='AssetKey', attr_dict=dict)
     def set_asset_metadata_attrs(self, asset_key, attr_dict, user_id):
@@ -2217,19 +2224,18 @@ class SplitMongoModuleStore(SplitBulkWriteMixin, ModuleStoreWriteBase):
             all_assets[asset_idx] = mdata.to_mongo()
             return all_assets
 
-        self._update_course_assets(user_id, asset_key, _internal_method, False)
+        self._update_course_assets(user_id, asset_key, _internal_method)
 
     @contract(asset_key='AssetKey')
-    def _delete_asset_data(self, asset_key, user_id, thumbnail=False):
+    def delete_asset_metadata(self, asset_key, user_id):
         """
-        Internal; deletes a single asset's metadata -or- thumbnail.
+        Internal; deletes a single asset's metadata.
 
         Arguments:
-            asset_key (AssetKey): key containing original asset/thumbnail filename
-            thumbnail: True if thumbnail deletion, False if asset metadata deletion
+            asset_key (AssetKey): key containing original asset filename
 
         Returns:
-            Number of asset metadata/thumbnail entries deleted (0 or 1)
+            Number of asset metadata entries deleted (0 or 1)
         """
         def _internal_method(all_asset_info, asset_idx):
             """
@@ -2242,34 +2248,11 @@ class SplitMongoModuleStore(SplitBulkWriteMixin, ModuleStoreWriteBase):
             return all_asset_info
 
         try:
-            self._update_course_assets(user_id, asset_key, _internal_method, thumbnail)
+            self._update_course_assets(user_id, asset_key, _internal_method)
             return 1
         except ItemNotFoundError:
             return 0
 
-    @contract(course_key='CourseKey')
-    def delete_all_asset_metadata(self, course_key, user_id):
-        """
-        Delete all of the assets which use this course_key as an identifier.
-
-        Arguments:
-            course_key (CourseKey): course_identifier
-        """
-        with self.bulk_operations(course_key):
-            original_structure = self._lookup_course(course_key).structure
-            index_entry = self._get_index_if_valid(course_key)
-            new_structure = self.version_structure(course_key, original_structure, user_id)
-
-            new_structure['assets'] = []
-            new_structure['thumbnails'] = []
-
-            # update index if appropriate and structures
-            self.update_structure(course_key, new_structure)
-
-            if index_entry is not None:
-                # update the index entry if appropriate
-                self._update_head(course_key, index_entry, course_key.branch, new_structure['_id'])
-
     @contract(source_course_key='CourseKey', dest_course_key='CourseKey')
     def copy_all_asset_metadata(self, source_course_key, dest_course_key, user_id):
         """
@@ -2650,6 +2633,7 @@ class SplitMongoModuleStore(SplitBulkWriteMixin, ModuleStoreWriteBase):
         """
         structure['blocks'][block_key] = content
 
+    @autoretry_read()
     def find_courses_by_search_target(self, field_name, field_value):
         """
         Find all the courses which cached that they have the given field with the given value.
diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
index 034f65a32f..6c277f5618 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
@@ -11,6 +11,7 @@ from xmodule.modulestore.draft_and_published import (
 )
 from opaque_keys.edx.locator import CourseLocator
 from xmodule.modulestore.split_mongo import BlockKey
+from contracts import contract
 
 
 class DraftVersioningModuleStore(SplitMongoModuleStore, ModuleStoreDraftAndPublished):
@@ -446,33 +447,34 @@ class DraftVersioningModuleStore(SplitMongoModuleStore, ModuleStoreDraftAndPubli
             setattr(xblock, '_published_by', published_block['edit_info']['edited_by'])
             setattr(xblock, '_published_on', published_block['edit_info']['edited_on'])
 
-    def _find_asset_info(self, asset_key, thumbnail=False, **kwargs):
-        return super(DraftVersioningModuleStore, self)._find_asset_info(
-            self._map_revision_to_branch(asset_key), thumbnail, **kwargs
+    @contract(asset_key='AssetKey')
+    def find_asset_metadata(self, asset_key, **kwargs):
+        return super(DraftVersioningModuleStore, self).find_asset_metadata(
+            self._map_revision_to_branch(asset_key), **kwargs
         )
 
-    def _get_all_asset_metadata(self, course_key, start=0, maxresults=-1, sort=None, get_thumbnails=False, **kwargs):
-        return super(DraftVersioningModuleStore, self)._get_all_asset_metadata(
-            self._map_revision_to_branch(course_key), start, maxresults, sort, get_thumbnails, **kwargs
+    def get_all_asset_metadata(self, course_key, asset_type, start=0, maxresults=-1, sort=None, **kwargs):
+        return super(DraftVersioningModuleStore, self).get_all_asset_metadata(
+            self._map_revision_to_branch(course_key), asset_type, start, maxresults, sort, **kwargs
         )
 
-    def _update_course_assets(self, user_id, asset_key, update_function, get_thumbnail=False):
+    def _update_course_assets(self, user_id, asset_key, update_function):
         """
         Updates both the published and draft branches
         """
         # if one call gets an exception, don't do the other call but pass on the exception
         super(DraftVersioningModuleStore, self)._update_course_assets(
             user_id, self._map_revision_to_branch(asset_key, ModuleStoreEnum.RevisionOption.published_only),
-            update_function, get_thumbnail
+            update_function
         )
         super(DraftVersioningModuleStore, self)._update_course_assets(
             user_id, self._map_revision_to_branch(asset_key, ModuleStoreEnum.RevisionOption.draft_only),
-            update_function, get_thumbnail
+            update_function
         )
 
-    def _find_course_asset(self, course_key, filename, get_thumbnail=False):
+    def _find_course_asset(self, asset_key):
         return super(DraftVersioningModuleStore, self)._find_course_asset(
-            self._map_revision_to_branch(course_key), filename, get_thumbnail=get_thumbnail
+            self._map_revision_to_branch(asset_key)
         )
 
     def _find_course_assets(self, course_key):
@@ -483,17 +485,6 @@ class DraftVersioningModuleStore(SplitMongoModuleStore, ModuleStoreDraftAndPubli
             self._map_revision_to_branch(course_key)
         )
 
-    def delete_all_asset_metadata(self, course_key, user_id):
-        """
-        Deletes from both branches
-        """
-        super(DraftVersioningModuleStore, self).delete_all_asset_metadata(
-            self._map_revision_to_branch(course_key, ModuleStoreEnum.RevisionOption.published_only), user_id
-        )
-        super(DraftVersioningModuleStore, self).delete_all_asset_metadata(
-            self._map_revision_to_branch(course_key, ModuleStoreEnum.RevisionOption.draft_only), user_id
-        )
-
     def copy_all_asset_metadata(self, source_course_key, dest_course_key, user_id):
         """
         Copies to and from both branches
diff --git a/common/lib/xmodule/xmodule/modulestore/store_utilities.py b/common/lib/xmodule/xmodule/modulestore/store_utilities.py
index 4b6f7716d6..872c3e5b12 100644
--- a/common/lib/xmodule/xmodule/modulestore/store_utilities.py
+++ b/common/lib/xmodule/xmodule/modulestore/store_utilities.py
@@ -1,5 +1,6 @@
 import re
 import logging
+from collections import namedtuple
 
 import uuid
 
@@ -71,3 +72,30 @@ def rewrite_nonportable_content_links(source_course_id, dest_course_id, text):
             logging.warning("Error producing regex substitution %r for text = %r.\n\nError msg = %s", source_course_id, text, str(exc))
 
     return text
+
+
+def draft_node_constructor(module, url, parent_url, location=None, parent_location=None, index=None):
+    """
+    Contructs a draft_node namedtuple with defaults.
+    """
+    draft_node = namedtuple('draft_node', ['module', 'location', 'url', 'parent_location', 'parent_url', 'index'])
+    return draft_node(module, location, url, parent_location, parent_url, index)
+
+
+def get_draft_subtree_roots(draft_nodes):
+    """
+    Takes a list of draft_nodes, which are namedtuples, each of which identify
+    itself and its parent.
+
+    If a draft_node is in `draft_nodes`, then we expect for all its children
+    should be in `draft_nodes` as well. Since `_import_draft` is recursive,
+    we only want to import the roots of any draft subtrees contained in
+    `draft_nodes`.
+
+    This generator yields those roots.
+    """
+    urls = [draft_node.url for draft_node in draft_nodes]
+
+    for draft_node in draft_nodes:
+        if draft_node.parent_url not in urls:
+            yield draft_node
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py b/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
index 8208ef588c..bac06d756e 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
@@ -116,7 +116,7 @@ def split_mongo_store_config(data_dir):
     return store
 
 
-def xml_store_config(data_dir):
+def xml_store_config(data_dir, course_dirs=None):
     """
     Defines default module store using XMLModuleStore.
     """
@@ -127,6 +127,7 @@ def xml_store_config(data_dir):
             'OPTIONS': {
                 'data_dir': data_dir,
                 'default_class': 'xmodule.hidden_module.HiddenDescriptor',
+                'course_dirs': course_dirs,
             }
         }
     }
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_assetstore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_assetstore.py
index 79f3b84c11..686b8e7687 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_assetstore.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_assetstore.py
@@ -7,12 +7,12 @@ import pytz
 import unittest
 import ddt
 
-from xmodule.assetstore import AssetMetadata, AssetThumbnailMetadata
+from xmodule.assetstore import AssetMetadata
 from xmodule.modulestore import ModuleStoreEnum
 
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.modulestore.tests.test_cross_modulestore_import_export import (
-    MODULESTORE_SETUPS, MongoContentstoreBuilder,
+    MODULESTORE_SETUPS, MongoContentstoreBuilder, XmlModulestoreBuilder, MixedModulestoreBuilder, MongoModulestoreBuilder
 )
 
 
@@ -46,105 +46,51 @@ class TestMongoAssetMetadataStorage(unittest.TestCase):
         """
         Make a single test asset metadata.
         """
-        return AssetMetadata(asset_loc, internal_name='EKMND332DDBK',
-                             basename='pictures/historical', contenttype='image/jpeg',
-                             locked=False, md5='77631ca4f0e08419b70726a447333ab6',
-                             edited_by=ModuleStoreEnum.UserID.test, edited_on=datetime.now(pytz.utc),
-                             curr_version='v1.0', prev_version='v0.95')
+        return AssetMetadata(
+            asset_loc, internal_name='EKMND332DDBK',
+            basename='pictures/historical', contenttype='image/jpeg',
+            locked=False, fields={'md5': '77631ca4f0e08419b70726a447333ab6'},
+            edited_by=ModuleStoreEnum.UserID.test, edited_on=datetime.now(pytz.utc),
+            curr_version='v1.0', prev_version='v0.95'
+        )
 
-    def _make_asset_thumbnail_metadata(self, asset_key):
+    def _make_asset_thumbnail_metadata(self, asset_md):
         """
-        Make a single test asset thumbnail metadata.
+        Add thumbnail to the asset_md
         """
-        return AssetThumbnailMetadata(asset_key, internal_name='ABC39XJUDN2')
+        asset_md.thumbnail = 'ABC39XJUDN2'
+        return asset_md
 
     def setup_assets(self, course1_key, course2_key, store=None):
         """
         Setup assets. Save in store if given
         """
         asset_fields = ('filename', 'internal_name', 'basename', 'locked', 'edited_by', 'edited_on', 'curr_version', 'prev_version')
-        asset1_vals = ('pic1.jpg', 'EKMND332DDBK', 'pix/archive', False, ModuleStoreEnum.UserID.test, datetime.now(pytz.utc), '14', '13')
-        asset2_vals = ('shout.ogg', 'KFMDONSKF39K', 'sounds', True, ModuleStoreEnum.UserID.test, datetime.now(pytz.utc), '1', None)
-        asset3_vals = ('code.tgz', 'ZZB2333YBDMW', 'exercises/14', False, ModuleStoreEnum.UserID.test * 2, datetime.now(pytz.utc), 'AB', 'AA')
-        asset4_vals = ('dog.png', 'PUPY4242X', 'pictures/animals', True, ModuleStoreEnum.UserID.test * 3, datetime.now(pytz.utc), '5', '4')
-        asset5_vals = ('not_here.txt', 'JJJCCC747', '/dev/null', False, ModuleStoreEnum.UserID.test * 4, datetime.now(pytz.utc), '50', '49')
+        all_asset_data = (
+            ('pic1.jpg', 'EKMND332DDBK', 'pix/archive', False, ModuleStoreEnum.UserID.test, datetime.now(pytz.utc), '14', '13'),
+            ('shout.ogg', 'KFMDONSKF39K', 'sounds', True, ModuleStoreEnum.UserID.test, datetime.now(pytz.utc), '1', None),
+            ('code.tgz', 'ZZB2333YBDMW', 'exercises/14', False, ModuleStoreEnum.UserID.test * 2, datetime.now(pytz.utc), 'AB', 'AA'),
+            ('dog.png', 'PUPY4242X', 'pictures/animals', True, ModuleStoreEnum.UserID.test * 3, datetime.now(pytz.utc), '5', '4'),
+            ('not_here.txt', 'JJJCCC747', '/dev/null', False, ModuleStoreEnum.UserID.test * 4, datetime.now(pytz.utc), '50', '49'),
+            ('asset.txt', 'JJJCCC747858', '/dev/null', False, ModuleStoreEnum.UserID.test * 4, datetime.now(pytz.utc), '50', '49'),
+            ('roman_history.pdf', 'JASDUNSADK', 'texts/italy', True, ModuleStoreEnum.UserID.test * 7, datetime.now(pytz.utc), '1.1', '1.01'),
+            ('weather_patterns.bmp', '928SJXX2EB', 'science', False, ModuleStoreEnum.UserID.test * 8, datetime.now(pytz.utc), '52', '51'),
+            ('demo.swf', 'DFDFGGGG14', 'demos/easy', False, ModuleStoreEnum.UserID.test * 9, datetime.now(pytz.utc), '5', '4'),
+        )
 
-        asset1 = dict(zip(asset_fields[1:], asset1_vals[1:]))
-        asset2 = dict(zip(asset_fields[1:], asset2_vals[1:]))
-        asset3 = dict(zip(asset_fields[1:], asset3_vals[1:]))
-        asset4 = dict(zip(asset_fields[1:], asset4_vals[1:]))
-        non_existent_asset = dict(zip(asset_fields[1:], asset5_vals[1:]))
-
-        # Asset6 and thumbnail6 have equivalent information on purpose.
-        asset6_vals = ('asset.txt', 'JJJCCC747858', '/dev/null', False, ModuleStoreEnum.UserID.test * 4, datetime.now(pytz.utc), '50', '49')
-        asset6 = dict(zip(asset_fields[1:], asset6_vals[1:]))
-
-        asset1_key = course1_key.make_asset_key('asset', asset1_vals[0])
-        asset2_key = course1_key.make_asset_key('asset', asset2_vals[0])
-        asset3_key = course2_key.make_asset_key('asset', asset3_vals[0])
-        asset4_key = course2_key.make_asset_key('asset', asset4_vals[0])
-        asset5_key = course2_key.make_asset_key('asset', asset5_vals[0])
-        asset6_key = course2_key.make_asset_key('asset', asset6_vals[0])
-
-        asset1_md = AssetMetadata(asset1_key, **asset1)
-        asset2_md = AssetMetadata(asset2_key, **asset2)
-        asset3_md = AssetMetadata(asset3_key, **asset3)
-        asset4_md = AssetMetadata(asset4_key, **asset4)
-        asset5_md = AssetMetadata(asset5_key, **non_existent_asset)
-        asset6_md = AssetMetadata(asset6_key, **asset6)
-
-        if store is not None:
-            store.save_asset_metadata(course1_key, asset1_md, ModuleStoreEnum.UserID.test)
-            store.save_asset_metadata(course1_key, asset2_md, ModuleStoreEnum.UserID.test)
-            store.save_asset_metadata(course2_key, asset3_md, ModuleStoreEnum.UserID.test)
-            store.save_asset_metadata(course2_key, asset4_md, ModuleStoreEnum.UserID.test)
-            # 5 & 6 are not saved on purpose!
-
-        return (asset1_md, asset2_md, asset3_md, asset4_md, asset5_md, asset6_md)
-
-    def setup_thumbnails(self, course1_key, course2_key, store=None):
-        """
-        Setup thumbs. Save in store if given
-        """
-        thumbnail_fields = ('filename', 'internal_name')
-        thumbnail1_vals = ('cat_thumb.jpg', 'XYXYXYXYXYXY')
-        thumbnail2_vals = ('kitten_thumb.jpg', '123ABC123ABC')
-        thumbnail3_vals = ('puppy_thumb.jpg', 'ADAM12ADAM12')
-        thumbnail4_vals = ('meerkat_thumb.jpg', 'CHIPSPONCH14')
-        thumbnail5_vals = ('corgi_thumb.jpg', 'RON8LDXFFFF10')
-
-        thumbnail1 = dict(zip(thumbnail_fields[1:], thumbnail1_vals[1:]))
-        thumbnail2 = dict(zip(thumbnail_fields[1:], thumbnail2_vals[1:]))
-        thumbnail3 = dict(zip(thumbnail_fields[1:], thumbnail3_vals[1:]))
-        thumbnail4 = dict(zip(thumbnail_fields[1:], thumbnail4_vals[1:]))
-        non_existent_thumbnail = dict(zip(thumbnail_fields[1:], thumbnail5_vals[1:]))
-
-        # Asset6 and thumbnail6 have equivalent information on purpose.
-        thumbnail6_vals = ('asset.txt', 'JJJCCC747858')
-        thumbnail6 = dict(zip(thumbnail_fields[1:], thumbnail6_vals[1:]))
-
-        thumb1_key = course1_key.make_asset_key('thumbnail', thumbnail1_vals[0])
-        thumb2_key = course1_key.make_asset_key('thumbnail', thumbnail2_vals[0])
-        thumb3_key = course2_key.make_asset_key('thumbnail', thumbnail3_vals[0])
-        thumb4_key = course2_key.make_asset_key('thumbnail', thumbnail4_vals[0])
-        thumb5_key = course2_key.make_asset_key('thumbnail', thumbnail5_vals[0])
-        thumb6_key = course2_key.make_asset_key('thumbnail', thumbnail6_vals[0])
-
-        thumb1_md = AssetThumbnailMetadata(thumb1_key, **thumbnail1)
-        thumb2_md = AssetThumbnailMetadata(thumb2_key, **thumbnail2)
-        thumb3_md = AssetThumbnailMetadata(thumb3_key, **thumbnail3)
-        thumb4_md = AssetThumbnailMetadata(thumb4_key, **thumbnail4)
-        thumb5_md = AssetThumbnailMetadata(thumb5_key, **non_existent_thumbnail)
-        thumb6_md = AssetThumbnailMetadata(thumb6_key, **thumbnail6)
-
-        if store is not None:
-            store.save_asset_thumbnail_metadata(course1_key, thumb1_md, ModuleStoreEnum.UserID.test)
-            store.save_asset_thumbnail_metadata(course1_key, thumb2_md, ModuleStoreEnum.UserID.test)
-            store.save_asset_thumbnail_metadata(course2_key, thumb3_md, ModuleStoreEnum.UserID.test)
-            store.save_asset_thumbnail_metadata(course2_key, thumb4_md, ModuleStoreEnum.UserID.test)
-            # thumb5 and thumb6 are not saved on purpose!
-
-        return (thumb1_md, thumb2_md, thumb3_md, thumb4_md, thumb5_md, thumb6_md)
+        for i, asset in enumerate(all_asset_data):
+            asset_dict = dict(zip(asset_fields[1:], asset[1:]))
+            if i in (0, 1) and course1_key:
+                asset_key = course1_key.make_asset_key('asset', asset[0])
+                asset_md = AssetMetadata(asset_key, **asset_dict)
+                if store is not None:
+                    store.save_asset_metadata(asset_md, asset[4])
+            elif course2_key:
+                asset_key = course2_key.make_asset_key('asset', asset[0])
+                asset_md = AssetMetadata(asset_key, **asset_dict)
+                # Don't save assets 5 and 6.
+                if store is not None and i not in (4, 5):
+                    store.save_asset_metadata(asset_md, asset[4])
 
     @ddt.data(*MODULESTORE_SETUPS)
     def test_save_one_and_confirm(self, storebuilder):
@@ -161,19 +107,12 @@ class TestMongoAssetMetadataStorage(unittest.TestCase):
                 self.assertIsNone(store.find_asset_metadata(new_asset_loc))
                 # Save the asset's metadata.
                 new_asset_md = self._make_asset_metadata(new_asset_loc)
-                store.save_asset_metadata(course.id, new_asset_md, ModuleStoreEnum.UserID.test)
+                store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test)
                 # Find the asset's metadata and confirm it's the same.
                 found_asset_md = store.find_asset_metadata(new_asset_loc)
                 self.assertIsNotNone(found_asset_md)
                 self.assertEquals(new_asset_md, found_asset_md)
-                # Confirm that only two setup plus one asset's metadata exists.
-                self.assertEquals(len(store.get_all_asset_metadata(course.id)), 1)
-                # Delete all metadata and confirm it's gone.
-                store.delete_all_asset_metadata(course.id, ModuleStoreEnum.UserID.test)
-                self.assertEquals(len(store.get_all_asset_metadata(course.id)), 0)
-                # Now delete the non-existent metadata and ensure it doesn't choke
-                store.delete_all_asset_metadata(course.id, ModuleStoreEnum.UserID.test)
-                self.assertEquals(len(store.get_all_asset_metadata(course.id)), 0)
+                self.assertEquals(len(store.get_all_asset_metadata(course.id, 'asset')), 1)
 
     @ddt.data(*MODULESTORE_SETUPS)
     def test_delete(self, storebuilder):
@@ -186,12 +125,12 @@ class TestMongoAssetMetadataStorage(unittest.TestCase):
                 new_asset_loc = course.id.make_asset_key('asset', 'burnside.jpg')
                 # Attempt to delete an asset that doesn't exist.
                 self.assertEquals(store.delete_asset_metadata(new_asset_loc, ModuleStoreEnum.UserID.test), 0)
-                self.assertEquals(len(store.get_all_asset_metadata(course.id)), 0)
+                self.assertEquals(len(store.get_all_asset_metadata(course.id, 'asset')), 0)
 
                 new_asset_md = self._make_asset_metadata(new_asset_loc)
-                store.save_asset_metadata(course.id, new_asset_md, ModuleStoreEnum.UserID.test)
+                store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test)
                 self.assertEquals(store.delete_asset_metadata(new_asset_loc, ModuleStoreEnum.UserID.test), 1)
-                self.assertEquals(len(store.get_all_asset_metadata(course.id)), 0)
+                self.assertEquals(len(store.get_all_asset_metadata(course.id, 'asset')), 0)
 
     @ddt.data(*MODULESTORE_SETUPS)
     def test_find_non_existing_assets(self, storebuilder):
@@ -217,14 +156,12 @@ class TestMongoAssetMetadataStorage(unittest.TestCase):
                 new_asset_loc = course.id.make_asset_key('asset', 'burnside.jpg')
                 new_asset_md = self._make_asset_metadata(new_asset_loc)
                 # Add asset metadata.
-                store.save_asset_metadata(course.id, new_asset_md, ModuleStoreEnum.UserID.test)
-                self.assertEquals(len(store.get_all_asset_metadata(course.id)), 1)
+                store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test)
+                self.assertEquals(len(store.get_all_asset_metadata(course.id, 'asset')), 1)
                 # Add *the same* asset metadata.
-                store.save_asset_metadata(course.id, new_asset_md, ModuleStoreEnum.UserID.test)
+                store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test)
                 # Still one here?
-                self.assertEquals(len(store.get_all_asset_metadata(course.id)), 1)
-                store.delete_all_asset_metadata(course.id, ModuleStoreEnum.UserID.test)
-                self.assertEquals(len(store.get_all_asset_metadata(course.id)), 0)
+                self.assertEquals(len(store.get_all_asset_metadata(course.id, 'asset')), 1)
 
     @ddt.data(*MODULESTORE_SETUPS)
     def test_lock_unlock_assets(self, storebuilder):
@@ -236,7 +173,7 @@ class TestMongoAssetMetadataStorage(unittest.TestCase):
                 course = CourseFactory.create(modulestore=store)
                 new_asset_loc = course.id.make_asset_key('asset', 'burnside.jpg')
                 new_asset_md = self._make_asset_metadata(new_asset_loc)
-                store.save_asset_metadata(course.id, new_asset_md, ModuleStoreEnum.UserID.test)
+                store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test)
 
                 locked_state = new_asset_md.locked
                 # Flip the course asset's locked status.
@@ -256,7 +193,8 @@ class TestMongoAssetMetadataStorage(unittest.TestCase):
         ('internal_name', 'new_filename.txt'),
         ('locked', True),
         ('contenttype', 'image/png'),
-        ('md5', '5346682d948cc3f683635b6918f9b3d0'),
+        ('thumbnail', 'new_filename_thumb.jpg'),
+        ('fields', {'md5': '5346682d948cc3f683635b6918f9b3d0'}),
         ('curr_version', 'v1.01'),
         ('prev_version', 'v1.0'),
         ('edited_by', 'Mork'),
@@ -282,7 +220,7 @@ class TestMongoAssetMetadataStorage(unittest.TestCase):
                 course = CourseFactory.create(modulestore=store)
                 new_asset_loc = course.id.make_asset_key('asset', 'burnside.jpg')
                 new_asset_md = self._make_asset_metadata(new_asset_loc)
-                store.save_asset_metadata(course.id, new_asset_md, ModuleStoreEnum.UserID.test)
+                store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test)
                 for attr, value in self.ALLOWED_ATTRS:
                     # Set the course asset's attr.
                     store.set_asset_metadata_attr(new_asset_loc, attr, value, ModuleStoreEnum.UserID.test)
@@ -302,7 +240,7 @@ class TestMongoAssetMetadataStorage(unittest.TestCase):
                 course = CourseFactory.create(modulestore=store)
                 new_asset_loc = course.id.make_asset_key('asset', 'burnside.jpg')
                 new_asset_md = self._make_asset_metadata(new_asset_loc)
-                store.save_asset_metadata(course.id, new_asset_md, ModuleStoreEnum.UserID.test)
+                store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test)
                 for attr, value in self.DISALLOWED_ATTRS:
                     original_attr_val = getattr(new_asset_md, attr)
                     # Set the course asset's attr.
@@ -324,7 +262,7 @@ class TestMongoAssetMetadataStorage(unittest.TestCase):
                 course = CourseFactory.create(modulestore=store)
                 new_asset_loc = course.id.make_asset_key('asset', 'burnside.jpg')
                 new_asset_md = self._make_asset_metadata(new_asset_loc)
-                store.save_asset_metadata(course.id, new_asset_md, ModuleStoreEnum.UserID.test)
+                store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test)
                 for attr, value in self.UNKNOWN_ATTRS:
                     # Set the course asset's attr.
                     store.set_asset_metadata_attr(new_asset_loc, attr, value, ModuleStoreEnum.UserID.test)
@@ -336,59 +274,164 @@ class TestMongoAssetMetadataStorage(unittest.TestCase):
                         self.assertEquals(getattr(updated_asset_md, attr), value)
 
     @ddt.data(*MODULESTORE_SETUPS)
-    def test_save_one_thumbnail_and_delete_one_thumbnail(self, storebuilder):
+    def test_save_one_different_asset(self, storebuilder):
         """
-        saving and deleting thumbnails
+        saving and deleting things which are not 'asset'
         """
         with MongoContentstoreBuilder().build() as contentstore:
             with storebuilder.build(contentstore) as store:
                 course = CourseFactory.create(modulestore=store)
-                thumbnail_filename = 'burn_thumb.jpg'
-                asset_key = course.id.make_asset_key('thumbnail', thumbnail_filename)
-                new_asset_thumbnail = self._make_asset_thumbnail_metadata(asset_key)
-                store.save_asset_thumbnail_metadata(course.id, new_asset_thumbnail, ModuleStoreEnum.UserID.test)
-                self.assertEquals(len(store.get_all_asset_thumbnail_metadata(course.id)), 1)
-                self.assertEquals(store.delete_asset_thumbnail_metadata(asset_key, ModuleStoreEnum.UserID.test), 1)
-                self.assertEquals(len(store.get_all_asset_thumbnail_metadata(course.id)), 0)
-
-    @ddt.data(*MODULESTORE_SETUPS)
-    def test_find_thumbnail(self, storebuilder):
-        """
-        finding thumbnails
-        """
-        with MongoContentstoreBuilder().build() as contentstore:
-            with storebuilder.build(contentstore) as store:
-                course = CourseFactory.create(modulestore=store)
-                thumbnail_filename = 'burn_thumb.jpg'
-                asset_key = course.id.make_asset_key('thumbnail', thumbnail_filename)
-                new_asset_thumbnail = self._make_asset_thumbnail_metadata(asset_key)
-                store.save_asset_thumbnail_metadata(course.id, new_asset_thumbnail, ModuleStoreEnum.UserID.test)
-
-                self.assertIsNotNone(store.find_asset_thumbnail_metadata(asset_key))
-                unknown_asset_key = course.id.make_asset_key('thumbnail', 'nosuchfile.jpg')
-                self.assertIsNone(store.find_asset_thumbnail_metadata(unknown_asset_key))
-
-    @ddt.data(*MODULESTORE_SETUPS)
-    def test_delete_all_thumbnails(self, storebuilder):
-        """
-        deleting all thumbnails
-        """
-        with MongoContentstoreBuilder().build() as contentstore:
-            with storebuilder.build(contentstore) as store:
-                course = CourseFactory.create(modulestore=store)
-                thumbnail_filename = 'burn_thumb.jpg'
-                asset_key = course.id.make_asset_key('thumbnail', thumbnail_filename)
-                new_asset_thumbnail = self._make_asset_thumbnail_metadata(asset_key)
-                store.save_asset_thumbnail_metadata(
-                    course.id, new_asset_thumbnail, ModuleStoreEnum.UserID.test
+                asset_key = course.id.make_asset_key('different', 'burn.jpg')
+                new_asset_thumbnail = self._make_asset_thumbnail_metadata(
+                    self._make_asset_metadata(asset_key)
                 )
+                store.save_asset_metadata(new_asset_thumbnail, ModuleStoreEnum.UserID.test)
+                self.assertEquals(len(store.get_all_asset_metadata(course.id, 'different')), 1)
+                self.assertEquals(store.delete_asset_metadata(asset_key, ModuleStoreEnum.UserID.test), 1)
+                self.assertEquals(len(store.get_all_asset_metadata(course.id, 'different')), 0)
 
-                self.assertEquals(len(store.get_all_asset_thumbnail_metadata(course.id)), 1)
-                store.delete_all_asset_metadata(course.id, ModuleStoreEnum.UserID.test)
-                self.assertEquals(len(store.get_all_asset_thumbnail_metadata(course.id)), 0)
+    @ddt.data(*MODULESTORE_SETUPS)
+    def test_find_different(self, storebuilder):
+        """
+        finding things which are of type other than 'asset'
+        """
+        with MongoContentstoreBuilder().build() as contentstore:
+            with storebuilder.build(contentstore) as store:
+                course = CourseFactory.create(modulestore=store)
+                asset_key = course.id.make_asset_key('different', 'burn.jpg')
+                new_asset_thumbnail = self._make_asset_thumbnail_metadata(
+                    self._make_asset_metadata(asset_key)
+                )
+                store.save_asset_metadata(new_asset_thumbnail, ModuleStoreEnum.UserID.test)
 
-    def test_get_all_assets_with_paging(self):
-        pass
+                self.assertIsNotNone(store.find_asset_metadata(asset_key))
+                unknown_asset_key = course.id.make_asset_key('different', 'nosuchfile.jpg')
+                self.assertIsNone(store.find_asset_metadata(unknown_asset_key))
 
-    def test_copy_all_assets(self):
-        pass
+    @ddt.data(*MODULESTORE_SETUPS)
+    def test_delete_all_different_type(self, storebuilder):
+        """
+        deleting all assets of a given but not 'asset' type
+        """
+        with MongoContentstoreBuilder().build() as contentstore:
+            with storebuilder.build(contentstore) as store:
+                course = CourseFactory.create(modulestore=store)
+                asset_key = course.id.make_asset_key('different', 'burn_thumb.jpg')
+                new_asset_thumbnail = self._make_asset_thumbnail_metadata(
+                    self._make_asset_metadata(asset_key)
+                )
+                store.save_asset_metadata(new_asset_thumbnail, ModuleStoreEnum.UserID.test)
+
+                self.assertEquals(len(store.get_all_asset_metadata(course.id, 'different')), 1)
+
+    @ddt.data(*MODULESTORE_SETUPS)
+    def test_get_all_assets_with_paging(self, storebuilder):
+        """
+        Save multiple metadata in each store and retrieve it singularly, as all assets, and after deleting all.
+        """
+        # Temporarily only perform this test for Old Mongo - not Split.
+        if not isinstance(storebuilder, MongoModulestoreBuilder):
+            raise unittest.SkipTest
+        with MongoContentstoreBuilder().build() as contentstore:
+            with storebuilder.build(contentstore) as store:
+                course1 = CourseFactory.create(modulestore=store)
+                course2 = CourseFactory.create(modulestore=store)
+                self.setup_assets(course1.id, course2.id, store)
+
+                expected_sorts_by_2 = (
+                    (
+                        ('displayname', ModuleStoreEnum.SortOrder.ascending),
+                        ('code.tgz', 'demo.swf', 'dog.png', 'roman_history.pdf', 'weather_patterns.bmp'),
+                        (2, 2, 1)
+                    ),
+                    (
+                        ('displayname', ModuleStoreEnum.SortOrder.descending),
+                        ('weather_patterns.bmp', 'roman_history.pdf', 'dog.png', 'demo.swf', 'code.tgz'),
+                        (2, 2, 1)
+                    ),
+                    (
+                        ('uploadDate', ModuleStoreEnum.SortOrder.ascending),
+                        ('code.tgz', 'dog.png', 'roman_history.pdf', 'weather_patterns.bmp', 'demo.swf'),
+                        (2, 2, 1)
+                    ),
+                    (
+                        ('uploadDate', ModuleStoreEnum.SortOrder.descending),
+                        ('demo.swf', 'weather_patterns.bmp', 'roman_history.pdf', 'dog.png', 'code.tgz'),
+                        (2, 2, 1)
+                    ),
+                )
+                # First, with paging across all sorts.
+                for sort_test in expected_sorts_by_2:
+                    for i in xrange(3):
+                        asset_page = store.get_all_asset_metadata(
+                            course2.id, 'asset', start=2 * i, maxresults=2, sort=sort_test[0]
+                        )
+                        self.assertEquals(len(asset_page), sort_test[2][i])
+                        self.assertEquals(asset_page[0].asset_id.path, sort_test[1][2 * i])
+                        if sort_test[2][i] == 2:
+                            self.assertEquals(asset_page[1].asset_id.path, sort_test[1][(2 * i) + 1])
+
+                # Now fetch everything.
+                asset_page = store.get_all_asset_metadata(
+                    course2.id, 'asset', start=0, sort=('displayname', ModuleStoreEnum.SortOrder.ascending)
+                )
+                self.assertEquals(len(asset_page), 5)
+                self.assertEquals(asset_page[0].asset_id.path, 'code.tgz')
+                self.assertEquals(asset_page[1].asset_id.path, 'demo.swf')
+                self.assertEquals(asset_page[2].asset_id.path, 'dog.png')
+                self.assertEquals(asset_page[3].asset_id.path, 'roman_history.pdf')
+                self.assertEquals(asset_page[4].asset_id.path, 'weather_patterns.bmp')
+
+                # Some odd conditions.
+                asset_page = store.get_all_asset_metadata(
+                    course2.id, 'asset', start=100, sort=('uploadDate', ModuleStoreEnum.SortOrder.ascending)
+                )
+                self.assertEquals(len(asset_page), 0)
+                asset_page = store.get_all_asset_metadata(
+                    course2.id, 'asset', start=3, maxresults=0,
+                    sort=('displayname', ModuleStoreEnum.SortOrder.ascending)
+                )
+                self.assertEquals(len(asset_page), 0)
+                asset_page = store.get_all_asset_metadata(
+                    course2.id, 'asset', start=3, maxresults=-12345,
+                    sort=('displayname', ModuleStoreEnum.SortOrder.descending)
+                )
+                self.assertEquals(len(asset_page), 2)
+
+    @ddt.data(XmlModulestoreBuilder(), MixedModulestoreBuilder([('xml', XmlModulestoreBuilder())]))
+    def test_xml_not_yet_implemented(self, storebuilder):
+        """
+        Test coverage which shows that for now xml read operations are not implemented
+        """
+        with storebuilder.build(None) as store:
+            course_key = store.make_course_key("org", "course", "run")
+            asset_key = course_key.make_asset_key('asset', 'foo.jpg')
+            for method in ['find_asset_metadata']:
+                with self.assertRaises(NotImplementedError):
+                    getattr(store, method)(asset_key)
+            with self.assertRaises(NotImplementedError):
+                # pylint: disable=protected-access
+                store._find_course_asset(asset_key)
+            with self.assertRaises(NotImplementedError):
+                store.get_all_asset_metadata(course_key, 'asset')
+
+    @ddt.data(*MODULESTORE_SETUPS)
+    def test_copy_all_assets(self, storebuilder):
+        """
+        Create a course with assets and such, copy it all to another course, and check on it.
+        """
+        with MongoContentstoreBuilder().build() as contentstore:
+            with storebuilder.build(contentstore) as store:
+                course1 = CourseFactory.create(modulestore=store)
+                course2 = CourseFactory.create(modulestore=store)
+                self.setup_assets(course1.id, None, store)
+                self.assertEquals(len(store.get_all_asset_metadata(course1.id, 'asset')), 2)
+                self.assertEquals(len(store.get_all_asset_metadata(course2.id, 'asset')), 0)
+                store.copy_all_asset_metadata(course1.id, course2.id, ModuleStoreEnum.UserID.test * 101)
+                self.assertEquals(len(store.get_all_asset_metadata(course1.id, 'asset')), 2)
+                all_assets = store.get_all_asset_metadata(
+                    course2.id, 'asset', sort=('displayname', ModuleStoreEnum.SortOrder.ascending)
+                )
+                self.assertEquals(len(all_assets), 2)
+                self.assertEquals(all_assets[0].asset_id.path, 'pic1.jpg')
+                self.assertEquals(all_assets[1].asset_id.path, 'shout.ogg')
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py b/common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py
index d08bb518fa..c8ab6bd577 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py
@@ -17,6 +17,7 @@ import random
 from contextlib import contextmanager, nested
 from shutil import rmtree
 from tempfile import mkdtemp
+from path import path
 
 from xmodule.tests import CourseComparisonTest
 
@@ -30,13 +31,16 @@ from xmodule.modulestore.split_mongo.split_draft import DraftVersioningModuleSto
 from xmodule.modulestore.tests.mongo_connection import MONGO_PORT_NUM, MONGO_HOST
 from xmodule.modulestore.inheritance import InheritanceMixin
 from xmodule.x_module import XModuleMixin
+from xmodule.modulestore.xml import XMLModuleStore
+
+TEST_DATA_DIR = 'common/test/data/'
 
 
 COMMON_DOCSTORE_CONFIG = {
     'host': MONGO_HOST,
     'port': MONGO_PORT_NUM,
 }
-
+DATA_DIR = path(__file__).dirname().parent.parent / "tests" / "data" / "xml-course-root"
 
 XBLOCK_MIXINS = (InheritanceMixin, XModuleMixin)
 
@@ -163,6 +167,30 @@ class VersioningModulestoreBuilder(object):
         return 'SplitModulestoreBuilder()'
 
 
+class XmlModulestoreBuilder(object):
+    """
+    A builder class for a XMLModuleStore.
+    """
+    # pylint: disable=unused-argument
+    @contextmanager
+    def build(self, contentstore=None, course_ids=None):
+        """
+        A contextmanager that returns an isolated xml modulestore
+
+        Args:
+            contentstore: The contentstore that this modulestore should use to store
+                all of its assets.
+        """
+        modulestore = XMLModuleStore(
+            DATA_DIR,
+            course_ids=course_ids,
+            default_class='xmodule.hidden_module.HiddenDescriptor',
+            xblock_mixins=XBLOCK_MIXINS,
+        )
+
+        yield modulestore
+
+
 class MixedModulestoreBuilder(object):
     """
     A builder class for a MixedModuleStore.
@@ -289,7 +317,7 @@ class CrossStoreXMLRoundtrip(CourseComparisonTest):
                         import_from_xml(
                             source_store,
                             'test_user',
-                            'common/test/data',
+                            TEST_DATA_DIR,
                             course_dirs=[course_data_name],
                             static_content_store=source_content,
                             target_course_id=source_course_key,
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
index fc17af92b9..152d7cf26a 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
@@ -6,7 +6,6 @@ import datetime
 import ddt
 import itertools
 import pymongo
-import unittest
 
 from collections import namedtuple
 from importlib import import_module
@@ -19,6 +18,10 @@ from uuid import uuid4
 from django.conf import settings
 from xmodule.modulestore.edit_info import EditInfoMixin
 from xmodule.modulestore.inheritance import InheritanceMixin
+from xmodule.modulestore.tests.test_cross_modulestore_import_export import MongoContentstoreBuilder
+from xmodule.contentstore.content import StaticContent
+import mimetypes
+from opaque_keys.edx.keys import CourseKey
 
 if not settings.configured:
     settings.configure()
@@ -70,12 +73,12 @@ class TestMixedModuleStore(CourseComparisonTest):
         'collection': COLLECTION,
         'asset_collection': ASSET_COLLECTION,
     }
+    MAPPINGS = {
+        XML_COURSEID1: 'xml',
+        XML_COURSEID2: 'xml',
+        BAD_COURSE_ID: 'xml',
+    }
     OPTIONS = {
-        'mappings': {
-            XML_COURSEID1: 'xml',
-            XML_COURSEID2: 'xml',
-            BAD_COURSE_ID: 'xml',
-        },
         'stores': [
             {
                 'NAME': 'draft',
@@ -95,6 +98,7 @@ class TestMixedModuleStore(CourseComparisonTest):
                 'OPTIONS': {
                     'data_dir': DATA_DIR,
                     'default_class': 'xmodule.hidden_module.HiddenDescriptor',
+                    'xblock_mixins': (EditInfoMixin, InheritanceMixin),
                 }
             },
         ]
@@ -111,6 +115,16 @@ class TestMixedModuleStore(CourseComparisonTest):
         """
         Set up the database for testing
         """
+        super(TestMixedModuleStore, self).setUp()
+
+        self.exclude_field(None, 'wiki_slug')
+        self.exclude_field(None, 'xml_attributes')
+        self.exclude_field(None, 'parent')
+        self.ignore_asset_key('_id')
+        self.ignore_asset_key('uploadDate')
+        self.ignore_asset_key('content_son')
+        self.ignore_asset_key('thumbnail_location')
+
         self.options = getattr(self, 'options', self.OPTIONS)
         self.connection = pymongo.MongoClient(
             host=self.HOST,
@@ -120,13 +134,12 @@ class TestMixedModuleStore(CourseComparisonTest):
         self.connection.drop_database(self.DB)
         self.addCleanup(self.connection.drop_database, self.DB)
         self.addCleanup(self.connection.close)
-        super(TestMixedModuleStore, self).setUp()
 
         self.addTypeEqualityFunc(BlockUsageLocator, '_compare_ignore_version')
         self.addTypeEqualityFunc(CourseLocator, '_compare_ignore_version')
         # define attrs which get set in initdb to quell pylint
         self.writable_chapter_location = self.store = self.fake_location = self.xml_chapter_location = None
-        self.course_locations = []
+        self.course_locations = {}
 
         self.user_id = ModuleStoreEnum.UserID.test
 
@@ -217,11 +230,16 @@ class TestMixedModuleStore(CourseComparisonTest):
         """
         return self.course_locations[string].course_key
 
-    def _initialize_mixed(self):
+    # pylint: disable=dangerous-default-value
+    def _initialize_mixed(self, mappings=MAPPINGS, contentstore=None):
         """
-        initializes the mixed modulestore
+        initializes the mixed modulestore.
         """
-        self.store = MixedModuleStore(None, create_modulestore_instance=create_modulestore_instance, **self.options)
+        self.store = MixedModuleStore(
+            contentstore, create_modulestore_instance=create_modulestore_instance,
+            mappings=mappings,
+            **self.options
+        )
         self.addCleanup(self.store.close_all_connections)
 
     def initdb(self, default):
@@ -300,7 +318,7 @@ class TestMixedModuleStore(CourseComparisonTest):
         """
         Make sure we get back the store type we expect for given mappings
         """
-        self._initialize_mixed()
+        self._initialize_mixed(mappings={})
         with self.store.default_store(default_ms):
             self.store.create_course('org_x', 'course_y', 'run_z', self.user_id)
             if reset_mixed_mappings:
@@ -1759,7 +1777,7 @@ class TestMixedModuleStore(CourseComparisonTest):
         Test the default store context manager
         """
         # initialize the mixed modulestore
-        self._initialize_mixed()
+        self._initialize_mixed(mappings={})
 
         with self.store.default_store(default_ms):
             self.verify_default_store(default_ms)
@@ -1769,7 +1787,7 @@ class TestMixedModuleStore(CourseComparisonTest):
         Test the default store context manager, nested within one another
         """
         # initialize the mixed modulestore
-        self._initialize_mixed()
+        self._initialize_mixed(mappings={})
 
         with self.store.default_store(ModuleStoreEnum.Type.mongo):
             self.verify_default_store(ModuleStoreEnum.Type.mongo)
@@ -1785,13 +1803,73 @@ class TestMixedModuleStore(CourseComparisonTest):
         Test the default store context manager, asking for a fake store
         """
         # initialize the mixed modulestore
-        self._initialize_mixed()
+        self._initialize_mixed(mappings={})
 
         fake_store = "fake"
         with self.assertRaisesRegexp(Exception, "Cannot find store of type {}".format(fake_store)):
             with self.store.default_store(fake_store):
                 pass  # pragma: no cover
 
+    def save_asset(self, asset_key):
+        """
+        Load and save the given file. (taken from test_contentstore)
+        """
+        with open("{}/static/{}".format(DATA_DIR, asset_key.block_id), "rb") as f:
+            content = StaticContent(
+                asset_key, "Funky Pix", mimetypes.guess_type(asset_key.block_id)[0], f.read(),
+            )
+            self.store.contentstore.save(content)
+
+    @ddt.data(
+        [ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.mongo],
+        [ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split],
+        [ModuleStoreEnum.Type.split, ModuleStoreEnum.Type.split]
+    )
+    @ddt.unpack
+    def test_clone_course(self, source_modulestore, destination_modulestore):
+        """
+        Test clone course
+        """
+
+        with MongoContentstoreBuilder().build() as contentstore:
+            # initialize the mixed modulestore
+            self._initialize_mixed(contentstore=contentstore, mappings={})
+
+            with self.store.default_store(source_modulestore):
+
+                source_course_key = self.store.make_course_key("org.source", "course.source", "run.source")
+                self._create_course(source_course_key)
+                self.save_asset(source_course_key.make_asset_key('asset', 'picture1.jpg'))
+
+            with self.store.default_store(destination_modulestore):
+                dest_course_id = self.store.make_course_key("org.other", "course.other", "run.other")
+                self.store.clone_course(source_course_key, dest_course_id, self.user_id)
+
+                # pylint: disable=protected-access
+            source_store = self.store._get_modulestore_by_type(source_modulestore)
+            dest_store = self.store._get_modulestore_by_type(destination_modulestore)
+            self.assertCoursesEqual(source_store, source_course_key, dest_store, dest_course_id)
+
+    def test_clone_xml_split(self):
+        """
+        Can clone xml courses to split; so, test it.
+        """
+        with MongoContentstoreBuilder().build() as contentstore:
+            # initialize the mixed modulestore
+            self._initialize_mixed(contentstore=contentstore, mappings={self.XML_COURSEID2: 'xml', })
+            source_course_key = CourseKey.from_string(self.XML_COURSEID2)
+            with self.store.default_store(ModuleStoreEnum.Type.split):
+                dest_course_id = CourseLocator("org.other", "course.other", "run.other")
+                self.store.clone_course(
+                    source_course_key, dest_course_id, ModuleStoreEnum.UserID.test
+                )
+
+            # pylint: disable=protected-access
+            source_store = self.store._get_modulestore_by_type(ModuleStoreEnum.Type.xml)
+            dest_store = self.store._get_modulestore_by_type(ModuleStoreEnum.Type.split)
+            self.assertCoursesEqual(source_store, source_course_key, dest_store, dest_course_id)
+
+
 # ============================================================================================================
 # General utils for not using django settings
 # ============================================================================================================
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
index 6b7ac9b71f..8a0ea068d2 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
@@ -105,7 +105,6 @@ class TestMongoModuleStoreBase(unittest.TestCase):
             'port': PORT,
             'db': DB,
             'collection': COLLECTION,
-            #'asset_collection': ASSET_COLLECTION,
         }
         cls.add_asset_collection(doc_store_config)
 
@@ -687,11 +686,7 @@ class TestMongoModuleStoreWithNoAssetCollection(TestMongoModuleStore):
         courses = self.draft_store.get_courses()
         course = courses[0]
         # Confirm that no asset collection means no asset metadata.
-        self.assertEquals(self.draft_store.get_all_asset_metadata(course.id), None)
-        # Now delete the non-existent asset metadata.
-        self.draft_store.delete_all_asset_metadata(course.id, ModuleStoreEnum.UserID.test)
-        # Should still be nothing.
-        self.assertEquals(self.draft_store.get_all_asset_metadata(course.id), None)
+        self.assertEquals(self.draft_store.get_all_asset_metadata(course.id, 'asset'), None)
 
 
 class TestMongoKeyValueStore(object):
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
index 22c1afd0df..8ea9d26c81 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
@@ -884,6 +884,11 @@ class SplitModuleItemTests(SplitModuleTest):
         self.assertFalse(modulestore()._value_matches('I need some help', re.compile(r'Help')))
         self.assertTrue(modulestore()._value_matches(['I need some help', 'today'], re.compile(r'Help', re.IGNORECASE)))
 
+        self.assertTrue(modulestore()._value_matches('gotcha', {'$in': ['a', 'bunch', 'of', 'gotcha']}))
+        self.assertFalse(modulestore()._value_matches('gotcha', {'$in': ['a', 'bunch', 'of', 'gotchas']}))
+        self.assertFalse(modulestore()._value_matches('gotcha', {'$nin': ['a', 'bunch', 'of', 'gotcha']}))
+        self.assertTrue(modulestore()._value_matches('gotcha', {'$nin': ['a', 'bunch', 'of', 'gotchas']}))
+
         self.assertTrue(modulestore()._block_matches({'a': 1, 'b': 2}, {'a': 1}))
         self.assertFalse(modulestore()._block_matches({'a': 1, 'b': 2}, {'a': 2}))
         self.assertFalse(modulestore()._block_matches({'a': 1, 'b': 2}, {'c': 1}))
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py
index d6947ed31c..bab04573e4 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py
@@ -70,9 +70,9 @@ class SplitWMongoCourseBoostrapper(unittest.TestCase):
         Remove the test collections, close the db connection
         """
         split_db = self.split_mongo.db
-        split_db.drop_collection(split_db.course_index)
-        split_db.drop_collection(split_db.structures)
-        split_db.drop_collection(split_db.definitions)
+        split_db.drop_collection(split_db.course_index.proxied_object)
+        split_db.drop_collection(split_db.structures.proxied_object)
+        split_db.drop_collection(split_db.definitions.proxied_object)
 
     def tear_down_mongo(self):
         """
@@ -80,7 +80,7 @@ class SplitWMongoCourseBoostrapper(unittest.TestCase):
         """
         split_db = self.split_mongo.db
         # old_mongo doesn't give a db attr, but all of the dbs are the same
-        split_db.drop_collection(self.draft_mongo.collection)
+        split_db.drop_collection(self.draft_mongo.collection.proxied_object)
 
     def _create_item(self, category, name, data, metadata, parent_category, parent_name, draft=True, split=True):
         """
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_store_utilities.py b/common/lib/xmodule/xmodule/modulestore/tests/test_store_utilities.py
new file mode 100644
index 0000000000..f003e76a8c
--- /dev/null
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_store_utilities.py
@@ -0,0 +1,81 @@
+"""
+Tests for store_utilities.py
+"""
+import unittest
+from mock import Mock
+import ddt
+
+from xmodule.modulestore.store_utilities import (
+    get_draft_subtree_roots, draft_node_constructor
+)
+
+
+@ddt.ddt
+class TestUtils(unittest.TestCase):
+    """
+    Tests for store_utilities
+
+    ASCII trees for ONLY_ROOTS and SOME_TREES:
+
+    ONLY_ROOTS:
+    1)
+        vertical (not draft)
+          |
+        url1
+
+    2)
+        sequential (not draft)
+          |
+        url2
+
+    SOME_TREES:
+
+    1)
+            sequential_1 (not draft)
+                 |
+            vertical_1
+              /     \
+             /       \
+        child_1    child_2
+
+
+    2)
+        great_grandparent_vertical (not draft)
+                    |
+            grandparent_vertical
+                    |
+                vertical_2
+                 /      \
+                /        \
+            child_3    child_4
+    """
+
+    ONLY_ROOTS = [
+        draft_node_constructor(Mock(), 'url1', 'vertical'),
+        draft_node_constructor(Mock(), 'url2', 'sequential'),
+    ]
+    ONLY_ROOTS_URLS = ['url1', 'url2']
+
+    SOME_TREES = [
+        draft_node_constructor(Mock(), 'child_1', 'vertical_1'),
+        draft_node_constructor(Mock(), 'child_2', 'vertical_1'),
+        draft_node_constructor(Mock(), 'vertical_1', 'sequential_1'),
+
+        draft_node_constructor(Mock(), 'child_3', 'vertical_2'),
+        draft_node_constructor(Mock(), 'child_4', 'vertical_2'),
+        draft_node_constructor(Mock(), 'vertical_2', 'grandparent_vertical'),
+        draft_node_constructor(Mock(), 'grandparent_vertical', 'great_grandparent_vertical'),
+    ]
+
+    SOME_TREES_ROOTS_URLS = ['vertical_1', 'grandparent_vertical']
+
+    @ddt.data(
+        (ONLY_ROOTS, ONLY_ROOTS_URLS),
+        (SOME_TREES, SOME_TREES_ROOTS_URLS),
+    )
+    @ddt.unpack
+    def test_get_draft_subtree_roots(self, module_nodes, expected_roots_urls):
+        """tests for get_draft_subtree_roots"""
+        subtree_roots_urls = [root.url for root in get_draft_subtree_roots(module_nodes)]
+        # check that we return the expected urls
+        self.assertEqual(set(subtree_roots_urls), set(expected_roots_urls))
diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py
index aade361934..e6e08a416b 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml.py
@@ -846,3 +846,24 @@ class XMLModuleStore(ModuleStoreReadBase):
         if branch_setting != ModuleStoreEnum.Branch.published_only:
             raise ValueError(u"Cannot set branch setting to {} on a ReadOnly store".format(branch_setting))
         yield
+
+    def _find_course_asset(self, asset_key):
+        """
+        For now this is not implemented, but others should feel free to implement using the asset.json
+        which export produces.
+        """
+        raise NotImplementedError()
+
+    def find_asset_metadata(self, asset_key, **kwargs):
+        """
+        For now this is not implemented, but others should feel free to implement using the asset.json
+        which export produces.
+        """
+        raise NotImplementedError()
+
+    def get_all_asset_metadata(self, course_key, asset_type, start=0, maxresults=-1, sort=None, **kwargs):
+        """
+        For now this is not implemented, but others should feel free to implement using the asset.json
+        which export produces.
+        """
+        raise NotImplementedError()
diff --git a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py b/common/lib/xmodule/xmodule/modulestore/xml_exporter.py
index 6b1bb275a4..376dc7dc32 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_exporter.py
@@ -9,6 +9,7 @@ from xmodule.contentstore.content import StaticContent
 from xmodule.exceptions import NotFoundError
 from xmodule.modulestore import EdxJSONEncoder, ModuleStoreEnum
 from xmodule.modulestore.inheritance import own_metadata
+from xmodule.modulestore.store_utilities import draft_node_constructor, get_draft_subtree_roots
 from fs.osfs import OSFS
 from json import dumps
 import json
@@ -109,36 +110,55 @@ def export_to_xml(modulestore, contentstore, course_key, root_dir, course_dir):
         #### DRAFTS ####
         # xml backed courses don't support drafts!
         if course.runtime.modulestore.get_modulestore_type() != ModuleStoreEnum.Type.xml:
-            # NOTE: this code assumes that verticals are the top most draftable container
-            # should we change the application, then this assumption will no longer be valid
             # NOTE: we need to explicitly implement the logic for setting the vertical's parent
             # and index here since the XML modulestore cannot load draft modules
             with modulestore.branch_setting(ModuleStoreEnum.Branch.draft_preferred, course_key):
-                draft_verticals = modulestore.get_items(
+                draft_modules = modulestore.get_items(
                     course_key,
-                    qualifiers={'category': 'vertical'},
+                    qualifiers={'category': {'$nin': DIRECT_ONLY_CATEGORIES}},
                     revision=ModuleStoreEnum.RevisionOption.draft_only
                 )
 
-                if len(draft_verticals) > 0:
+                if draft_modules:
                     draft_course_dir = export_fs.makeopendir(DRAFT_DIR)
-                    for draft_vertical in draft_verticals:
+
+                    # accumulate tuples of draft_modules and their parents in
+                    # this list:
+                    draft_node_list = []
+
+                    for draft_module in draft_modules:
                         parent_loc = modulestore.get_parent_location(
-                            draft_vertical.location,
+                            draft_module.location,
                             revision=ModuleStoreEnum.RevisionOption.draft_preferred
                         )
                         # Don't try to export orphaned items.
                         if parent_loc is not None:
                             logging.debug('parent_loc = {0}'.format(parent_loc))
-                            if parent_loc.category in DIRECT_ONLY_CATEGORIES:
-                                draft_vertical.xml_attributes['parent_sequential_url'] = parent_loc.to_deprecated_string()
-                                sequential = modulestore.get_item(parent_loc)
-                                index = sequential.children.index(draft_vertical.location)
-                                draft_vertical.xml_attributes['index_in_children_list'] = str(index)
-                            draft_vertical.runtime.export_fs = draft_course_dir
-                            adapt_references(draft_vertical, xml_centric_course_key, draft_course_dir)
-                            node = lxml.etree.Element('unknown')
-                            draft_vertical.add_xml_to_node(node)
+                            draft_node = draft_node_constructor(
+                                draft_module,
+                                location=draft_module.location,
+                                url=draft_module.location.to_deprecated_string(),
+                                parent_location=parent_loc,
+                                parent_url=parent_loc.to_deprecated_string(),
+                            )
+
+                            draft_node_list.append(draft_node)
+
+                    for draft_node in get_draft_subtree_roots(draft_node_list):
+                        # only export the roots of the draft subtrees
+                        # since export_from_xml (called by `add_xml_to_node`)
+                        # exports a whole tree
+
+                        draft_node.module.xml_attributes['parent_url'] = draft_node.parent_url
+                        parent = modulestore.get_item(draft_node.parent_location)
+                        index = parent.children.index(draft_node.module.location)
+                        draft_node.module.xml_attributes['index_in_children_list'] = str(index)
+
+                        draft_node.module.runtime.export_fs = draft_course_dir
+                        adapt_references(draft_node.module, xml_centric_course_key, draft_course_dir)
+                        node = lxml.etree.Element('unknown')
+
+                        draft_node.module.add_xml_to_node(node)
 
 
 def adapt_references(subtree, destination_course_key, export_fs):
diff --git a/common/lib/xmodule/xmodule/modulestore/xml_importer.py b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
index 31fd7bab92..1af5ea27b4 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml_importer.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
@@ -42,7 +42,8 @@ from xmodule.modulestore.django import ASSET_IGNORE_REGEX
 from xmodule.modulestore.exceptions import DuplicateCourseError
 from xmodule.modulestore.mongo.base import MongoRevisionKey
 from xmodule.modulestore import ModuleStoreEnum
-from xmodule.modulestore.exceptions import ItemNotFoundError
+from xmodule.modulestore.store_utilities import draft_node_constructor, get_draft_subtree_roots
+
 
 log = logging.getLogger(__name__)
 
@@ -438,6 +439,8 @@ def _import_module_and_update_references(
                 value = field.read_from(module)
                 # remove any export/import only xml_attributes
                 # which are used to wire together draft imports
+                if 'parent_url' in value:
+                    del value['parent_url']
                 if 'parent_sequential_url' in value:
                     del value['parent_sequential_url']
 
@@ -500,28 +503,26 @@ def _import_course_draft(
         # to ensure that pure XBlock field data is updated correctly.
         _update_module_location(module, module_location.replace(revision=MongoRevisionKey.draft))
 
+        parent_url = get_parent_url(module)
+        index = index_in_children_list(module)
+
         # make sure our parent has us in its list of children
-        # this is to make sure private only verticals show up
+        # this is to make sure private only modules show up
         # in the list of children since they would have been
         # filtered out from the non-draft store export.
-        # Note though that verticals nested below the unit level will not have
-        # a parent_sequential_url and do not need special handling.
-        if module.location.category == 'vertical' and 'parent_sequential_url' in module.xml_attributes:
-            sequential_url = module.xml_attributes['parent_sequential_url']
-            index = int(module.xml_attributes['index_in_children_list'])
-
+        if parent_url is not None and index is not None:
             course_key = descriptor.location.course_key
-            seq_location = course_key.make_usage_key_from_deprecated_string(sequential_url)
+            parent_location = course_key.make_usage_key_from_deprecated_string(parent_url)
 
-            # IMPORTANT: Be sure to update the sequential in the NEW namespace
-            seq_location = seq_location.map_into_course(target_course_id)
+            # IMPORTANT: Be sure to update the parent in the NEW namespace
+            parent_location = parent_location.map_into_course(target_course_id)
 
-            sequential = store.get_item(seq_location, depth=0)
+            parent = store.get_item(parent_location, depth=0)
 
             non_draft_location = module.location.map_into_course(target_course_id)
-            if not any(child.block_id == module.location.block_id for child in sequential.children):
-                sequential.children.insert(index, non_draft_location)
-                store.update_item(sequential, user_id)
+            if not any(child.block_id == module.location.block_id for child in parent.children):
+                parent.children.insert(index, non_draft_location)
+                store.update_item(parent, user_id)
 
         _import_module_and_update_references(
             module, store, user_id,
@@ -537,8 +538,8 @@ def _import_course_draft(
 
     # First it is necessary to order the draft items by their desired index in the child list
     # (order os.walk returns them in is not guaranteed).
-    drafts = dict()
-    for dirname, _dirnames, filenames in os.walk(draft_dir + "/vertical"):
+    drafts = []
+    for dirname, _dirnames, filenames in os.walk(draft_dir):
         for filename in filenames:
             module_path = os.path.join(dirname, filename)
             with open(module_path, 'r') as f:
@@ -593,23 +594,27 @@ def _import_course_draft(
                         filename, __ = os.path.splitext(filename)
                         descriptor.location = descriptor.location.replace(name=filename)
 
-                        index = int(descriptor.xml_attributes['index_in_children_list'])
-                        if index in drafts:
-                            drafts[index].append(descriptor)
-                        else:
-                            drafts[index] = [descriptor]
+                        index = index_in_children_list(descriptor)
+                        parent_url = get_parent_url(descriptor, xml)
+                        draft_url = descriptor.location.to_deprecated_string()
 
-                except Exception:
+                        draft = draft_node_constructor(
+                            module=descriptor, url=draft_url, parent_url=parent_url, index=index
+                        )
+
+                        drafts.append(draft)
+
+                except Exception:  # pylint: disable=W0703
                     logging.exception('Error while parsing course xml.')
 
-        # For each index_in_children_list key, there is a list of vertical descriptors.
+    # sort drafts by `index_in_children_list` attribute
+    drafts.sort(key=lambda x: x.index)
 
-        for key in sorted(drafts.iterkeys()):
-            for descriptor in drafts[key]:
-                try:
-                    _import_module(descriptor)
-                except Exception:
-                    logging.exception('while importing draft descriptor %s', descriptor)
+    for draft in get_draft_subtree_roots(drafts):
+        try:
+            _import_module(draft.module)
+        except Exception:  # pylint: disable=W0703
+            logging.exception('while importing draft descriptor %s', draft.module)
 
 
 def allowed_metadata_by_category(category):
@@ -648,6 +653,56 @@ def check_module_metadata_editability(module):
     return err_cnt
 
 
+def get_parent_url(module, xml=None):
+    """
+    Get the parent_url, if any, from module using xml as an alternative source. If it finds it in
+    xml but not on module, it modifies module so that the next call to this w/o the xml will get the parent url
+    """
+    if hasattr(module, 'xml_attributes'):
+        return module.xml_attributes.get(
+            # handle deprecated old attr
+            'parent_url', module.xml_attributes.get('parent_sequential_url')
+        )
+    if xml is not None:
+        create_xml_attributes(module, xml)
+        return get_parent_url(module)  # don't reparse xml b/c don't infinite recurse but retry above lines
+    return None
+
+
+def index_in_children_list(module, xml=None):
+    """
+    Get the index_in_children_list, if any, from module using xml
+    as an alternative source. If it finds it in xml but not on module,
+    it modifies module so that the next call to this w/o the xml
+    will get the field.
+    """
+    if hasattr(module, 'xml_attributes'):
+        val = module.xml_attributes.get('index_in_children_list')
+        if val is not None:
+            return int(val)
+        return None
+    if xml is not None:
+        create_xml_attributes(module, xml)
+        return index_in_children_list(module)  # don't reparse xml b/c don't infinite recurse but retry above lines
+    return None
+
+
+def create_xml_attributes(module, xml):
+    """
+    Make up for modules which don't define xml_attributes by creating them here and populating
+    """
+    xml_attrs = {}
+    for attr, val in xml.attrib.iteritems():
+        if attr not in module.fields:
+            # translate obsolete attr
+            if attr == 'parent_sequential_url':
+                attr = 'parent_url'
+            xml_attrs[attr] = val
+
+    # now cache it on module where it's expected
+    setattr(module, 'xml_attributes', xml_attrs)
+
+
 def validate_no_non_editable_metadata(module_store, course_id, category):
     err_cnt = 0
     for module_loc in module_store.modules[course_id]:
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
index 3fbda59f79..e2cebeabc6 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
@@ -257,7 +257,6 @@ class CombinedOpenEndedV1Module():
         """
         return all(self.is_initial_child_state(child) for child in task_state)
 
-
     def states_sort_key(self, idx_task_states):
         """
         Return a key for sorting a list of indexed task_states, by how far the student got
@@ -544,8 +543,8 @@ class CombinedOpenEndedV1Module():
                 last_response_data = self.get_last_response(self.current_task_number - 1)
                 current_response_data = self.get_current_attributes(self.current_task_number)
 
-                if (current_response_data['min_score_to_attempt'] > last_response_data['score']
-                    or current_response_data['max_score_to_attempt'] < last_response_data['score']):
+                if current_response_data['min_score_to_attempt'] > last_response_data['score'] or\
+                   current_response_data['max_score_to_attempt'] < last_response_data['score']:
                     self.state = self.DONE
                     self.ready_to_reset = True
 
@@ -818,7 +817,7 @@ class CombinedOpenEndedV1Module():
             log.error("Invalid response from grading server for location {0} and student {1}".format(self.location, student_id))
             error_message = "Received invalid response from the graders.  Please notify course staff."
             return success, allowed_to_submit, error_message
-        if count_graded >= count_required or count_available==0:
+        if count_graded >= count_required or count_available == 0:
             error_message = ""
             return success, allowed_to_submit, error_message
         else:
@@ -853,7 +852,7 @@ class CombinedOpenEndedV1Module():
         contexts = []
         rubric_number = self.current_task_number
         if self.ready_to_reset:
-            rubric_number+=1
+            rubric_number += 1
         response = self.get_last_response(rubric_number)
         score_length = len(response['grader_types'])
         for z in xrange(score_length):
@@ -861,7 +860,7 @@ class CombinedOpenEndedV1Module():
                 try:
                     feedback = response['feedback_dicts'][z].get('feedback', '')
                 except TypeError:
-                    return {'success' : False}
+                    return {'success': False}
                 rubric_scores = [[response['rubric_scores'][z]]]
                 grader_types = [[response['grader_types'][z]]]
                 feedback_items = [[response['feedback_items'][z]]]
@@ -879,14 +878,14 @@ class CombinedOpenEndedV1Module():
                     # That longer string appears when a user is viewing a graded rubric
                     # returned from one of the graders of their openended response problem.
                     'task_name': ugettext('Scored rubric'),
-                    'feedback' : feedback
+                    'feedback': feedback
                 })
 
         context = {
             'results': contexts,
         }
         html = self.system.render_template('{0}/combined_open_ended_results.html'.format(self.TEMPLATE_DIR), context)
-        return {'html': html, 'success': True, 'hide_reset' : False}
+        return {'html': html, 'success': True, 'hide_reset': False}
 
     def get_legend(self, _data):
         """
@@ -978,7 +977,7 @@ class CombinedOpenEndedV1Module():
                     max_number_of_attempts=self.max_attempts
                 )
             }
-        self.student_attempts +=1
+        self.student_attempts += 1
         self.state = self.INITIAL
         self.ready_to_reset = False
         for i in xrange(len(self.task_xml)):
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
index 1951bce153..a461eff98d 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
@@ -245,7 +245,7 @@ class OpenEndedChild(object):
         Replaces "\n" newlines with <br/>
         """
         retv = re.sub(r'</p>$', '', re.sub(r'^<p>', '', html))
-        return re.sub("\n","<br/>", retv)
+        return re.sub("\n", "<br/>", retv)
 
     def new_history_entry(self, answer):
         """
@@ -293,7 +293,7 @@ class OpenEndedChild(object):
             'child_attempts': self.child_attempts,
             'child_created': self.child_created,
             'stored_answer': self.stored_answer,
-            }
+        }
         return json.dumps(state)
 
     def _allow_reset(self):
@@ -333,13 +333,13 @@ class OpenEndedChild(object):
                 previous_answer = latest
             else:
                 previous_answer = ""
-            previous_answer = previous_answer.replace("<br/>","\n").replace("<br>", "\n")
+            previous_answer = previous_answer.replace("<br/>", "\n").replace("<br>", "\n")
         else:
             if latest is not None and len(latest) > 0:
                 previous_answer = latest
             else:
                 previous_answer = ""
-            previous_answer = previous_answer.replace("\n","<br/>")
+            previous_answer = previous_answer.replace("\n", "<br/>")
 
         return previous_answer
 
@@ -439,16 +439,16 @@ class OpenEndedChild(object):
         image_tag = ""
 
         # Ensure that a valid file was uploaded.
-        if ('valid_files_attached' in data
-            and data['valid_files_attached'] in ['true', '1', True]
-            and data['student_file'] is not None
-            and len(data['student_file']) > 0):
-                has_file_to_upload = True
-                student_file = data['student_file'][0]
+        if 'valid_files_attached' in data and \
+           data['valid_files_attached'] in ['true', '1', True] and \
+           data['student_file'] is not None and \
+           len(data['student_file']) > 0:
+            has_file_to_upload = True
+            student_file = data['student_file'][0]
 
-                # Upload the file to S3 and generate html to embed a link.
-                s3_public_url = self.upload_file_to_s3(student_file)
-                image_tag = self.generate_file_link_html_from_url(s3_public_url, student_file.name)
+            # Upload the file to S3 and generate html to embed a link.
+            s3_public_url = self.upload_file_to_s3(student_file)
+            image_tag = self.generate_file_link_html_from_url(s3_public_url, student_file.name)
 
         return has_file_to_upload, image_tag
 
@@ -521,7 +521,7 @@ class OpenEndedChild(object):
 
         # Find all links in the string.
         links = re.findall(r'(https?://\S+)', string)
-        if len(links)>0:
+        if len(links) > 0:
             has_link = True
 
         # Autolink by wrapping links in anchor tags.
diff --git a/common/lib/xmodule/xmodule/poll_module.py b/common/lib/xmodule/xmodule/poll_module.py
index 2fdb0803d2..f17af2e71c 100644
--- a/common/lib/xmodule/xmodule/poll_module.py
+++ b/common/lib/xmodule/xmodule/poll_module.py
@@ -41,10 +41,12 @@ class PollFields(object):
 class PollModule(PollFields, XModule):
     """Poll Module"""
     js = {
-      'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee')],
-      'js': [resource_string(__name__, 'js/src/poll/poll.js'),
-             resource_string(__name__, 'js/src/poll/poll_main.js')]
-         }
+        'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee')],
+        'js': [
+            resource_string(__name__, 'js/src/poll/poll.js'),
+            resource_string(__name__, 'js/src/poll/poll_main.js')
+        ]
+    }
     css = {'scss': [resource_string(__name__, 'css/poll/display.scss')]}
     js_module_name = "Poll"
 
@@ -94,11 +96,11 @@ class PollModule(PollFields, XModule):
     def get_html(self):
         """Renders parameters to template."""
         params = {
-                  'element_id': self.location.html_id(),
-                  'element_class': self.location.category,
-                  'ajax_url': self.system.ajax_url,
-                  'configuration_json': self.dump_poll(),
-                  }
+            'element_id': self.location.html_id(),
+            'element_class': self.location.category,
+            'ajax_url': self.system.ajax_url,
+            'configuration_json': self.dump_poll(),
+        }
         self.content = self.system.render_template('poll.html', params)
         return self.content
 
@@ -127,13 +129,15 @@ class PollModule(PollFields, XModule):
             answers_to_json[answer['id']] = cgi.escape(answer['text'])
         self.poll_answers = temp_poll_answers
 
-        return json.dumps({'answers': answers_to_json,
+        return json.dumps({
+            'answers': answers_to_json,
             'question': cgi.escape(self.question),
             # to show answered poll after reload:
             'poll_answer': self.poll_answer,
             'poll_answers': self.poll_answers if self.voted else {},
             'total': sum(self.poll_answers.values()) if self.voted else 0,
-            'reset': str(self.descriptor.xml_attributes.get('reset', 'true')).lower()})
+            'reset': str(self.descriptor.xml_attributes.get('reset', 'true')).lower()
+        })
 
 
 class PollDescriptor(PollFields, MakoModuleDescriptor, XmlDescriptor):
diff --git a/common/lib/xmodule/xmodule/public/js/split_test_author_view.js b/common/lib/xmodule/xmodule/public/js/split_test_author_view.js
index 8c4cc866f3..5c229fb5dd 100644
--- a/common/lib/xmodule/xmodule/public/js/split_test_author_view.js
+++ b/common/lib/xmodule/xmodule/public/js/split_test_author_view.js
@@ -1,25 +1,27 @@
 /* JavaScript for editing operations that can be done on the split test author view. */
 window.SplitTestAuthorView = function (runtime, element) {
     var $element = $(element);
+    var splitTestLocator = $element.closest('.studio-xblock-wrapper').data('locator');
 
-    $element.find('.add-missing-groups-button').click(function () {
-        runtime.notify('save', {
-            state: 'start',
-            element: element,
-            message: gettext('Creating missing groups&hellip;')
-        });
-        $.post(runtime.handlerUrl(element, 'add_missing_groups')).done(function() {
+    runtime.listenTo("add-missing-groups", function (parentLocator) {
+        if (splitTestLocator === parentLocator) {
             runtime.notify('save', {
-                state: 'end',
-                element: element
+                state: 'start',
+                element: element,
+                message: gettext('Creating missing groups&hellip;')
             });
-        });
+            $.post(runtime.handlerUrl(element, 'add_missing_groups')).done(function() {
+                runtime.notify('save', {
+                    state: 'end',
+                    element: element
+                });
+            });
+        }
     });
 
     // Listen to delete events so that the view can refresh when the last inactive group is removed.
     runtime.listenTo('deleted-child', function(parentLocator) {
-        var splitTestLocator = $element.closest('.studio-xblock-wrapper').data('locator'),
-            inactiveGroups = $element.find('.is-inactive .studio-xblock-wrapper');
+        var inactiveGroups = $element.find('.is-inactive .studio-xblock-wrapper');
         if (splitTestLocator === parentLocator && inactiveGroups.length === 0) {
             runtime.refreshXBlock($element);
         }
diff --git a/common/lib/xmodule/xmodule/split_test_module.py b/common/lib/xmodule/xmodule/split_test_module.py
index 63f23a824e..890afb75dc 100644
--- a/common/lib/xmodule/xmodule/split_test_module.py
+++ b/common/lib/xmodule/xmodule/split_test_module.py
@@ -12,6 +12,7 @@ from xmodule.progress import Progress
 from xmodule.seq_module import SequenceDescriptor
 from xmodule.studio_editable import StudioEditableModule, StudioEditableDescriptor
 from xmodule.x_module import XModule, module_attr, STUDENT_VIEW
+from xmodule.validation import StudioValidation, StudioValidationMessage
 from xmodule.modulestore.inheritance import UserPartitionList
 
 from lxml import etree
@@ -28,48 +29,6 @@ _ = lambda text: text
 DEFAULT_GROUP_NAME =  _(u'Group ID {group_id}')
 
 
-class ValidationMessageType(object):
-    """
-    The type for a validation message -- currently 'information', 'warning' or 'error'.
-    """
-    information = 'information'
-    warning = 'warning'
-    error = 'error'
-
-    @staticmethod
-    def display_name(message_type):
-        """
-        Returns the display name for the specified validation message type.
-        """
-        if message_type == ValidationMessageType.warning:
-            # Translators: This message will be added to the front of messages of type warning,
-            # e.g. "Warning: this component has not been configured yet".
-            return _(u"Warning")
-        elif message_type == ValidationMessageType.error:
-            # Translators: This message will be added to the front of messages of type error,
-            # e.g. "Error: required field is missing".
-            return _(u"Error")
-        else:
-            return None
-
-
-# TODO: move this into the xblock repo once it has a formal validation contract
-class ValidationMessage(object):
-    """
-    Represents a single validation message for an xblock.
-    """
-    def __init__(self, xblock, message_text, message_type, action_class=None, action_label=None):
-        assert isinstance(message_text, unicode)
-        self.xblock = xblock
-        self.message_text = message_text
-        self.message_type = message_type
-        self.action_class = action_class
-        self.action_label = action_label
-
-    def __unicode__(self):
-        return self.message_text
-
-
 class SplitTestFields(object):
     """Fields needed for split test module"""
     has_children = True
@@ -231,6 +190,13 @@ class SplitTestModule(SplitTestFields, XModule, StudioEditableModule):
             return None
         return partitions_service.get_user_group_for_partition(self.user_partition_id)
 
+    @property
+    def is_configured(self):
+        """
+        Returns true if the split_test instance is associated with a UserPartition.
+        """
+        return self.descriptor.is_configured
+
     def _staff_view(self, context):
         """
         Render the staff view for a split test module.
@@ -283,7 +249,6 @@ class SplitTestModule(SplitTestFields, XModule, StudioEditableModule):
         """
         fragment = Fragment()
         root_xblock = context.get('root_xblock')
-        is_configured = not self.user_partition_id == SplitTestFields.no_partition_selected['value']
         is_root = root_xblock and root_xblock.location == self.location
         active_groups_preview = None
         inactive_groups_preview = None
@@ -300,7 +265,7 @@ class SplitTestModule(SplitTestFields, XModule, StudioEditableModule):
         fragment.add_content(self.system.render_template('split_test_author_view.html', {
             'split_test': self,
             'is_root': is_root,
-            'is_configured': is_configured,
+            'is_configured': self.is_configured,
             'active_groups_preview': active_groups_preview,
             'inactive_groups_preview': inactive_groups_preview,
             'group_configuration_url': self.descriptor.group_configuration_url,
@@ -320,7 +285,7 @@ class SplitTestModule(SplitTestFields, XModule, StudioEditableModule):
             active_child = self.system.get_module(active_child_descriptor)
             rendered_child = active_child.render(StudioEditableModule.get_preview_view_name(active_child), context)
             if active_child.category == 'vertical':
-                group_name, group_id  = self.get_data_for_vertical(active_child)
+                group_name, group_id = self.get_data_for_vertical(active_child)
                 if group_name:
                     rendered_child.content = rendered_child.content.replace(
                         DEFAULT_GROUP_NAME.format(group_id=group_id),
@@ -384,6 +349,13 @@ class SplitTestModule(SplitTestFields, XModule, StudioEditableModule):
                     return (group.name, group.id)
         return (None, None)
 
+    def validate(self):
+        """
+        Message for either error or warning validation message/s.
+
+        Returns message and type. Priority given to error type message.
+        """
+        return self.descriptor.validate()
 
 @XBlock.needs('user_tags')  # pylint: disable=abstract-method
 @XBlock.wants('partitions')
@@ -544,46 +516,94 @@ class SplitTestDescriptor(SplitTestFields, SequenceDescriptor, StudioEditableDes
 
         return active_children, inactive_children
 
-    def validation_messages(self):
+    @property
+    def is_configured(self):
         """
-        Returns a list of validation messages describing the current state of the block. Each message
-        includes a message type indicating whether the message represents information, a warning or an error.
+        Returns true if the split_test instance is associated with a UserPartition.
+        """
+        return not self.user_partition_id == SplitTestFields.no_partition_selected['value']
+
+    def validate(self):
+        """
+        Validates the state of this split_test instance. This is the override of the general XBlock method,
+        and it will also ask its superclass to validate.
+        """
+        validation = super(SplitTestDescriptor, self).validate()
+        split_test_validation = self.validate_split_test()
+
+        if split_test_validation:
+            return validation
+
+        validation = StudioValidation.copy(validation)
+        if validation and (not self.is_configured and len(split_test_validation.messages) == 1):
+            validation.summary = split_test_validation.messages[0]
+        else:
+            validation.summary = self.general_validation_message(split_test_validation)
+            validation.add_messages(split_test_validation)
+
+        return validation
+
+    def validate_split_test(self):
+        """
+        Returns a StudioValidation object describing the current state of the split_test_module
+        (not including superclass validation messages).
         """
         _ = self.runtime.service(self, "i18n").ugettext  # pylint: disable=redefined-outer-name
-        messages = []
+        split_validation = StudioValidation(self.location)
         if self.user_partition_id < 0:
-            messages.append(ValidationMessage(
-                self,
-                _(u"The experiment is not associated with a group configuration."),
-                ValidationMessageType.warning,
-                'edit-button',
-                _(u"Select a Group Configuration")
-            ))
+            split_validation.add(
+                StudioValidationMessage(
+                    StudioValidationMessage.NOT_CONFIGURED,
+                    _(u"The experiment is not associated with a group configuration."),
+                    action_class='edit-button',
+                    action_label=_(u"Select a Group Configuration")
+                )
+            )
         else:
             user_partition = self.get_selected_partition()
             if not user_partition:
-                messages.append(ValidationMessage(
-                    self,
-                    _(u"The experiment uses a deleted group configuration. Select a valid group configuration or delete this experiment."),
-                    ValidationMessageType.error
-                ))
+                split_validation.add(
+                    StudioValidationMessage(
+                        StudioValidationMessage.ERROR,
+                        _(u"The experiment uses a deleted group configuration. Select a valid group configuration or delete this experiment.")
+                    )
+                )
             else:
                 [active_children, inactive_children] = self.active_and_inactive_children()
                 if len(active_children) < len(user_partition.groups):
-                    messages.append(ValidationMessage(
-                        self,
-                        _(u"The experiment does not contain all of the groups in the configuration."),
-                        ValidationMessageType.error,
-                        'add-missing-groups-button',
-                        _(u"Add Missing Groups")
-                    ))
+                    split_validation.add(
+                        StudioValidationMessage(
+                            StudioValidationMessage.ERROR,
+                            _(u"The experiment does not contain all of the groups in the configuration."),
+                            action_runtime_event='add-missing-groups',
+                            action_label=_(u"Add Missing Groups")
+                        )
+                    )
                 if len(inactive_children) > 0:
-                    messages.append(ValidationMessage(
-                        self,
-                        _(u"The experiment has an inactive group. Move content into active groups, then delete the inactive group."),
-                        ValidationMessageType.warning
-                    ))
-        return messages
+                    split_validation.add(
+                        StudioValidationMessage(
+                            StudioValidationMessage.WARNING,
+                            _(u"The experiment has an inactive group. Move content into active groups, then delete the inactive group.")
+                        )
+                    )
+        return split_validation
+
+    def general_validation_message(self, validation=None):
+        """
+        Returns just a summary message about whether or not this split_test instance has
+        validation issues (not including superclass validation messages). If the split_test instance
+        validates correctly, this method returns None.
+        """
+        if validation is None:
+            validation = self.validate_split_test()
+
+        if not validation:
+            has_error = any(message.type == StudioValidationMessage.ERROR for message in validation.messages)
+            return StudioValidationMessage(
+                StudioValidationMessage.ERROR if has_error else StudioValidationMessage.WARNING,
+                _(u"This content experiment has issues that affect content visibility.")
+            )
+        return None
 
     @XBlock.handler
     def add_missing_groups(self, request, suffix=''):  # pylint: disable=unused-argument
@@ -603,7 +623,7 @@ class SplitTestDescriptor(SplitTestFields, SequenceDescriptor, StudioEditableDes
                 changed = True
 
         if changed:
-            # TODO user.id - to be fixed by Publishing team
+            # user.id - to be fixed by Publishing team
             self.system.modulestore.update_item(self, None)
         return Response()
 
@@ -648,19 +668,3 @@ class SplitTestDescriptor(SplitTestFields, SequenceDescriptor, StudioEditableDes
         )
         self.children.append(dest_usage_key)  # pylint: disable=no-member
         self.group_id_to_child[unicode(group.id)] = dest_usage_key
-
-    @property
-    def general_validation_message(self):
-        """
-        Message for either error or warning validation message/s.
-
-        Returns message and type. Priority given to error type message.
-        """
-        validation_messages = self.validation_messages()
-        if validation_messages:
-            has_error = any(message.message_type == ValidationMessageType.error for message in validation_messages)
-            return {
-                'message': _(u"This content experiment has issues that affect content visibility."),
-                'type': ValidationMessageType.error if has_error else ValidationMessageType.warning,
-            }
-        return None
diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py
index 86abf9fd43..960f57c16f 100644
--- a/common/lib/xmodule/xmodule/tests/__init__.py
+++ b/common/lib/xmodule/xmodule/tests/__init__.py
@@ -28,7 +28,7 @@ from xmodule.mako_module import MakoDescriptorSystem
 from xmodule.error_module import ErrorDescriptor
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.mongo.draft import DraftModuleStore
-from xmodule.modulestore.draft_and_published import DIRECT_ONLY_CATEGORIES
+from xmodule.modulestore.draft_and_published import DIRECT_ONLY_CATEGORIES, ModuleStoreDraftAndPublished
 
 
 MODULE_DIR = path(__file__).dirname()
@@ -249,6 +249,7 @@ class LazyFormat(object):
     def __repr__(self):
         return unicode(self)
 
+
 class CourseComparisonTest(BulkAssertionTest):
     """
     Mixin that has methods for comparing courses for equality.
@@ -354,20 +355,22 @@ class CourseComparisonTest(BulkAssertionTest):
                 self.assertGreater(len(expected_items), 0)
                 self._assertCoursesEqual(expected_items, actual_items, actual_course_key)
 
-        with expected_store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, expected_course_key):
-            with actual_store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, actual_course_key):
-                # compare draft
-                if expected_store.get_modulestore_type(None) == ModuleStoreEnum.Type.split:
-                    revision = ModuleStoreEnum.RevisionOption.draft_only
-                else:
-                    revision = None
-                expected_items = expected_store.get_items(expected_course_key, revision=revision)
-                if actual_store.get_modulestore_type(None) == ModuleStoreEnum.Type.split:
-                    revision = ModuleStoreEnum.RevisionOption.draft_only
-                else:
-                    revision = None
-                actual_items = actual_store.get_items(actual_course_key, revision=revision)
-                self._assertCoursesEqual(expected_items, actual_items, actual_course_key, expect_drafts=True)
+        # if the modulestore supports having a draft branch
+        if isinstance(expected_store, ModuleStoreDraftAndPublished):
+            with expected_store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, expected_course_key):
+                with actual_store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, actual_course_key):
+                    # compare draft
+                    if expected_store.get_modulestore_type(None) == ModuleStoreEnum.Type.split:
+                        revision = ModuleStoreEnum.RevisionOption.draft_only
+                    else:
+                        revision = None
+                    expected_items = expected_store.get_items(expected_course_key, revision=revision)
+                    if actual_store.get_modulestore_type(None) == ModuleStoreEnum.Type.split:
+                        revision = ModuleStoreEnum.RevisionOption.draft_only
+                    else:
+                        revision = None
+                    actual_items = actual_store.get_items(actual_course_key, revision=revision)
+                    self._assertCoursesEqual(expected_items, actual_items, actual_course_key, expect_drafts=True)
 
     def _assertCoursesEqual(self, expected_items, actual_items, actual_course_key, expect_drafts=False):
         with self.bulk_assertions():
diff --git a/common/lib/xmodule/xmodule/tests/data/xml-course-root b/common/lib/xmodule/xmodule/tests/data/xml-course-root
new file mode 120000
index 0000000000..83890f4542
--- /dev/null
+++ b/common/lib/xmodule/xmodule/tests/data/xml-course-root
@@ -0,0 +1 @@
+../../../../../test/data/
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py
index a113e8e277..8f1d888665 100644
--- a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py
@@ -12,6 +12,7 @@ from opaque_keys.edx.locations import Location
 
 from . import get_test_system
 
+
 class AnnotatableModuleTestCase(unittest.TestCase):
     sample_xml = '''
         <annotatable display_name="Iliad">
@@ -42,7 +43,7 @@ class AnnotatableModuleTestCase(unittest.TestCase):
         el = etree.fromstring('<annotation title="bar" body="foo" problem="0">test</annotation>')
 
         expected_attr = {
-            'data-comment-body': {'value': 'foo', '_delete': 'body' },
+            'data-comment-body': {'value': 'foo', '_delete': 'body'},
             'data-comment-title': {'value': 'bar', '_delete': 'title'},
             'data-problem-id': {'value': '0', '_delete': 'problem'}
         }
@@ -56,7 +57,7 @@ class AnnotatableModuleTestCase(unittest.TestCase):
         xml = '<annotation title="x" body="y" problem="0">test</annotation>'
         el = etree.fromstring(xml)
 
-        expected_attr = { 'class': { 'value': 'annotatable-span highlight' } }
+        expected_attr = {'class': {'value': 'annotatable-span highlight'}}
         actual_attr = self.annotatable._get_annotation_class_attr(0, el)
 
         self.assertIsInstance(actual_attr, dict)
@@ -69,9 +70,11 @@ class AnnotatableModuleTestCase(unittest.TestCase):
             el = etree.fromstring(xml.format(highlight=color))
             value = 'annotatable-span highlight highlight-{highlight}'.format(highlight=color)
 
-            expected_attr = { 'class': {
-                'value': value,
-                '_delete': 'highlight' }
+            expected_attr = {
+                'class': {
+                    'value': value,
+                    '_delete': 'highlight'
+                }
             }
             actual_attr = self.annotatable._get_annotation_class_attr(0, el)
 
@@ -83,9 +86,11 @@ class AnnotatableModuleTestCase(unittest.TestCase):
 
         for invalid_color in ['rainbow', 'blink', 'invisible', '', None]:
             el = etree.fromstring(xml.format(highlight=invalid_color))
-            expected_attr = { 'class': {
-                'value': 'annotatable-span highlight',
-                '_delete': 'highlight' }
+            expected_attr = {
+                'class': {
+                    'value': 'annotatable-span highlight',
+                    '_delete': 'highlight'
+                }
             }
             actual_attr = self.annotatable._get_annotation_class_attr(0, el)
 
diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index 439a2a0cf4..5208b17382 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -1890,3 +1890,29 @@ class TestProblemCheckTracking(unittest.TestCase):
                 'variant': ''
             }
         })
+
+    def test_get_answer_with_jump_to_id_urls(self):
+        """
+        Make sure replace_jump_to_id_urls() is called in get_answer.
+        """
+        problem_xml = textwrap.dedent("""
+        <problem>
+            <p>What is 1+4?</p>
+                <numericalresponse answer="5">
+                  <formulaequationinput />
+                </numericalresponse>
+
+                <solution>
+                <div class="detailed-solution">
+                <p>Explanation</p>
+                <a href="/jump_to_id/c0f8d54964bc44a4a1deb8ecce561ecd">here's the same link to the hint page.</a>
+                </div>
+                </solution>
+        </problem>
+        """)
+
+        data = dict()
+        problem = CapaFactory.create(showanswer='always', xml=problem_xml)
+        problem.runtime.replace_jump_to_id_urls = Mock()
+        problem.get_answer(data)
+        self.assertTrue(problem.runtime.replace_jump_to_id_urls.called)
diff --git a/common/lib/xmodule/xmodule/tests/test_fields.py b/common/lib/xmodule/xmodule/tests/test_fields.py
index d00d8f85c7..fd66869dba 100644
--- a/common/lib/xmodule/xmodule/tests/test_fields.py
+++ b/common/lib/xmodule/xmodule/tests/test_fields.py
@@ -11,46 +11,60 @@ class DateTest(unittest.TestCase):
     date = Date()
 
     def compare_dates(self, dt1, dt2, expected_delta):
-        self.assertEqual(dt1 - dt2, expected_delta, str(dt1) + "-"
-                                                    + str(dt2) + "!=" + str(expected_delta))
+        self.assertEqual(
+            dt1 - dt2,
+            expected_delta,
+            str(dt1) + "-" + str(dt2) + "!=" + str(expected_delta)
+        )
 
     def test_from_json(self):
-        '''Test conversion from iso compatible date strings to struct_time'''
+        """Test conversion from iso compatible date strings to struct_time"""
         self.compare_dates(
             DateTest.date.from_json("2013-01-01"),
             DateTest.date.from_json("2012-12-31"),
-            datetime.timedelta(days=1))
+            datetime.timedelta(days=1)
+        )
         self.compare_dates(
             DateTest.date.from_json("2013-01-01T00"),
             DateTest.date.from_json("2012-12-31T23"),
-            datetime.timedelta(hours=1))
+            datetime.timedelta(hours=1)
+        )
         self.compare_dates(
             DateTest.date.from_json("2013-01-01T00:00"),
             DateTest.date.from_json("2012-12-31T23:59"),
-            datetime.timedelta(minutes=1))
+            datetime.timedelta(minutes=1)
+        )
         self.compare_dates(
             DateTest.date.from_json("2013-01-01T00:00:00"),
             DateTest.date.from_json("2012-12-31T23:59:59"),
-            datetime.timedelta(seconds=1))
+            datetime.timedelta(seconds=1)
+        )
         self.compare_dates(
             DateTest.date.from_json("2013-01-01T00:00:00Z"),
             DateTest.date.from_json("2012-12-31T23:59:59Z"),
-            datetime.timedelta(seconds=1))
+            datetime.timedelta(seconds=1)
+        )
         self.compare_dates(
             DateTest.date.from_json("2012-12-31T23:00:01-01:00"),
             DateTest.date.from_json("2013-01-01T00:00:00+01:00"),
-            datetime.timedelta(hours=1, seconds=1))
+            datetime.timedelta(hours=1, seconds=1)
+        )
 
     def test_enforce_type(self):
         self.assertEqual(DateTest.date.enforce_type(None), None)
         self.assertEqual(DateTest.date.enforce_type(""), None)
-        self.assertEqual(DateTest.date.enforce_type("2012-12-31T23:00:01"),
-            datetime.datetime(2012, 12, 31, 23, 0, 1, tzinfo=UTC()))
-        self.assertEqual(DateTest.date.enforce_type(1234567890000),
-            datetime.datetime(2009, 2, 13, 23, 31, 30, tzinfo=UTC()))
-        self.assertEqual(DateTest.date.enforce_type(
-            datetime.datetime(2014, 5, 9, 21, 1, 27, tzinfo=UTC())),
-            datetime.datetime(2014, 5, 9, 21, 1, 27, tzinfo=UTC()))
+        self.assertEqual(
+            DateTest.date.enforce_type("2012-12-31T23:00:01"),
+            datetime.datetime(2012, 12, 31, 23, 0, 1, tzinfo=UTC())
+        )
+        self.assertEqual(
+            DateTest.date.enforce_type(1234567890000),
+            datetime.datetime(2009, 2, 13, 23, 31, 30, tzinfo=UTC())
+        )
+        self.assertEqual(
+            DateTest.date.enforce_type(datetime.datetime(2014, 5, 9, 21, 1, 27, tzinfo=UTC())),
+            datetime.datetime(2014, 5, 9, 21, 1, 27, tzinfo=UTC())
+        )
         with self.assertRaises(TypeError):
             DateTest.date.enforce_type([1])
 
@@ -64,10 +78,12 @@ class DateTest(unittest.TestCase):
         current = datetime.datetime.today()
         self.assertEqual(
             datetime.datetime(current.year, 3, 12, 12, tzinfo=UTC()),
-            DateTest.date.from_json("March 12 12:00"))
+            DateTest.date.from_json("March 12 12:00")
+        )
         self.assertEqual(
             datetime.datetime(current.year, 12, 4, 16, 30, tzinfo=UTC()),
-            DateTest.date.from_json("December 4 16:30"))
+            DateTest.date.from_json("December 4 16:30")
+        )
         self.assertIsNone(DateTest.date.from_json("12 12:00"))
 
     def test_non_std_from_json(self):
@@ -76,27 +92,29 @@ class DateTest(unittest.TestCase):
         """
         now = datetime.datetime.now(UTC())
         delta = now - datetime.datetime.fromtimestamp(0, UTC())
-        self.assertEqual(DateTest.date.from_json(delta.total_seconds() * 1000),
-            now)
+        self.assertEqual(
+            DateTest.date.from_json(delta.total_seconds() * 1000),  # pylint: disable=maybe-no-member
+            now
+        )
         yesterday = datetime.datetime.now(UTC()) - datetime.timedelta(days=-1)
         self.assertEqual(DateTest.date.from_json(yesterday), yesterday)
 
     def test_to_json(self):
-        '''
+        """
         Test converting time reprs to iso dates
-        '''
+        """
         self.assertEqual(
-            DateTest.date.to_json(
-                datetime.datetime.strptime("2012-12-31T23:59:59Z", "%Y-%m-%dT%H:%M:%SZ")),
-            "2012-12-31T23:59:59Z")
+            DateTest.date.to_json(datetime.datetime.strptime("2012-12-31T23:59:59Z", "%Y-%m-%dT%H:%M:%SZ")),
+            "2012-12-31T23:59:59Z"
+        )
         self.assertEqual(
-            DateTest.date.to_json(
-                DateTest.date.from_json("2012-12-31T23:59:59Z")),
-            "2012-12-31T23:59:59Z")
+            DateTest.date.to_json(DateTest.date.from_json("2012-12-31T23:59:59Z")),
+            "2012-12-31T23:59:59Z"
+        )
         self.assertEqual(
-            DateTest.date.to_json(
-                DateTest.date.from_json("2012-12-31T23:00:01-01:00")),
-            "2012-12-31T23:00:01-01:00")
+            DateTest.date.to_json(DateTest.date.from_json("2012-12-31T23:00:01-01:00")),
+            "2012-12-31T23:00:01-01:00"
+        )
         with self.assertRaises(TypeError):
             DateTest.date.to_json('2012-12-31T23:00:01-01:00')
 
@@ -117,11 +135,14 @@ class TimedeltaTest(unittest.TestCase):
 
     def test_enforce_type(self):
         self.assertEqual(TimedeltaTest.delta.enforce_type(None), None)
-        self.assertEqual(TimedeltaTest.delta.enforce_type(
-            datetime.timedelta(days=1, seconds=46799)),
-            datetime.timedelta(days=1, seconds=46799))
-        self.assertEqual(TimedeltaTest.delta.enforce_type('1 day 46799 seconds'),
-            datetime.timedelta(days=1, seconds=46799))
+        self.assertEqual(
+            TimedeltaTest.delta.enforce_type(datetime.timedelta(days=1, seconds=46799)),
+            datetime.timedelta(days=1, seconds=46799)
+        )
+        self.assertEqual(
+            TimedeltaTest.delta.enforce_type('1 day 46799 seconds'),
+            datetime.timedelta(days=1, seconds=46799)
+        )
         with self.assertRaises(TypeError):
             TimedeltaTest.delta.enforce_type([1])
 
@@ -137,8 +158,10 @@ class TimeInfoTest(unittest.TestCase):
         due_date = datetime.datetime(2000, 4, 14, 10, tzinfo=UTC())
         grace_pd_string = '1 day 12 hours 59 minutes 59 seconds'
         timeinfo = TimeInfo(due_date, grace_pd_string)
-        self.assertEqual(timeinfo.close_date,
-            due_date + Timedelta().from_json(grace_pd_string))
+        self.assertEqual(
+            timeinfo.close_date,
+            due_date + Timedelta().from_json(grace_pd_string)
+        )
 
 
 class RelativeTimeTest(unittest.TestCase):
@@ -168,11 +191,14 @@ class RelativeTimeTest(unittest.TestCase):
 
     def test_enforce_type(self):
         self.assertEqual(RelativeTimeTest.delta.enforce_type(None), None)
-        self.assertEqual(RelativeTimeTest.delta.enforce_type(
-            datetime.timedelta(days=1, seconds=46799)),
-            datetime.timedelta(days=1, seconds=46799))
-        self.assertEqual(RelativeTimeTest.delta.enforce_type('0:05:07'),
-            datetime.timedelta(seconds=307))
+        self.assertEqual(
+            RelativeTimeTest.delta.enforce_type(datetime.timedelta(days=1, seconds=46799)),
+            datetime.timedelta(days=1, seconds=46799)
+        )
+        self.assertEqual(
+            RelativeTimeTest.delta.enforce_type('0:05:07'),
+            datetime.timedelta(seconds=307)
+        )
         with self.assertRaises(TypeError):
             RelativeTimeTest.delta.enforce_type([1])
 
diff --git a/common/lib/xmodule/xmodule/tests/test_html_module.py b/common/lib/xmodule/xmodule/tests/test_html_module.py
index 2f2e9114c6..da1e0d49a6 100644
--- a/common/lib/xmodule/xmodule/tests/test_html_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_html_module.py
@@ -7,6 +7,7 @@ from xmodule.html_module import HtmlModule
 
 from . import get_test_system
 
+
 class HtmlModuleSubstitutionTestCase(unittest.TestCase):
     descriptor = Mock()
 
@@ -17,7 +18,6 @@ class HtmlModuleSubstitutionTestCase(unittest.TestCase):
         module = HtmlModule(self.descriptor, module_system, field_data, Mock())
         self.assertEqual(module.get_html(), str(module_system.anonymous_student_id))
 
-
     def test_substitution_without_magic_string(self):
         sample_xml = '''
             <html>
@@ -29,7 +29,6 @@ class HtmlModuleSubstitutionTestCase(unittest.TestCase):
         module = HtmlModule(self.descriptor, module_system, field_data, Mock())
         self.assertEqual(module.get_html(), sample_xml)
 
-
     def test_substitution_without_anonymous_student_id(self):
         sample_xml = '''%%USER_ID%%'''
         field_data = DictFieldData({'data': sample_xml})
@@ -37,4 +36,3 @@ class HtmlModuleSubstitutionTestCase(unittest.TestCase):
         module_system.anonymous_student_id = None
         module = HtmlModule(self.descriptor, module_system, field_data, Mock())
         self.assertEqual(module.get_html(), sample_xml)
-
diff --git a/common/lib/xmodule/xmodule/tests/test_progress.py b/common/lib/xmodule/xmodule/tests/test_progress.py
index 33d129663e..74835ffc97 100644
--- a/common/lib/xmodule/xmodule/tests/test_progress.py
+++ b/common/lib/xmodule/xmodule/tests/test_progress.py
@@ -23,12 +23,12 @@ class ProgressTest(unittest.TestCase):
 
     def test_create_object(self):
         # These should work:
-        p = Progress(0, 2)
-        p = Progress(1, 2)
-        p = Progress(2, 2)
+        prg1 = Progress(0, 2)  # pylint: disable=W0612
+        prg2 = Progress(1, 2)  # pylint: disable=W0612
+        prg3 = Progress(2, 2)  # pylint: disable=W0612
 
-        p = Progress(2.5, 5.0)
-        p = Progress(3.7, 12.3333)
+        prg4 = Progress(2.5, 5.0)  # pylint: disable=W0612
+        prg5 = Progress(3.7, 12.3333)  # pylint: disable=W0612
 
         # These shouldn't
         self.assertRaises(ValueError, Progress, 0, 0)
@@ -44,10 +44,10 @@ class ProgressTest(unittest.TestCase):
         self.assertEqual((0, 2), Progress(-2, 2).frac())
 
     def test_frac(self):
-        p = Progress(1, 2)
-        (a, b) = p.frac()
-        self.assertEqual(a, 1)
-        self.assertEqual(b, 2)
+        prg = Progress(1, 2)
+        (a_mem, b_mem) = prg.frac()
+        self.assertEqual(a_mem, 1)
+        self.assertEqual(b_mem, 2)
 
     def test_percent(self):
         self.assertEqual(self.not_started.percent(), 0)
@@ -98,38 +98,38 @@ class ProgressTest(unittest.TestCase):
     def test_to_js_detail_str(self):
         '''Test the Progress.to_js_detail_str() method'''
         f = Progress.to_js_detail_str
-        for p in (self.not_started, self.half_done, self.done):
-            self.assertEqual(f(p), str(p))
+        for prg in (self.not_started, self.half_done, self.done):
+            self.assertEqual(f(prg), str(prg))
         # But None should be encoded as 0
         self.assertEqual(f(None), "0")
 
     def test_add(self):
         '''Test the Progress.add_counts() method'''
-        p = Progress(0, 2)
-        p2 = Progress(1, 3)
-        p3 = Progress(2, 5)
-        pNone = None
+        prg1 = Progress(0, 2)
+        prg2 = Progress(1, 3)
+        prg3 = Progress(2, 5)
+        prg_none = None
         add = lambda a, b: Progress.add_counts(a, b).frac()
 
-        self.assertEqual(add(p, p), (0, 4))
-        self.assertEqual(add(p, p2), (1, 5))
-        self.assertEqual(add(p2, p3), (3, 8))
+        self.assertEqual(add(prg1, prg1), (0, 4))
+        self.assertEqual(add(prg1, prg2), (1, 5))
+        self.assertEqual(add(prg2, prg3), (3, 8))
 
-        self.assertEqual(add(p2, pNone), p2.frac())
-        self.assertEqual(add(pNone, p2), p2.frac())
+        self.assertEqual(add(prg2, prg_none), prg2.frac())
+        self.assertEqual(add(prg_none, prg2), prg2.frac())
 
     def test_equality(self):
         '''Test that comparing Progress objects for equality
         works correctly.'''
-        p = Progress(1, 2)
-        p2 = Progress(2, 4)
-        p3 = Progress(1, 2)
-        self.assertTrue(p == p3)
-        self.assertFalse(p == p2)
+        prg1 = Progress(1, 2)
+        prg2 = Progress(2, 4)
+        prg3 = Progress(1, 2)
+        self.assertTrue(prg1 == prg3)
+        self.assertFalse(prg1 == prg2)
 
         # Check != while we're at it
-        self.assertTrue(p != p2)
-        self.assertFalse(p != p3)
+        self.assertTrue(prg1 != prg2)
+        self.assertFalse(prg1 != prg3)
 
 
 class ModuleProgressTest(unittest.TestCase):
@@ -137,6 +137,6 @@ class ModuleProgressTest(unittest.TestCase):
     '''
     def test_xmodule_default(self):
         '''Make sure default get_progress exists, returns None'''
-        xm = x_module.XModule(Mock(), get_test_system(), DictFieldData({'location': 'a://b/c/d/e'}), Mock())
-        p = xm.get_progress()
-        self.assertEqual(p, None)
+        xmod = x_module.XModule(Mock(), get_test_system(), DictFieldData({'location': 'a://b/c/d/e'}), Mock())
+        prg = xmod.get_progress()
+        self.assertEqual(prg, None)
diff --git a/common/lib/xmodule/xmodule/tests/test_split_test_module.py b/common/lib/xmodule/xmodule/tests/test_split_test_module.py
index a7484d902e..b82310c845 100644
--- a/common/lib/xmodule/xmodule/tests/test_split_test_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_split_test_module.py
@@ -10,7 +10,8 @@ from xmodule.tests.xml import factories as xml
 from xmodule.tests.xml import XModuleXmlImportTest
 from xmodule.tests import get_test_system
 from xmodule.x_module import AUTHOR_VIEW, STUDENT_VIEW
-from xmodule.split_test_module import SplitTestDescriptor, SplitTestFields, ValidationMessageType
+from xmodule.validation import StudioValidationMessage
+from xmodule.split_test_module import SplitTestDescriptor, SplitTestFields
 from xmodule.partitions.partitions import Group, UserPartition
 from xmodule.partitions.test_partitions import StaticPartitionService, MemoryUserTagsService
 
@@ -320,14 +321,6 @@ class SplitTestModuleStudioTest(SplitTestModuleTest):
         self.assertEqual(active_children, [])
         self.assertEqual(inactive_children, children)
 
-    def test_validation_message_types(self):
-        """
-        Test the behavior of validation message types.
-        """
-        self.assertEqual(ValidationMessageType.display_name(ValidationMessageType.error), u"Error")
-        self.assertEqual(ValidationMessageType.display_name(ValidationMessageType.warning), u"Warning")
-        self.assertIsNone(ValidationMessageType.display_name(ValidationMessageType.information))
-
     def test_validation_messages(self):
         """
         Test the validation messages produced for different split test configurations.
@@ -335,122 +328,128 @@ class SplitTestModuleStudioTest(SplitTestModuleTest):
         split_test_module = self.split_test_module
 
         def verify_validation_message(message, expected_message, expected_message_type,
-                                      expected_action_class=None, expected_action_label=None):
+                                      expected_action_class=None, expected_action_label=None,
+                                      expected_action_runtime_event=None):
             """
             Verify that the validation message has the expected validation message and type.
             """
-            self.assertEqual(unicode(message), expected_message)
-            self.assertEqual(message.message_type, expected_message_type)
-            self.assertEqual(message.action_class, expected_action_class)
-            self.assertEqual(message.action_label, expected_action_label)
+            self.assertEqual(message.text, expected_message)
+            self.assertEqual(message.type, expected_message_type)
+            if expected_action_class:
+                self.assertEqual(message.action_class, expected_action_class)
+            else:
+                self.assertFalse(hasattr(message, "action_class"))
+            if expected_action_label:
+                self.assertEqual(message.action_label, expected_action_label)
+            else:
+                self.assertFalse(hasattr(message, "action_label"))
+            if expected_action_runtime_event:
+                self.assertEqual(message.action_runtime_event, expected_action_runtime_event)
+            else:
+                self.assertFalse(hasattr(message, "action_runtime_event"))
 
-        def verify_general_validation_message(general_validation, expected_message, expected_message_type):
+        def verify_summary_message(general_validation, expected_message, expected_message_type):
             """
             Verify that the general validation message has the expected validation message and type.
             """
-            self.assertEqual(unicode(general_validation['message']), expected_message)
-            self.assertEqual(general_validation['type'], expected_message_type)
+            self.assertEqual(general_validation.text, expected_message)
+            self.assertEqual(general_validation.type, expected_message_type)
 
         # Verify the messages for an unconfigured user partition
         split_test_module.user_partition_id = -1
-        messages = split_test_module.validation_messages()
-        self.assertEqual(len(messages), 1)
+        validation = split_test_module.validate()
+        self.assertEqual(len(validation.messages), 0)
         verify_validation_message(
-            messages[0],
+            validation.summary,
             u"The experiment is not associated with a group configuration.",
-            ValidationMessageType.warning,
+            StudioValidationMessage.NOT_CONFIGURED,
             'edit-button',
             u"Select a Group Configuration",
         )
-        verify_general_validation_message(
-            split_test_module.general_validation_message,
-            u"This content experiment has issues that affect content visibility.",
-            ValidationMessageType.warning
-        )
 
         # Verify the messages for a correctly configured split_test
         split_test_module.user_partition_id = 0
         split_test_module.user_partitions = [
             UserPartition(0, 'first_partition', 'First Partition', [Group("0", 'alpha'), Group("1", 'beta')])
         ]
-        messages = split_test_module.validation_messages()
-        self.assertEqual(len(messages), 0)
-        self.assertIsNone(split_test_module.general_validation_message, None)
+        validation = split_test_module.validate_split_test()
+        self.assertTrue(validation)
+        self.assertIsNone(split_test_module.general_validation_message(), None)
 
         # Verify the messages for a split test with too few groups
         split_test_module.user_partitions = [
             UserPartition(0, 'first_partition', 'First Partition',
                           [Group("0", 'alpha'), Group("1", 'beta'), Group("2", 'gamma')])
         ]
-        messages = split_test_module.validation_messages()
-        self.assertEqual(len(messages), 1)
+        validation = split_test_module.validate()
+        self.assertEqual(len(validation.messages), 1)
         verify_validation_message(
-            messages[0],
+            validation.messages[0],
             u"The experiment does not contain all of the groups in the configuration.",
-            ValidationMessageType.error,
-            'add-missing-groups-button',
-            u"Add Missing Groups"
+            StudioValidationMessage.ERROR,
+            expected_action_runtime_event='add-missing-groups',
+            expected_action_label=u"Add Missing Groups"
         )
-        verify_general_validation_message(
-            split_test_module.general_validation_message,
+        verify_summary_message(
+            validation.summary,
             u"This content experiment has issues that affect content visibility.",
-            ValidationMessageType.error
+            StudioValidationMessage.ERROR
         )
         # Verify the messages for a split test with children that are not associated with any group
         split_test_module.user_partitions = [
             UserPartition(0, 'first_partition', 'First Partition',
                           [Group("0", 'alpha')])
         ]
-        messages = split_test_module.validation_messages()
-        self.assertEqual(len(messages), 1)
+        validation = split_test_module.validate()
+        self.assertEqual(len(validation.messages), 1)
         verify_validation_message(
-            messages[0],
+            validation.messages[0],
             u"The experiment has an inactive group. Move content into active groups, then delete the inactive group.",
-            ValidationMessageType.warning
+            StudioValidationMessage.WARNING
         )
-        verify_general_validation_message(
-            split_test_module.general_validation_message,
+        verify_summary_message(
+            validation.summary,
             u"This content experiment has issues that affect content visibility.",
-            ValidationMessageType.warning
+            StudioValidationMessage.WARNING
         )
         # Verify the messages for a split test with both missing and inactive children
         split_test_module.user_partitions = [
             UserPartition(0, 'first_partition', 'First Partition',
                           [Group("0", 'alpha'), Group("2", 'gamma')])
         ]
-        messages = split_test_module.validation_messages()
-        self.assertEqual(len(messages), 2)
+        validation = split_test_module.validate()
+        self.assertEqual(len(validation.messages), 2)
         verify_validation_message(
-            messages[0],
+            validation.messages[0],
             u"The experiment does not contain all of the groups in the configuration.",
-            ValidationMessageType.error,
-            'add-missing-groups-button',
-            u"Add Missing Groups"
+            StudioValidationMessage.ERROR,
+            expected_action_runtime_event='add-missing-groups',
+            expected_action_label=u"Add Missing Groups"
         )
         verify_validation_message(
-            messages[1],
+            validation.messages[1],
             u"The experiment has an inactive group. Move content into active groups, then delete the inactive group.",
-            ValidationMessageType.warning
+            StudioValidationMessage.WARNING
         )
         # With two messages of type error and warning priority given to error.
-        verify_general_validation_message(
-            split_test_module.general_validation_message,
+        verify_summary_message(
+            validation.summary,
             u"This content experiment has issues that affect content visibility.",
-            ValidationMessageType.error
+            StudioValidationMessage.ERROR
         )
 
         # Verify the messages for a split test referring to a non-existent user partition
         split_test_module.user_partition_id = 2
-        messages = split_test_module.validation_messages()
-        self.assertEqual(len(messages), 1)
+        validation = split_test_module.validate()
+        self.assertEqual(len(validation.messages), 1)
         verify_validation_message(
-            messages[0],
+            validation.messages[0],
             u"The experiment uses a deleted group configuration. "
             u"Select a valid group configuration or delete this experiment.",
-            ValidationMessageType.error
+            StudioValidationMessage.ERROR
         )
-        verify_general_validation_message(
-            split_test_module.general_validation_message,
+        verify_summary_message(
+            validation.summary,
             u"This content experiment has issues that affect content visibility.",
-            ValidationMessageType.error
+            StudioValidationMessage.ERROR
         )
diff --git a/common/lib/xmodule/xmodule/tests/test_util_open_ended.py b/common/lib/xmodule/xmodule/tests/test_util_open_ended.py
index c40a7a9a5d..0f797b1d63 100644
--- a/common/lib/xmodule/xmodule/tests/test_util_open_ended.py
+++ b/common/lib/xmodule/xmodule/tests/test_util_open_ended.py
@@ -20,6 +20,7 @@ S3_INTERFACE = {
     "storage_bucket_name": "",
 }
 
+
 class MockS3Key(object):
     """
     Mock an S3 Key object from boto.  Used for file upload testing.
@@ -96,6 +97,7 @@ class DummyModulestore(object):
         descriptor.xmodule_runtime = self.get_module_system(descriptor)
         return descriptor
 
+
 def serialize_child_history(task_state):
     """
     To json serialize feedback and post_assessment in child_history of task state.
@@ -107,6 +109,7 @@ def serialize_child_history(task_state):
                 attempt["post_assessment"]["feedback"] = json.dumps(attempt["post_assessment"].get("feedback"))
             task_state["child_history"][i]["post_assessment"] = json.dumps(attempt["post_assessment"])
 
+
 def serialize_open_ended_instance_state(json_str):
     """
     To json serialize task_states and old_task_states in instance state.
@@ -933,4 +936,4 @@ TEST_STATE_AI2_INVALID = ["{\"child_created\": false, \"child_attempts\": 0, \"v
 TEST_STATE_SINGLE = ["{\"child_created\": false, \"child_attempts\": 1, \"version\": 1, \"child_history\": [{\"answer\": \"'All of us can think of a book that we hope none of our children or any other children have taken off the shelf. But if I have the right to remove that book from the shelf -- that work I abhor -- then you also have exactly the same right and so does everyone else. And then we have no books left on the shelf for any of us.' --Katherine Paterson, Author\\r<br><br>Write a persuasive essay to a newspaper reflecting your views on censorship in libraries. Do you believe that certain materials, such as books, music, movies, magazines, etc., should be removed from the shelves if they are found offensive? Support your position with convincing arguments from your own experience, observations, and/or reading. \", \"post_assessment\": \"[3, 3, 2, 2, 2]\", \"score\": 12}], \"max_score\": 12, \"child_state\": \"done\"}"]
 
 # Peer grading state.
-TEST_STATE_PE_SINGLE = ["{\"child_created\": false, \"child_attempts\": 0, \"version\": 1, \"child_history\": [{\"answer\": \"Passage its ten led hearted removal cordial. Preference any astonished unreserved mrs. Prosperous understood middletons in conviction an uncommonly do. Supposing so be resolving breakfast am or perfectly. Is drew am hill from mr. Valley by oh twenty direct me so. Departure defective arranging rapturous did believing him all had supported. Family months lasted simple set nature vulgar him. Picture for attempt joy excited ten carried manners talking how. Suspicion neglected he resolving agreement perceived at an. \\r<br><br>Ye on properly handsome returned throwing am no whatever. In without wishing he of picture no exposed talking minutes. Curiosity continual belonging offending so explained it exquisite. Do remember to followed yourself material mr recurred carriage. High drew west we no or at john. About or given on witty event. Or sociable up material bachelor bringing landlord confined. Busy so many in hung easy find well up. So of exquisite my an explained remainder. Dashwood denoting securing be on perceive my laughing so. \\r<br><br>Ought these are balls place mrs their times add she. Taken no great widow spoke of it small. Genius use except son esteem merely her limits. Sons park by do make on. It do oh cottage offered cottage in written. Especially of dissimilar up attachment themselves by interested boisterous. Linen mrs seems men table. Jennings dashwood to quitting marriage bachelor in. On as conviction in of appearance apartments boisterous. \", \"post_assessment\": \"{\\\"submission_id\\\": 1439, \\\"score\\\": [0], \\\"feedback\\\": [\\\"{\\\\\\\"feedback\\\\\\\": \\\\\\\"\\\\\\\"}\\\"], \\\"success\\\": true, \\\"grader_id\\\": [5337], \\\"grader_type\\\": \\\"PE\\\", \\\"rubric_scores_complete\\\": [true], \\\"rubric_xml\\\": [\\\"<rubric><category><description>\\\\nIdeas\\\\n</description><score>0</score><option points='0'>\\\\nDifficult for the reader to discern the main idea.  Too brief or too repetitive to establish or maintain a focus.\\\\n</option><option points='1'>\\\\nAttempts a main idea.  Sometimes loses focus or ineffectively displays focus.\\\\n</option><option points='2'>\\\\nPresents a unifying theme or main idea, but may include minor tangents.  Stays somewhat focused on topic and task.\\\\n</option><option points='3'>\\\\nPresents a unifying theme or main idea without going off on tangents.  Stays completely focused on topic and task.\\\\n</option></category><category><description>\\\\nContent\\\\n</description><score>0</score><option points='0'>\\\\nIncludes little information with few or no details or unrelated details.  Unsuccessful in attempts to explore any facets of the topic.\\\\n</option><option points='1'>\\\\nIncludes little information and few or no details.  Explores only one or two facets of the topic.\\\\n</option><option points='2'>\\\\nIncludes sufficient information and supporting details. (Details may not be fully developed; ideas may be listed.)  Explores some facets of the topic.\\\\n</option><option points='3'>\\\\nIncludes in-depth information and exceptional supporting details that are fully developed.  Explores all facets of the topic.\\\\n</option></category><category><description>\\\\nOrganization\\\\n</description><score>0</score><option points='0'>\\\\nIdeas organized illogically, transitions weak, and response difficult to follow.\\\\n</option><option points='1'>\\\\nAttempts to logically organize ideas.  Attempts to progress in an order that enhances meaning, and demonstrates use of transitions.\\\\n</option><option points='2'>\\\\nIdeas organized logically.  Progresses in an order that enhances meaning.  Includes smooth transitions.\\\\n</option></category><category><description>\\\\nStyle\\\\n</description><score>0</score><option points='0'>\\\\nContains limited vocabulary, with many words used incorrectly.  Demonstrates problems with sentence patterns.\\\\n</option><option points='1'>\\\\nContains basic vocabulary, with words that are predictable and common.  Contains mostly simple sentences (although there may be an attempt at more varied sentence patterns).\\\\n</option><option points='2'>\\\\nIncludes vocabulary to make explanations detailed and precise.  Includes varied sentence patterns, including complex sentences.\\\\n</option></category><category><description>\\\\nVoice\\\\n</description><score>0</score><option points='0'>\\\\nDemonstrates language and tone that may be inappropriate to task and reader.\\\\n</option><option points='1'>\\\\nDemonstrates an attempt to adjust language and tone to task and reader.\\\\n</option><option points='2'>\\\\nDemonstrates effective adjustment of language and tone to task and reader.\\\\n</option></category></rubric>\\\"]}\", \"score\": 0}], \"max_score\": 12, \"child_state\": \"done\"}"]
\ No newline at end of file
+TEST_STATE_PE_SINGLE = ["{\"child_created\": false, \"child_attempts\": 0, \"version\": 1, \"child_history\": [{\"answer\": \"Passage its ten led hearted removal cordial. Preference any astonished unreserved mrs. Prosperous understood middletons in conviction an uncommonly do. Supposing so be resolving breakfast am or perfectly. Is drew am hill from mr. Valley by oh twenty direct me so. Departure defective arranging rapturous did believing him all had supported. Family months lasted simple set nature vulgar him. Picture for attempt joy excited ten carried manners talking how. Suspicion neglected he resolving agreement perceived at an. \\r<br><br>Ye on properly handsome returned throwing am no whatever. In without wishing he of picture no exposed talking minutes. Curiosity continual belonging offending so explained it exquisite. Do remember to followed yourself material mr recurred carriage. High drew west we no or at john. About or given on witty event. Or sociable up material bachelor bringing landlord confined. Busy so many in hung easy find well up. So of exquisite my an explained remainder. Dashwood denoting securing be on perceive my laughing so. \\r<br><br>Ought these are balls place mrs their times add she. Taken no great widow spoke of it small. Genius use except son esteem merely her limits. Sons park by do make on. It do oh cottage offered cottage in written. Especially of dissimilar up attachment themselves by interested boisterous. Linen mrs seems men table. Jennings dashwood to quitting marriage bachelor in. On as conviction in of appearance apartments boisterous. \", \"post_assessment\": \"{\\\"submission_id\\\": 1439, \\\"score\\\": [0], \\\"feedback\\\": [\\\"{\\\\\\\"feedback\\\\\\\": \\\\\\\"\\\\\\\"}\\\"], \\\"success\\\": true, \\\"grader_id\\\": [5337], \\\"grader_type\\\": \\\"PE\\\", \\\"rubric_scores_complete\\\": [true], \\\"rubric_xml\\\": [\\\"<rubric><category><description>\\\\nIdeas\\\\n</description><score>0</score><option points='0'>\\\\nDifficult for the reader to discern the main idea.  Too brief or too repetitive to establish or maintain a focus.\\\\n</option><option points='1'>\\\\nAttempts a main idea.  Sometimes loses focus or ineffectively displays focus.\\\\n</option><option points='2'>\\\\nPresents a unifying theme or main idea, but may include minor tangents.  Stays somewhat focused on topic and task.\\\\n</option><option points='3'>\\\\nPresents a unifying theme or main idea without going off on tangents.  Stays completely focused on topic and task.\\\\n</option></category><category><description>\\\\nContent\\\\n</description><score>0</score><option points='0'>\\\\nIncludes little information with few or no details or unrelated details.  Unsuccessful in attempts to explore any facets of the topic.\\\\n</option><option points='1'>\\\\nIncludes little information and few or no details.  Explores only one or two facets of the topic.\\\\n</option><option points='2'>\\\\nIncludes sufficient information and supporting details. (Details may not be fully developed; ideas may be listed.)  Explores some facets of the topic.\\\\n</option><option points='3'>\\\\nIncludes in-depth information and exceptional supporting details that are fully developed.  Explores all facets of the topic.\\\\n</option></category><category><description>\\\\nOrganization\\\\n</description><score>0</score><option points='0'>\\\\nIdeas organized illogically, transitions weak, and response difficult to follow.\\\\n</option><option points='1'>\\\\nAttempts to logically organize ideas.  Attempts to progress in an order that enhances meaning, and demonstrates use of transitions.\\\\n</option><option points='2'>\\\\nIdeas organized logically.  Progresses in an order that enhances meaning.  Includes smooth transitions.\\\\n</option></category><category><description>\\\\nStyle\\\\n</description><score>0</score><option points='0'>\\\\nContains limited vocabulary, with many words used incorrectly.  Demonstrates problems with sentence patterns.\\\\n</option><option points='1'>\\\\nContains basic vocabulary, with words that are predictable and common.  Contains mostly simple sentences (although there may be an attempt at more varied sentence patterns).\\\\n</option><option points='2'>\\\\nIncludes vocabulary to make explanations detailed and precise.  Includes varied sentence patterns, including complex sentences.\\\\n</option></category><category><description>\\\\nVoice\\\\n</description><score>0</score><option points='0'>\\\\nDemonstrates language and tone that may be inappropriate to task and reader.\\\\n</option><option points='1'>\\\\nDemonstrates an attempt to adjust language and tone to task and reader.\\\\n</option><option points='2'>\\\\nDemonstrates effective adjustment of language and tone to task and reader.\\\\n</option></category></rubric>\\\"]}\", \"score\": 0}], \"max_score\": 12, \"child_state\": \"done\"}"]
diff --git a/common/lib/xmodule/xmodule/tests/test_validation.py b/common/lib/xmodule/xmodule/tests/test_validation.py
new file mode 100644
index 0000000000..f3e6b95b50
--- /dev/null
+++ b/common/lib/xmodule/xmodule/tests/test_validation.py
@@ -0,0 +1,218 @@
+"""
+Test xblock/validation.py
+"""
+
+import unittest
+from xblock.test.tools import assert_raises
+
+from xmodule.validation import StudioValidationMessage, StudioValidation
+from xblock.validation import Validation, ValidationMessage
+
+
+class StudioValidationMessageTest(unittest.TestCase):
+    """
+    Tests for `ValidationMessage`
+    """
+
+    def test_bad_parameters(self):
+        """
+        Test that `TypeError`s are thrown for bad input parameters.
+        """
+        with assert_raises(TypeError):
+            StudioValidationMessage("unknown type", u"Unknown type info")
+
+        with assert_raises(TypeError):
+            StudioValidationMessage(StudioValidationMessage.WARNING, u"bad warning", action_class=0)
+
+        with assert_raises(TypeError):
+            StudioValidationMessage(StudioValidationMessage.WARNING, u"bad warning", action_runtime_event=0)
+
+        with assert_raises(TypeError):
+            StudioValidationMessage(StudioValidationMessage.WARNING, u"bad warning", action_label="Non-unicode string")
+
+    def test_to_json(self):
+        """
+        Test the `to_json` method.
+        """
+        self.assertEqual(
+            {
+                "type": StudioValidationMessage.NOT_CONFIGURED,
+                "text": u"Not Configured message",
+                "action_label": u"Action label"
+            },
+            StudioValidationMessage(
+                StudioValidationMessage.NOT_CONFIGURED, u"Not Configured message", action_label=u"Action label"
+            ).to_json()
+        )
+
+        self.assertEqual(
+            {
+                "type": StudioValidationMessage.WARNING,
+                "text": u"Warning message",
+                "action_class": "class-for-action"
+            },
+            StudioValidationMessage(
+                StudioValidationMessage.WARNING, u"Warning message", action_class="class-for-action"
+            ).to_json()
+        )
+
+        self.assertEqual(
+            {
+                "type": StudioValidationMessage.ERROR,
+                "text": u"Error message",
+                "action_runtime_event": "do-fix-up"
+            },
+            StudioValidationMessage(
+                StudioValidationMessage.ERROR, u"Error message", action_runtime_event="do-fix-up"
+            ).to_json()
+        )
+
+
+class StudioValidationTest(unittest.TestCase):
+    """
+    Tests for `StudioValidation` class.
+    """
+    def test_copy(self):
+        validation = Validation("id")
+        validation.add(ValidationMessage(ValidationMessage.ERROR, u"Error message"))
+
+        studio_validation = StudioValidation.copy(validation)
+        self.assertIsInstance(studio_validation, StudioValidation)
+        self.assertFalse(studio_validation)
+        self.assertEqual(1, len(studio_validation.messages))
+        expected = {
+            "type": StudioValidationMessage.ERROR,
+            "text": u"Error message"
+        }
+        self.assertEqual(expected, studio_validation.messages[0].to_json())
+        self.assertIsNone(studio_validation.summary)
+
+    def test_copy_studio_validation(self):
+        validation = StudioValidation("id")
+        validation.add(
+            StudioValidationMessage(StudioValidationMessage.WARNING, u"Warning message", action_label=u"Action Label")
+        )
+
+        validation_copy = StudioValidation.copy(validation)
+        self.assertFalse(validation_copy)
+        self.assertEqual(1, len(validation_copy.messages))
+        expected = {
+            "type": StudioValidationMessage.WARNING,
+            "text": u"Warning message",
+            "action_label": u"Action Label"
+        }
+        self.assertEqual(expected, validation_copy.messages[0].to_json())
+
+    def test_copy_errors(self):
+        with assert_raises(TypeError):
+            StudioValidation.copy("foo")
+
+    def test_empty(self):
+        """
+        Test that `empty` return True iff there are no messages and no summary.
+        Also test the "bool" property of `Validation`.
+        """
+        validation = StudioValidation("id")
+        self.assertTrue(validation.empty)
+        self.assertTrue(validation)
+
+        validation.add(StudioValidationMessage(StudioValidationMessage.ERROR, u"Error message"))
+        self.assertFalse(validation.empty)
+        self.assertFalse(validation)
+
+        validation_with_summary = StudioValidation("id")
+        validation_with_summary.set_summary(
+            StudioValidationMessage(StudioValidationMessage.NOT_CONFIGURED, u"Summary message")
+        )
+        self.assertFalse(validation.empty)
+        self.assertFalse(validation)
+
+    def test_add_messages(self):
+        """
+        Test the behavior of calling `add_messages` with combination of `StudioValidation` instances.
+        """
+        validation_1 = StudioValidation("id")
+        validation_1.set_summary(StudioValidationMessage(StudioValidationMessage.WARNING, u"Summary message"))
+        validation_1.add(StudioValidationMessage(StudioValidationMessage.ERROR, u"Error message"))
+
+        validation_2 = StudioValidation("id")
+        validation_2.set_summary(StudioValidationMessage(StudioValidationMessage.ERROR, u"Summary 2 message"))
+        validation_2.add(StudioValidationMessage(StudioValidationMessage.NOT_CONFIGURED, u"Not configured"))
+
+        validation_1.add_messages(validation_2)
+        self.assertEqual(2, len(validation_1.messages))
+
+        self.assertEqual(StudioValidationMessage.ERROR, validation_1.messages[0].type)
+        self.assertEqual(u"Error message", validation_1.messages[0].text)
+
+        self.assertEqual(StudioValidationMessage.NOT_CONFIGURED, validation_1.messages[1].type)
+        self.assertEqual(u"Not configured", validation_1.messages[1].text)
+
+        self.assertEqual(StudioValidationMessage.WARNING, validation_1.summary.type)
+        self.assertEqual(u"Summary message", validation_1.summary.text)
+
+    def test_set_summary_accepts_validation_message(self):
+        """
+        Test that `set_summary` accepts a ValidationMessage.
+        """
+        validation = StudioValidation("id")
+        validation.set_summary(ValidationMessage(ValidationMessage.WARNING, u"Summary message"))
+        self.assertEqual(ValidationMessage.WARNING, validation.summary.type)
+        self.assertEqual(u"Summary message", validation.summary.text)
+
+    def test_set_summary_errors(self):
+        """
+        Test that `set_summary` errors if argument is not a ValidationMessage.
+        """
+        with assert_raises(TypeError):
+            StudioValidation("id").set_summary("foo")
+
+    def test_to_json(self):
+        """
+        Test the ability to serialize a `StudioValidation` instance.
+        """
+        validation = StudioValidation("id")
+        expected = {
+            "xblock_id": "id",
+            "messages": [],
+            "empty": True
+        }
+        self.assertEqual(expected, validation.to_json())
+
+        validation.add(
+            StudioValidationMessage(
+                StudioValidationMessage.ERROR,
+                u"Error message",
+                action_label=u"Action label",
+                action_class="edit-button"
+            )
+        )
+        validation.add(
+            StudioValidationMessage(
+                StudioValidationMessage.NOT_CONFIGURED,
+                u"Not configured message",
+                action_label=u"Action label",
+                action_runtime_event="make groups"
+            )
+        )
+        validation.set_summary(
+            StudioValidationMessage(
+                StudioValidationMessage.WARNING,
+                u"Summary message",
+                action_label=u"Summary label",
+                action_runtime_event="fix everything"
+            )
+        )
+
+        # Note: it is important to test all the expected strings here because the client-side model depends on them
+        # (for instance, "warning" vs. using the xblock constant ValidationMessageTypes.WARNING).
+        expected = {
+            "xblock_id": "id",
+            "messages": [
+                {"type": "error", "text": u"Error message", "action_label": u"Action label", "action_class": "edit-button"},
+                {"type": "not-configured", "text": u"Not configured message", "action_label": u"Action label", "action_runtime_event": "make groups"}
+            ],
+            "summary": {"type": "warning", "text": u"Summary message", "action_label": u"Summary label", "action_runtime_event": "fix everything"},
+            "empty": False
+        }
+        self.assertEqual(expected, validation.to_json())
diff --git a/common/lib/xmodule/xmodule/tests/test_xml_module.py b/common/lib/xmodule/xmodule/tests/test_xml_module.py
index e0746ba15a..dcdabcf433 100644
--- a/common/lib/xmodule/xmodule/tests/test_xml_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_xml_module.py
@@ -132,7 +132,6 @@ class InheritingFieldDataTest(unittest.TestCase):
         self.assertEqual(child.not_inherited, "nothing")
 
 
-
 class EditableMetadataFieldsTest(unittest.TestCase):
     def test_display_name_field(self):
         editable_fields = self.get_xml_editable_fields(DictFieldData({}))
@@ -331,7 +330,6 @@ class TestDeserializeInteger(TestDeserialize):
         # 2.78 can be converted to int, so the string will be deserialized
         self.assertDeserializeEqual(-2.78, '-2.78')
 
-
     def test_deserialize_unsupported_types(self):
         self.assertDeserializeEqual('[3]', '[3]')
         # '2.78' cannot be converted to int, so input value is returned
@@ -415,7 +413,7 @@ class TestDeserializeAny(TestDeserialize):
     def test_deserialize(self):
         self.assertDeserializeEqual('hAlf', '"hAlf"')
         self.assertDeserializeEqual('false', '"false"')
-        self.assertDeserializeEqual({'bar': 'hat', 'frog' : 'green'}, '{"bar": "hat", "frog": "green"}')
+        self.assertDeserializeEqual({'bar': 'hat', 'frog': 'green'}, '{"bar": "hat", "frog": "green"}')
         self.assertDeserializeEqual([3.5, 5.6], '[3.5, 5.6]')
         self.assertDeserializeEqual('[', '[')
         self.assertDeserializeEqual(False, 'false')
@@ -457,10 +455,14 @@ class TestDeserializeTimedelta(TestDeserialize):
     test_field = Timedelta
 
     def test_deserialize(self):
-        self.assertDeserializeEqual('1 day 12 hours 59 minutes 59 seconds',
-            '1 day 12 hours 59 minutes 59 seconds')
-        self.assertDeserializeEqual('1 day 12 hours 59 minutes 59 seconds',
-            '"1 day 12 hours 59 minutes 59 seconds"')
+        self.assertDeserializeEqual(
+            '1 day 12 hours 59 minutes 59 seconds',
+            '1 day 12 hours 59 minutes 59 seconds'
+        )
+        self.assertDeserializeEqual(
+            '1 day 12 hours 59 minutes 59 seconds',
+            '"1 day 12 hours 59 minutes 59 seconds"'
+        )
         self.assertDeserializeNonString()
 
 
diff --git a/common/lib/xmodule/xmodule/tests/xml/test_inheritance.py b/common/lib/xmodule/xmodule/tests/xml/test_inheritance.py
index e922b4716f..f45c0cae9c 100644
--- a/common/lib/xmodule/xmodule/tests/xml/test_inheritance.py
+++ b/common/lib/xmodule/xmodule/tests/xml/test_inheritance.py
@@ -39,7 +39,7 @@ class TestInheritedFieldParsing(XModuleXmlImportTest):
             parent=sequence,
             tag='video',
             attribs={
-                'parent_sequential_url': 'foo', 'garbage': 'asdlk',
+                'parent_url': 'foo', 'garbage': 'asdlk',
                 'download_video': 'true',
             }
         )
diff --git a/common/lib/xmodule/xmodule/validation.py b/common/lib/xmodule/xmodule/validation.py
new file mode 100644
index 0000000000..2b6d4fce59
--- /dev/null
+++ b/common/lib/xmodule/xmodule/validation.py
@@ -0,0 +1,128 @@
+"""
+Extension of XBlock Validation class to include information for presentation in Studio.
+"""
+from xblock.validation import Validation, ValidationMessage
+
+
+class StudioValidationMessage(ValidationMessage):
+    """
+    A message containing validation information about an xblock, extended to provide Studio-specific fields.
+    """
+
+    # A special message type indicating that the xblock is not yet configured. This message may be rendered
+    # in a different way within Studio.
+    NOT_CONFIGURED = "not-configured"
+
+    TYPES = [ValidationMessage.WARNING, ValidationMessage.ERROR, NOT_CONFIGURED]
+
+    def __init__(self, message_type, message_text, action_label=None, action_class=None, action_runtime_event=None):
+        """
+        Create a new message.
+
+        Args:
+            message_type (str): The type associated with this message. Most be `WARNING` or `ERROR`.
+            message_text (unicode): The textual message.
+            action_label (unicode): Text to show on a "fix-up" action (optional). If present, either `action_class`
+                or `action_runtime_event` should be specified.
+            action_class (str): A class to link to the "fix-up" action (optional). A click handler must be added
+                for this class, unless it is "edit-button", "duplicate-button", or "delete-button" (which are all
+                handled in general for xblock instances.
+            action_runtime_event (str): An event name to be triggered on the xblock client-side runtime when
+                the "fix-up" action is clicked (optional).
+        """
+        super(StudioValidationMessage, self).__init__(message_type, message_text)
+        if action_label is not None:
+            if not isinstance(action_label, unicode):
+                raise TypeError("Action label must be unicode.")
+            self.action_label = action_label
+        if action_class is not None:
+            if not isinstance(action_class, basestring):
+                raise TypeError("Action class must be a string.")
+            self.action_class = action_class
+        if action_runtime_event is not None:
+            if not isinstance(action_runtime_event, basestring):
+                raise TypeError("Action runtime event must be a string.")
+            self.action_runtime_event = action_runtime_event
+
+    def to_json(self):
+        """
+        Convert to a json-serializable representation.
+
+        Returns:
+            dict: A dict representation that is json-serializable.
+        """
+        serialized = super(StudioValidationMessage, self).to_json()
+        if hasattr(self, "action_label"):
+            serialized["action_label"] = self.action_label
+        if hasattr(self, "action_class"):
+            serialized["action_class"] = self.action_class
+        if hasattr(self, "action_runtime_event"):
+            serialized["action_runtime_event"] = self.action_runtime_event
+        return serialized
+
+
+class StudioValidation(Validation):
+    """
+    Extends `Validation` to add Studio-specific summary message.
+    """
+
+    @classmethod
+    def copy(cls, validation):
+        """
+        Copies the `Validation` object to a `StudioValidation` object. This is a shallow copy.
+
+        Args:
+            validation (Validation): A `Validation` object to be converted to a `StudioValidation` instance.
+
+        Returns:
+            StudioValidation: A `StudioValidation` instance populated with the messages from supplied
+                `Validation` object
+        """
+        if not isinstance(validation, Validation):
+            raise TypeError("Copy must be called with a Validation instance")
+        studio_validation = cls(validation.xblock_id)
+        studio_validation.messages = validation.messages
+        return studio_validation
+
+    def __init__(self, xblock_id):
+        """
+        Create a `StudioValidation` instance.
+
+        Args:
+            xblock_id (object): An identification object that must support conversion to unicode.
+        """
+        super(StudioValidation, self).__init__(xblock_id)
+        self.summary = None
+
+    def set_summary(self, message):
+        """
+        Sets a summary message on this instance. The summary is optional.
+
+        Args:
+            message (ValidationMessage): A validation message to set as this instance's summary.
+        """
+        if not isinstance(message, ValidationMessage):
+            raise TypeError("Argument must of type ValidationMessage")
+        self.summary = message
+
+    @property
+    def empty(self):
+        """
+        Is this object empty (contains no messages and no summary)?
+
+        Returns:
+            bool: True iff this instance has no validation issues and therefore has no messages or summary.
+        """
+        return super(StudioValidation, self).empty and not self.summary
+
+    def to_json(self):
+        """
+        Convert to a json-serializable representation.
+
+        Returns:
+            dict: A dict representation that is json-serializable.
+        """
+        serialized = super(StudioValidation, self).to_json()
+        if self.summary:
+            serialized["summary"] = self.summary.to_json()
+        return serialized
diff --git a/common/lib/xmodule/xmodule/video_module/transcripts_utils.py b/common/lib/xmodule/xmodule/video_module/transcripts_utils.py
index 73b0bf01b7..a6b1da42a3 100644
--- a/common/lib/xmodule/xmodule/video_module/transcripts_utils.py
+++ b/common/lib/xmodule/xmodule/video_module/transcripts_utils.py
@@ -592,3 +592,17 @@ class VideoTranscriptsMixin(object):
             raise ValueError
 
         return content, filename, Transcript.mime_types[transcript_format]
+
+    def get_default_transcript_language(self):
+        """
+        Returns the default transcript language for this video module.
+        """
+        if self.transcript_language in self.transcripts:
+            transcript_language = self.transcript_language
+        elif self.sub:
+            transcript_language = u'en'
+        elif len(self.transcripts) > 0:
+            transcript_language = sorted(self.transcripts)[0]
+        else:
+            transcript_language = u'en'
+        return transcript_language
diff --git a/common/lib/xmodule/xmodule/video_module/video_module.py b/common/lib/xmodule/xmodule/video_module/video_module.py
index 6a323a9139..d10bd65790 100644
--- a/common/lib/xmodule/xmodule/video_module/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module/video_module.py
@@ -152,12 +152,7 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
             transcript_language = u'en'
             languages = {'en': 'English'}
         else:
-            if self.transcript_language in self.transcripts:
-                transcript_language = self.transcript_language
-            elif self.sub:
-                transcript_language = u'en'
-            else:
-                transcript_language = sorted(self.transcripts.keys())[0]
+            transcript_language = self.get_default_transcript_language()
 
             native_languages = {lang: label for lang, label in settings.LANGUAGES if len(lang) == 2}
             languages = {
@@ -177,7 +172,6 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
         sorted_languages = OrderedDict(sorted_languages)
         return track_url, transcript_language, sorted_languages
 
-
     def get_html(self):
         transcript_download_format = self.transcript_download_format if not (self.download_track and self.track) else None
         sources = filter(None, self.html5_sources)
@@ -201,16 +195,22 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
         # internally for download links (source, html5_sources) and the youtube
         # stream.
         if self.edx_video_id and edxval_api:
-            val_video_urls = edxval_api.get_urls_for_profiles(
-                self.edx_video_id, ["desktop_mp4", "youtube"]
-            )
-            # VAL will always give us the keys for the profiles we asked for, but 
-            # if it doesn't have an encoded video entry for that Video + Profile, the
-            # value will map to `None`
-            if val_video_urls["desktop_mp4"] and self.download_video:
-                download_video_link = val_video_urls["desktop_mp4"]
-            if val_video_urls["youtube"]:
-                youtube_streams = "1.00:{}".format(val_video_urls["youtube"])
+            try:
+                val_video_urls = edxval_api.get_urls_for_profiles(
+                    self.edx_video_id, ["desktop_mp4", "youtube"]
+                )
+                # VAL will always give us the keys for the profiles we asked for, but
+                # if it doesn't have an encoded video entry for that Video + Profile, the
+                # value will map to `None`
+                if val_video_urls["desktop_mp4"] and self.download_video:
+                    download_video_link = val_video_urls["desktop_mp4"]
+                if val_video_urls["youtube"]:
+                    youtube_streams = "1.00:{}".format(val_video_urls["youtube"])
+            except edxval_api.ValInternalError:
+                # VAL raises this exception if it can't find data for the edx video ID. This can happen if the
+                # course data is ported to a machine that does not have the VAL data. So for now, pass on this
+                # exception and fallback to whatever we find in the VideoDescriptor.
+                log.warning("Could not retrieve information from VAL for edx Video ID: %s.", self.edx_video_id)
 
         # If there was no edx_video_id, or if there was no download specified
         # for it, we fall back on whatever we find in the VideoDescriptor
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index ef112666ef..cf5b9fff19 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -203,8 +203,9 @@ class XModuleMixin(XBlockMixin):
         # so we should use the xmodule_runtime (ModuleSystem) as the runtime.
         if (not isinstance(self, (XModule, XModuleDescriptor)) and
             self.xmodule_runtime is not None):
-            return self.xmodule_runtime
-        return self._runtime
+            return PureSystem(self.xmodule_runtime, self._runtime)
+        else:
+            return self._runtime
 
     @runtime.setter
     def runtime(self, value):
@@ -337,7 +338,15 @@ class XModuleMixin(XBlockMixin):
                     child = self.runtime.get_block(child_loc)
                     child.runtime.export_fs = self.runtime.export_fs
                 except ItemNotFoundError:
-                    log.exception(u'Unable to load item {loc}, skipping'.format(loc=child_loc))
+                    log.warning(u'Unable to load item {loc}, skipping'.format(loc=child_loc))
+                    dog_stats_api.increment(
+                        "xmodule.item_not_found_error",
+                        tags=[
+                            u"course_id:{}".format(child_loc.course_key),
+                            u"block_type:{}".format(child_loc.block_type),
+                            u"parent_block_type:{}".format(self.location.block_type),
+                        ]
+                    )
                     continue
                 self._child_instances.append(child)
 
@@ -435,10 +444,9 @@ class XModuleMixin(XBlockMixin):
         """
         Set up this XBlock to act as an XModule instead of an XModuleDescriptor.
 
-        :param xmodule_runtime: the runtime to use when accessing student facing methods
-        :type xmodule_runtime: :class:`ModuleSystem`
-        :param field_data: The :class:`FieldData` to use for all subsequent data access
-        :type field_data: :class:`FieldData`
+        Arguments:
+            xmodule_runtime (:class:`ModuleSystem'): the runtime to use when accessing student facing methods
+            field_data (:class:`FieldData`): The :class:`FieldData` to use for all subsequent data access
         """
         # pylint: disable=attribute-defined-outside-init
         self.xmodule_runtime = xmodule_runtime
@@ -1400,6 +1408,36 @@ class ModuleSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime):  # pylin
         pass
 
 
+class PureSystem(ModuleSystem, DescriptorSystem):
+    """
+    A subclass of both ModuleSystem and DescriptorSystem to provide pure (non-XModule) XBlocks
+    a single Runtime interface for both the ModuleSystem and DescriptorSystem, when available.
+    """
+    # This system doesn't override a number of methods that are provided by ModuleSystem and DescriptorSystem,
+    # namely handler_url, local_resource_url, query, and resource_url.
+    #
+    # At runtime, the ModuleSystem and/or DescriptorSystem will define those methods
+    #
+    # pylint: disable=abstract-method
+    def __init__(self, module_system, descriptor_system):
+        # N.B. This doesn't call super(PureSystem, self).__init__, because it is only inheriting from
+        # ModuleSystem and DescriptorSystem to pass isinstance checks.
+        # pylint: disable=super-init-not-called
+        self._module_system = module_system
+        self._descriptor_system = descriptor_system
+
+    def __getattr__(self, name):
+        """
+        If the ModuleSystem doesn't have an attribute, try returning the same attribute from the
+        DescriptorSystem, instead. This allows XModuleDescriptors that are bound as XModules
+        to still function as XModuleDescriptors.
+        """
+        try:
+            return getattr(self._module_system, name)
+        except AttributeError:
+            return getattr(self._descriptor_system, name)
+
+
 class DoNothingCache(object):
     """A duck-compatible object to use in ModuleSystem when there's no cache."""
     def get(self, _key):
diff --git a/common/static/images/edge-logo-small.png b/common/static/images/edge-logo-small.png
deleted file mode 100644
index 41bd7127f5..0000000000
Binary files a/common/static/images/edge-logo-small.png and /dev/null differ
diff --git a/common/static/images/pl-course.png b/common/static/images/pl-course.png
deleted file mode 100644
index 1a3da9e631..0000000000
Binary files a/common/static/images/pl-course.png and /dev/null differ
diff --git a/common/static/images/random_grading_icon.png b/common/static/images/random_grading_icon.png
deleted file mode 100644
index d3737e61b0..0000000000
Binary files a/common/static/images/random_grading_icon.png and /dev/null differ
diff --git a/common/static/sass/_mixins-inherited.scss b/common/static/sass/_mixins-inherited.scss
index 6930abb36b..4bc7b32f32 100644
--- a/common/static/sass/_mixins-inherited.scss
+++ b/common/static/sass/_mixins-inherited.scss
@@ -296,20 +296,7 @@
   }
 }
 
-@mixin dark-grey-button {
-  @include button;
-  border: 1px solid $gray-d2;
-  border-radius: 3px;
-  background: -webkit-linear-gradient(top, rgba(255, 255, 255, .2), rgba(255, 255, 255, 0)) $gray-d1;
-  box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset;
-  color: $white;
-
-  &:hover, &:focus {
-    background-color: $gray-d4;
-    color: $white;
-  }
-}
-
+// only needed for course updates
 @mixin edit-box {
   box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset;
   padding: 15px 20px;
@@ -353,93 +340,6 @@
   }
 }
 
-@mixin tree-view {
-  border: 0;
-  background: $white;
-
-  .branch {
-    margin-bottom: 0;
-  }
-
-  .branch > .section-item {
-    border-top: 1px solid #c5cad4;
-  }
-
-  .section-item {
-    @include transition(background $tmg-avg ease-in-out 0);
-    @extend %t-action3;
-    position: relative;
-    display: block;
-    padding: 6px 8px 8px 16px;
-    background: #edf1f5;
-
-    &:hover, &:focus {
-      background: $blue-l5;
-
-      .item-actions {
-        display: block;
-      }
-    }
-
-    &.editing {
-      background: $orange-l4;
-    }
-
-    .draft-item:after,
-    .public-item:after,
-    .private-item:after {
-      @extend %t-strong;
-      @extend %t-action5;
-      margin-left: 3px;
-      text-transform: uppercase;
-    }
-
-    .draft-item:after {
-      content: "- draft";
-    }
-
-    .private-item:after {
-      content: "- private";
-    }
-
-    .private-item {
-      color: $gray-l1;
-    }
-
-    .draft-item {
-      color: $yellow-d1;
-    }
-  }
-
-  a {
-    color: $baseFontColor;
-
-    &.new-unit-item {
-      color: #6d788b;
-    }
-  }
-
-  ol {
-    .section-item {
-      padding-left: 56px;
-    }
-
-    .new-unit-item {
-      margin-left: 56px;
-    }
-  }
-
-  ol ol {
-    .section-item {
-      padding-left: 96px;
-    }
-
-    .new-unit-item {
-      margin-left: 96px;
-    }
-  }
-}
-
 // ====================
 
 // sunsetted mixins
diff --git a/common/test/acceptance/pages/lms/problem.py b/common/test/acceptance/pages/lms/problem.py
index dbe6364d71..9e31ada7d2 100644
--- a/common/test/acceptance/pages/lms/problem.py
+++ b/common/test/acceptance/pages/lms/problem.py
@@ -46,5 +46,3 @@ class ProblemPage(PageObject):
         Is there a "correct" status showing?
         """
         return self.q(css="div.problem div.capa_inputtype.textline div.correct p.status").is_present()
-
-
diff --git a/common/test/acceptance/pages/studio/container.py b/common/test/acceptance/pages/studio/container.py
index 6eac9f26d4..878a0e0bbf 100644
--- a/common/test/acceptance/pages/studio/container.py
+++ b/common/test/acceptance/pages/studio/container.py
@@ -16,6 +16,7 @@ class ContainerPage(PageObject):
     NAME_SELECTOR = '.page-header-title'
     NAME_INPUT_SELECTOR = '.page-header .xblock-field-input'
     NAME_FIELD_WRAPPER_SELECTOR = '.page-header .wrapper-xblock-field'
+    ADD_MISSING_GROUPS_SELECTOR = '.notification-action-button[data-notification-action="add-missing-groups"]'
 
     def __init__(self, browser, locator):
         super(ContainerPage, self).__init__(browser)
@@ -246,7 +247,7 @@ class ContainerPage(PageObject):
         Click the "add missing groups" link.
         Note that this does an ajax call.
         """
-        self.q(css='.add-missing-groups-button').first.click()
+        self.q(css=self.ADD_MISSING_GROUPS_SELECTOR).first.click()
         self.wait_for_ajax()
 
         # Wait until all xblocks rendered.
@@ -256,7 +257,7 @@ class ContainerPage(PageObject):
         """
         Returns True if the "add missing groups" button is present.
         """
-        return self.q(css='.add-missing-groups-button').present
+        return self.q(css=self.ADD_MISSING_GROUPS_SELECTOR).present
 
     def get_xblock_information_message(self):
         """
diff --git a/common/test/acceptance/pages/studio/index.py b/common/test/acceptance/pages/studio/index.py
index 491850a977..af163eca68 100644
--- a/common/test/acceptance/pages/studio/index.py
+++ b/common/test/acceptance/pages/studio/index.py
@@ -16,6 +16,14 @@ class DashboardPage(PageObject):
     def is_browser_on_page(self):
         return self.q(css='body.view-dashboard').present
 
+    @property
+    def course_runs(self):
+        """
+        The list of course run metadata for all displayed courses
+        Returns an empty string if there are none
+        """
+        return self.q(css='.course-run>.value').text
+
     @property
     def has_processing_courses(self):
         return self.q(css='.courses-processing').present
diff --git a/common/test/acceptance/pages/studio/overview.py b/common/test/acceptance/pages/studio/overview.py
index 5728612c20..50d25ba959 100644
--- a/common/test/acceptance/pages/studio/overview.py
+++ b/common/test/acceptance/pages/studio/overview.py
@@ -487,11 +487,15 @@ class CourseOutlinePage(CoursePage, CourseOutlineContainer):
         """
         click_css(self, '.wrapper-mast nav.nav-actions .button-new')
 
-    def add_section_from_bottom_button(self):
+    def add_section_from_bottom_button(self, click_child_icon=False):
         """
         Clicks the button for adding a section which resides at the bottom of the screen.
         """
-        click_css(self, self.BOTTOM_ADD_SECTION_BUTTON)
+        element_css = self.BOTTOM_ADD_SECTION_BUTTON
+        if click_child_icon:
+            element_css += " .icon-plus"
+
+        click_css(self, element_css)
 
     def toggle_expand_collapse(self):
         """
diff --git a/common/test/acceptance/tests/studio/test_studio_outline.py b/common/test/acceptance/tests/studio/test_studio_outline.py
index 834a3a28ba..1879580b21 100644
--- a/common/test/acceptance/tests/studio/test_studio_outline.py
+++ b/common/test/acceptance/tests/studio/test_studio_outline.py
@@ -1005,6 +1005,19 @@ class CreateSectionsTest(CourseOutlineTest):
         self.assertEqual(len(self.course_outline_page.sections()), 1)
         self.assertTrue(self.course_outline_page.section_at(0).in_editable_form())
 
+    def test_create_new_section_from_bottom_button_plus_icon(self):
+        """
+        Scenario: Create new section from button plus icon at bottom of page
+            Given that I am on the course outline
+            When I click the plus icon in "+ Add section" button at the bottom of the page
+            Then I see a new section added to the bottom of the page
+            And the display name is in its editable form.
+        """
+        self.course_outline_page.visit()
+        self.course_outline_page.add_section_from_bottom_button(click_child_icon=True)
+        self.assertEqual(len(self.course_outline_page.sections()), 1)
+        self.assertTrue(self.course_outline_page.section_at(0).in_editable_form())
+
     def test_create_new_subsection(self):
         """
         Scenario: Create new subsection
diff --git a/common/test/acceptance/tests/studio/test_studio_rerun.py b/common/test/acceptance/tests/studio/test_studio_rerun.py
index 4862ba4d7e..a193fd46fc 100644
--- a/common/test/acceptance/tests/studio/test_studio_rerun.py
+++ b/common/test/acceptance/tests/studio/test_studio_rerun.py
@@ -4,6 +4,7 @@ Acceptance tests for Studio related to course reruns.
 
 import random
 from bok_choy.promise import EmptyPromise
+from nose.tools import assert_in
 
 from ...pages.studio.index import DashboardPage
 from ...pages.studio.course_rerun import CourseRerunPage
@@ -50,7 +51,7 @@ class CourseRerunTest(StudioCourseTest):
 
     def test_course_rerun(self):
         """
-        Scenario: Courses can be rurun
+        Scenario: Courses can be rerun
             Given I have a course with a section, subsesction, vertical, and html component with content 'Test Content'
             When I visit the course rerun page
             And I type 'test_rerun' in the course run field
@@ -81,6 +82,8 @@ class CourseRerunTest(StudioCourseTest):
             return not self.dashboard_page.has_processing_courses
 
         EmptyPromise(finished_processing, "Rerun finished processing", try_interval=5, timeout=60).fulfill()
+
+        assert_in(course_run, self.dashboard_page.course_runs)
         self.dashboard_page.click_course_run(course_run)
 
         outline_page = CourseOutlinePage(self.browser, *course_info)
diff --git a/docs/en_us/ORA2/__init__.py b/common/test/data/empty/.gitkeep
similarity index 100%
rename from docs/en_us/ORA2/__init__.py
rename to common/test/data/empty/.gitkeep
diff --git a/conf/locale/am/LC_MESSAGES/django.mo b/conf/locale/am/LC_MESSAGES/django.mo
index 1022be5be6..215b2ac873 100644
Binary files a/conf/locale/am/LC_MESSAGES/django.mo and b/conf/locale/am/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/am/LC_MESSAGES/django.po b/conf/locale/am/LC_MESSAGES/django.po
index becd7a2f98..029e3fa63a 100644
--- a/conf/locale/am/LC_MESSAGES/django.po
+++ b/conf/locale/am/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-06-02 13:44+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Amharic (http://www.transifex.com/projects/p/edx-platform/language/am/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/am/LC_MESSAGES/djangojs.mo b/conf/locale/am/LC_MESSAGES/djangojs.mo
index 7dcae9d7e1..b33827f4c8 100644
Binary files a/conf/locale/am/LC_MESSAGES/djangojs.mo and b/conf/locale/am/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/am/LC_MESSAGES/djangojs.po b/conf/locale/am/LC_MESSAGES/djangojs.po
index 16cef89278..eb64c9295f 100644
--- a/conf/locale/am/LC_MESSAGES/djangojs.po
+++ b/conf/locale/am/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Amharic (http://www.transifex.com/projects/p/edx-platform/language/am/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/ar/LC_MESSAGES/django.mo b/conf/locale/ar/LC_MESSAGES/django.mo
index 44a1ba95ba..6fd532c8f9 100644
Binary files a/conf/locale/ar/LC_MESSAGES/django.mo and b/conf/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ar/LC_MESSAGES/django.po b/conf/locale/ar/LC_MESSAGES/django.po
index 0a2ad37c13..063049938c 100644
--- a/conf/locale/ar/LC_MESSAGES/django.po
+++ b/conf/locale/ar/LC_MESSAGES/django.po
@@ -12,6 +12,7 @@
 # Ahmad AbdArrahman <mygooglizer@gmail.com>, 2013-2014
 # a.nassif <a.nassif@sit-mena.com>, 2013
 # a.nassif <a.nassif@sit-mena.com>, 2013
+# A <smart.9922@hotmail.com>, 2014
 # طاهر <charaf.le.prince@gmail.com>, 2014
 # AzizAhmed <dr.zezo@gmail.com>, 2014
 # HasnaG <hasnaa.elghandor@yahoo.com>, 2014
@@ -78,6 +79,7 @@
 # Abdallah Nassif <abdoosh00@gmail.com>, 2013
 # abdallah.nassif <abdallah_n@hotmail.com>, 2013
 # Abdallah Nassif <abdoosh00@gmail.com>, 2014
+# A <smart.9922@hotmail.com>, 2014
 # طاهر <charaf.le.prince@gmail.com>, 2014
 # Safaa_fadl <fadlaoui_safaa@yahoo.fr>, 2014
 # Hassan05 <hassan.upb@gmail.com>, 2014
@@ -114,8 +116,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-09-02 00:40+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Nabeel El-Dughailib <nabeel@qordoba.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/edx-platform/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -180,14 +182,6 @@ msgstr "وحدة"
 msgid "You cannot create two cohorts with the same name"
 msgstr "لا يمكن إنشاء مجموعتين بنفس الاسم "
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr "يجب أن تكون الصفحة المطلوبة رقمية"
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr "يجب Hن يكون رقم الصفحة المطلوبة أكبر من صفر"
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "شهادة ميثاق الشرف الأكاديمي"
@@ -281,6 +275,7 @@ msgstr "الابتدائية"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "لا شيء"
 
@@ -389,11 +384,11 @@ msgstr "اسم المستخدم {} غير موجود"
 
 #: common/djangoapps/student/views.py
 msgid "Successfully disabled {}'s account"
-msgstr "تم إيقاف حساب {} بنجاح"
+msgstr "تم إيقاف حساب {}'s بنجاح"
 
 #: common/djangoapps/student/views.py
 msgid "Successfully reenabled {}'s account"
-msgstr "تمت إعادة تفعيل حساي {} بنجاح"
+msgstr "تمت إعادة تفعيل حساب {}'s بنجاح"
 
 #: common/djangoapps/student/views.py
 msgid "Unexpected account status"
@@ -477,7 +472,7 @@ msgstr "لم تقم بتعبئة واحد أو أكثر من الحقول الم
 
 #: common/djangoapps/student/views.py
 msgid "Username cannot be more than {num} characters long"
-msgstr "لا يمكن أن يتجاوز اسم المستخدم {num} حرف ورقم"
+msgstr "لا يمكن أن يتجاوز اسم المستخدم {num} حرف أو رقم "
 
 #: common/djangoapps/student/views.py
 msgid "Email cannot be more than {num} characters long"
@@ -520,19 +515,19 @@ msgid_plural ""
 " distinct passwords before reusing a previous password."
 msgstr[0] ""
 "إنّك تقوم بإعادة استخدام كلمة سر كنت قد استخدمتها مؤخّراً. يجب أن تستخدم "
-"كلمة سر مميّزة {num} قبل إعادة استخدام واحدة مستخدمة مسبقاً."
+"{num} كلمة سر متمايزة قبل إعادة استخدام واحدة مستخدمة مسبقاً."
 msgstr[1] ""
 "إنّك تقوم بإعادة استخدام كلمة سر كنت قد استخدمتها مؤخّراً. يجب أن تستخدم "
-"كلمة سر مميّزة {num} قبل إعادة استخدام واحدة مستخدمة مسبقاً."
+"{num} كلمة سر متمايزة قبل إعادة استخدام واحدة مستخدمة مسبقاً."
 msgstr[2] ""
 "إنّك تقوم بإعادة استخدام كلمة سر كنت قد استخدمتها مؤخّراً. يجب أن تستخدم "
-"كلمات سر مميّزة {num} قبل إعادة استخدام واحدة مستخدمة مسبقاً."
+"{num} كلمات سر متمايزة قبل إعادة استخدام واحدة مستخدمة مسبقاً."
 msgstr[3] ""
 "إنّك تقوم بإعادة استخدام كلمة سر كنت قد استخدمتها مؤخّراً. يجب أن تستخدم "
-"كلمات سر مميّزة {num} قبل إعادة استخدام واحدة مستخدمة مسبقاً."
+"{num} كلمات سر متمايزة قبل إعادة استخدام واحدة مستخدمة مسبقاً."
 msgstr[4] ""
 "إنّك تقوم بإعادة استخدام كلمة سر كنت قد استخدمتها مؤخّراً. يجب أن تستخدم "
-"كلمات سر مميّزة {num} قبل إعادة استخدام واحدة مستخدمة مسبقاً."
+"{num} كلمات سر متمايزة قبل إعادة استخدام واحدة مستخدمة مسبقاً."
 msgstr[5] ""
 "إنّك تقوم بإعادة استخدام كلمة سر كنت قد استخدمتها مؤخّراً. يجب أن تستخدم "
 "{num} كلمات سر متمايزة قبل إعادة استخدام واحدة مستخدمة مسبقاً."
@@ -1241,7 +1236,7 @@ msgid ""
 "Unable to deliver your submission to grader (Reason: {error_msg}). Please "
 "try again later."
 msgstr ""
-"ليس بالإمكان إيصال الملف الذي قدّمته للأستاذ المسؤول عن التقييم (السبب: "
+"ليس بالإمكان إيصال الملف الذي قدّمته للأستاذ المسؤول عن التقييم (Reason: "
 "{error_msg}). الرجاء إعادة المحاولة لاحقاً."
 
 #. Translators: 'grader' refers to the edX automatic code grader.
@@ -2521,6 +2516,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr "المدعوون فقط"
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "نبذة عن"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "عام"
@@ -2939,23 +2974,6 @@ msgstr "إدخال تاريخ الاستحقاق لحلّ المسائل."
 msgid "Group ID {group_id}"
 msgstr "الرمز التعريفي للمجموعة  {group_id}"
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr "تحذير"
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "حدث خطأ"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr "لم يتمّ اختياره"
@@ -3362,9 +3380,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -3467,7 +3486,7 @@ msgid ""
 "Could not find needed tag {tag_name} in the survey responses. Please try "
 "submitting again."
 msgstr ""
-"لا يمكن إيجاد بطاقة التعريف{tag_name} المطلوبة ضمن إردود المسح الميداني. "
+"لا يمكن إيجاد بطاقة التعريف{tag_name} المطلوبة ضمن ردود المسح الميداني. "
 "الرجاء محاولة التقديم مرة ثانية."
 
 #: common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
@@ -4047,6 +4066,8 @@ msgid "Unable to switch to specified branch. Please check your branch name."
 msgstr "لا يمكن التغيير إلى الفرع المحدّد. الرجاء التحقق من اسم الفرع."
 
 #: lms/djangoapps/dashboard/support.py
+#: lms/templates/shoppingcart/billing_details.html
+#: lms/templates/shoppingcart/billing_details.html
 msgid "Email Address"
 msgstr "عنوان البريد الإلكتروني"
 
@@ -4063,7 +4084,7 @@ msgstr "المستخدم غير موجود"
 
 #: lms/djangoapps/dashboard/support.py
 msgid "Course {course_id} not past the refund window."
-msgstr "لم يتخطّى المساق {course_id} نافذة استرداد القيمة."
+msgstr "لم يتخطّ المساق {course_id} نافذة استرداد القيمة."
 
 #: lms/djangoapps/dashboard/support.py
 msgid "No order found for {user} in course {course_id}"
@@ -4247,11 +4268,18 @@ msgstr "تم التغيير بنجاح إلى الفرع: {branch_name}"
 
 #: lms/djangoapps/dashboard/sysadmin.py
 msgid "Loaded course {course_name}<br/>Errors:"
-msgstr "المساق الذي تمّ تحميله  {course_name} <br/> الأخطاء:"
+msgstr "الأخطاء في المساق الذي تمّ تحميله  {course_name} <br/>:"
 
 #: lms/djangoapps/dashboard/sysadmin.py lms/djangoapps/dashboard/sysadmin.py
+#: cms/templates/course-create-rerun.html cms/templates/index.html
+#: lms/templates/shoppingcart/receipt.html
+#, fuzzy
 msgid "Course Name"
-msgstr "اسم المساق "
+msgstr ""
+"#-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#\n"
+"اسم المساق \n"
+"#-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#\n"
+"اسم المساق"
 
 #: lms/djangoapps/dashboard/sysadmin.py
 msgid "Directory/ID"
@@ -4404,7 +4432,7 @@ msgstr ""
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Invoice number '{0}' does not exist."
-msgstr "رقم الفاتورة '{0}' غير موجود."
+msgstr " الإيصال رقم '{0}' غير موجود.."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "The sale associated with this invoice has already been invalidated."
@@ -4412,7 +4440,7 @@ msgstr "لقد سبق وتم إلغاء عملية البيع المتعلقة 
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Invoice number {0} has been invalidated."
-msgstr "لم تتم المصادقة على الفاتورة رقم {0}."
+msgstr "لم تتم المصادقة على الإيصال رقم {0}."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "This invoice is already active."
@@ -4420,7 +4448,7 @@ msgstr "هذه الفاتورة مفعلة مسبقًا."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "The registration codes for invoice {0} have been re-activated."
-msgstr "لقد أعيد تفعيل رموز التسجيل للفاتورة رقم {0}."
+msgstr "لقد أعيد تفعيل رموز التسجيل للإيصال رقم {0}."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "User ID"
@@ -4511,7 +4539,8 @@ msgid ""
 "report will be available for download in the table below."
 msgstr ""
 "عملية إعداد تقرير الدرجات قيد الإنجاز. بإمكانك التحقق من حالة مهمة إعداد "
-"التقرير في قسم ’المهام معلّقة لموجّه المساق‘."
+"التقرير في قسم ’المهام معلّقة لموجّه المساق‘، عند استكمال إعداد التقرير فإنه"
+" سيصبح متاحًا للتنزيل في الجدول أدناه."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Successfully changed due date for student {0} for {1} to {2}"
@@ -4538,27 +4567,24 @@ msgstr "لا يوجد رمز للقسيمة"
 #: lms/djangoapps/instructor/views/coupons.py
 #: lms/djangoapps/instructor/views/coupons.py
 msgid "coupon with the coupon id ({coupon_id}) DoesNotExist"
-msgstr "لا يوجد قسيمة تحمل الرمز التعريفي للقسيمة ({coupon_id})"
+msgstr "لا يوجد قسيمة تحمل الرمز التعريفي  ({coupon_id})"
 
 #: lms/djangoapps/instructor/views/coupons.py
 #: lms/djangoapps/instructor/views/coupons.py
 msgid "coupon with the coupon id ({coupon_id}) is already inactive"
-msgstr ""
-"إنّ القسيمة التي  تحمل الرمز التعريفي للقسيمة ({coupon_id}) هي غير فعالة "
-"بالفعل"
+msgstr "إنّ القسيمة التي  تحمل الرمز التعريفي ({coupon_id}) غير مفعّلة بالفعل"
 
 #: lms/djangoapps/instructor/views/coupons.py
 #: lms/djangoapps/instructor/views/coupons.py
 msgid "coupon with the coupon id ({coupon_id}) updated successfully"
-msgstr ""
-"تمّت عملية تحديث قسيمة تحمل الرمز التعريفي للقسيمة ({coupon_id}) بنجاح"
+msgstr "تمّ بنجاح تحديث قسيمة تحمل الرمز التعريفي ({coupon_id}) "
 
 #: lms/djangoapps/instructor/views/coupons.py
 msgid ""
 "The code ({code}) that you have tried to define is already in use as a "
 "registration code"
 msgstr ""
-"إنّ الرمز ({code}) الذي قد حاولت تحديده هو بالفعل قيد الاستخدام بمثابة رمز "
+"إنّ الرمز ({code}) الذي قد حاولت تحديده موجود قيد الاستخدام فعليًّا كرمز "
 "للتسجيل."
 
 #: lms/djangoapps/instructor/views/coupons.py
@@ -4571,7 +4597,7 @@ msgstr "الرجاء إدخال قيمة الخصم في القسيمة الأق
 
 #: lms/djangoapps/instructor/views/coupons.py
 msgid "coupon with the coupon code ({code}) added successfully"
-msgstr "تمّت إضافة قسيمة تحمل رمز القسيمة ({code}) بنجاح"
+msgstr "تمّت بنجاح إضافة قسيمة تحمل رمز القسيمة ({code}) "
 
 #: lms/djangoapps/instructor/views/coupons.py
 msgid "coupon with the coupon code ({code}) already exists for this course"
@@ -4584,16 +4610,16 @@ msgstr "لم نتمكّن من إيجاد الرمز التعريفي للقسي
 
 #: lms/djangoapps/instructor/views/coupons.py
 msgid "coupon with the coupon id ({coupon_id}) updated Successfully"
-msgstr ""
-"تمّت عملية تحديث قسيمة تحمل الرمز التعريفي للقسيمة ({coupon_id}) بنجاح"
+msgstr "تمّت بنجاح تحديث قسيمة تحمل الرمز التعريفي ({coupon_id}) "
 
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 msgid ""
 "To gain insights into student enrollment and participation {link_start}visit"
 " {analytics_dashboard_name}, our new course analytics product{link_end}."
 msgstr ""
-"للاطلاع على تسجيل ومشاركة الطلاب {link_start}اذهب إلى "
-"{analytics_dashboard_name}، منتجنا الجديد لتحليل المساقات{link_end}."
+"لمزيدٍ من المعلومات حول تسجيل ومشاركة الطلاب {link_start} يمكنك زيارة "
+"{analytics_dashboard_name}، منتجنا الجديد لتحليل التفاعل على المساقات "
+"{link_end}."
 
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 msgid "E-Commerce"
@@ -4633,6 +4659,10 @@ msgstr "تنزيل البيانات"
 msgid "Analytics"
 msgstr "التحليلات"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -4646,22 +4676,22 @@ msgstr "تمّ إرسال 0"
 #: lms/djangoapps/instructor/views/instructor_task_helpers.py
 msgid "{num_emails} sent"
 msgid_plural "{num_emails} sent"
-msgstr[0] "تمّ إرسال {num_emails}"
-msgstr[1] "تمّ إرسال {num_emails}"
-msgstr[2] "تمّ إرسال {num_emails}"
-msgstr[3] "تمّ إرسال {num_emails}"
-msgstr[4] "تمّ إرسال {num_emails}"
-msgstr[5] "تمّ إرسال {num_emails}"
+msgstr[0] "تمّ إرسال {num_emails} رسالة بريد إلكتروني"
+msgstr[1] "تمّ إرسال {num_emails} رسالة بريد إلكتروني"
+msgstr[2] "تمّ إرسال {num_emails} رسائل بريد إلكتروني"
+msgstr[3] "تمّ إرسال {num_emails} رسائل بريد إلكتروني"
+msgstr[4] "تمّ إرسال {num_emails} رسائل بريد إلكتروني"
+msgstr[5] "تمّ إرسال {num_emails} رسائل بريد إلكتروني"
 
 #: lms/djangoapps/instructor/views/instructor_task_helpers.py
 msgid "{num_emails} failed"
 msgid_plural "{num_emails} failed"
-msgstr[0] "لم تنجح عملية إرسال {num_emails}"
-msgstr[1] "لم تنجح عملية إرسال {num_emails}"
-msgstr[2] "لم تنجح عملية إرسال {num_emails}"
-msgstr[3] "لم تنجح عملية إرسال {num_emails}"
-msgstr[4] "لم تنجح عملية إرسال {num_emails}"
-msgstr[5] "لم تنجح عملية إرسال {num_emails}"
+msgstr[0] "لم تنجح عملية إرسال {num_emails} رسالة بريد إلكتروني"
+msgstr[1] "لم تنجح عملية إرسال {num_emails} رسالة بريد إلكتروني"
+msgstr[2] "لم تنجح عملية إرسال {num_emails} رسائل بريد إلكتروني"
+msgstr[3] "لم تنجح عملية إرسال {num_emails} رسائل بريد إلكتروني"
+msgstr[4] "لم تنجح عملية إرسال {num_emails} رسائل بريد إلكتروني"
+msgstr[5] "لم تنجح عملية إرسال {num_emails} رسائل بريد إلكتروني "
 
 #: lms/djangoapps/instructor/views/instructor_task_helpers.py
 #: lms/templates/verify_student/midcourse_reverify_dash.html
@@ -5037,7 +5067,7 @@ msgstr "تم إعادة تقييم الدرجات"
 #. messages as {action}.
 #: lms/djangoapps/instructor_task/tasks.py
 msgid "reset"
-msgstr "تمت إعادة الضبط إلى الوضع الابتدائي"
+msgstr "إعادة الضبط"
 
 #. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: This is a past-tense verb that is inserted into task progress
@@ -5191,13 +5221,13 @@ msgstr "الحالة: تم {action} لـ {succeeded} من {attempted}"
 #. progress status messages.
 #: lms/djangoapps/instructor_task/views.py
 msgid " (skipping {skipped})"
-msgstr "(تخطّي {skipped})"
+msgstr " (skipping {skipped})"
 
 #. Translators: {total} is a count.  This message is appended to task progress
 #. status messages.
 #: lms/djangoapps/instructor_task/views.py
 msgid " (out of {total})"
-msgstr "(من أصل  {total})"
+msgstr " (out of {total})"
 
 #: lms/djangoapps/linkedin/templates/linkedin_email.html
 msgid ""
@@ -5384,7 +5414,7 @@ msgid ""
 "contact {billing_email}. Please include your order number in your e-mail. "
 "Please do NOT include your credit card information."
 msgstr ""
-"ملاحظة - أمامك مهلة لا تزيد عن 2 أسبوع منذ بدء المساق لإلغاء التسجيل في  "
+"ملاحظة - أمامك مهلة لا تزيد عن أسبوعين منذ بدء المساق لإلغاء التسجيل في  "
 "الشهادة الموثّقة واسترداد المبلغ بالكامل. ولاستلام المبلغ المسترد، الرجاء "
 "الاتصال عبر رسالة بريد الإلكتروني على العنوان {billing_email}، والتي يجب أن "
 "تتضمن رقم الطلب. الرجاء عدم ذكر معلومات بطاقتك الائتمانية في تلك الرسالة.  "
@@ -5611,7 +5641,7 @@ msgstr "يُسمح باسترداد قسيمة واحدة فقط للطلب ال
 
 #: lms/djangoapps/shoppingcart/views.py
 msgid "Coupon '{0}' is not valid for any course in the shopping cart."
-msgstr "ليست القسيمة '{0}' صالحة لإي مساق في عربة التسوّق."
+msgstr "ليست القسيمة '{0}' صالحة لأي مساق في عربة التسوّق."
 
 #: lms/djangoapps/shoppingcart/views.py
 msgid "success"
@@ -5645,90 +5675,54 @@ msgstr ""
 "المبلغ المستحق الذي أظهره معالج الدفع {0} {1} يختلف عن المجموع الكلي لتكلفة "
 "الطلب {2} {3}."
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
-"\n"
-"\n"
-"<p class=\"error_msg\">\n"
-"نأسف! الدفعة المقدّمة لم يتم قبولها من معالج الدفع لدينا.\n"
-"القرار الذي جاء في الرد كان  <span class=\"decision\">{decision}</span>,\n"
-"وذلك بسبب <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"لم يتم اقتطاع المبلغ لديك. الرجاء محاولة الدفع باستخدام طريقة أخرى.\n"
-"الرجاء الاتصال بنا بخصوص أية أسئلة متعلّقة بالدفع على البريد الإلكتروني {email}.\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"\n"
-"<p class=\"error_msg\">\n"
-"نأسف! أرسل لنا معالج الدفع لدينا رسالة تأكيد على استلام الدفعة تحمل بياناتٍ متناقضة.\n"
-"نعتذر عن عدم إمكان التحقق من أن عملية الدفع قد استكملت بنجاح وبالتالي اتخاذ مزيد من الإجراءات بخصوص طلبك.\n"
-"جاء في رسالة الخطأ تحديداً ما يلي:  <span class=\"exception_msg\">{msg}</span>.\n"
-"هناك احتمال أن يكون قد تم اقتطاع المبلغ من بطاقتك الائتمانية.\n"
-"الرجاء الاتصال بنا بخصوص أية أسئلة متعلّقة بالدفع على البريد الإلكتروني {email}.\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"\n"
-"<p class=\"error_msg\">\n"
-"نأسف! نظراً لحدوث خطأ فقد تم اقتطاع مبلغ للدفع يختلف عن مبلغ الإجمالي المتوجب بحسب الطلب! \n"
-"جاء في رسالة الخطأ تحديداً ما يلي:  <span class=\"exception_msg\">{msg}</span>.\n"
-"هناك احتمال أن يكون قد تم اقتطاع المبلغ من بطاقتك الائتمانية.\n"
-"الرجاء الاتصال بنا بخصوص أية أسئلة متعلّقة بالدفع على البريد الإلكتروني {email}.\n"
-"</p>"
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-"\n"
-"\n"
-"<p class=\"error_msg\">\n"
-"نأسف! فقد أرسل معالج الدفع لدينا رسالة مشوّهة بخصوص عملية الدفع الخاصة بك، لذا فليس بإمكاننا التحقق\n"
-"ما إذا كانت الرسالة قد جاءت بالفعل من معالج الدفع.\n"
-"جاء في رسالة الخطأ تحديداً ما يلي:  <span class=\"exception_msg\">{msg}</span>.\n"
-"نعتذر عن عدم إمكانية التحقق ما إذا تم بالفعل إتمام الدفعة وبالتالي اتخاذ المزيد من الإجراءات بخصوص طلبك.\n"
-"هناك احتمال أن يكون قد تم اقتطاع المبلغ من بطاقتك الائتمانية.\n"
-"الرجاء الاتصال بنا بخصوص أية أسئلة متعلّقة بالدفع على البريد الإلكتروني {email}.\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6024,7 +6018,7 @@ msgid ""
 "charged. Please try a different form of payment.  Contact us with payment-"
 "related questions at {email}."
 msgstr ""
-"نأسف! الدفعة المقدّمة لم يتم قبولها من معالج الدفع لدينا.\n"
+"عذرًا! الدفعة المقدّمة لم يتم قبولها من معالج الدفع لدينا.\n"
 "القرار الذي جاء في الرد كان {decision}، وذلك بسبب {reason}.\n"
 "لم يتم اقتطاع المبلغ لديك. الرجاء محاولة الدفع باستخدام طريقة أخرى.\n"
 "الرجاء الاتصال بنا بخصوص أية أسئلة متعلّقة بالدفع على البريد الإلكتروني {email}."
@@ -6032,25 +6026,19 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
-"عذراً! فقد أرسل لنا معالج الدفع لدينا رسالة تأكيد على استلام الدفعة تحمل بياناتٍ متناقضة! نعتذر عن عدم إمكان التحقق من أن عملية الدفع قد استكملت بنجاح وبالتالي اتخاذ مزيد من الإجراءات بخصوص طلبك. جاء في رسالة حدث خطأ تحديداً ما يلي: {msg} هناك احتمال أن يكون قد تم اقتطاع المبلغ من بطاقتك الائتمانية.\n"
-"الرجاء الاتصال بنا بخصوص أية أسئلة متعلّقة بالدفع على البريد الإلكتروني {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
-"عذراً! نظراً لحدوث خطأ فقد تم اقتطاع مبلغ للدفع يختلف عن مبلغ الإجمالي "
-"المتوجب بحسب الطلب! جاء في رسالة حدوث الخطأ تحديداً ما يلي: {msg}. هناك "
-"احتمال أن يكون قد تم اقتطاع المبلغ من بطاقتك الائتمانية.الرجاء الاتصال بنا "
-"بخصوص أية أسئلة متعلّقة بالدفع على البريد الإلكتروني {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -6058,11 +6046,9 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
-"عذراً! فقد أرسل معالج الدفع لدينا رسالة مشوّهة بخصوص عملية الدفع الخاصة بك، لذا فليس بإمكاننا التحقّق مما إذا كانت الرسالة قد جاءت بالفعل من معالج الدفع. جاء في رسالة حدث خطأ تحديداً ما يلي: {msg}. نعتذر عن عدم إمكانية التحقق مما إذا تمّ بالفعل إتمام الدفعة وبالتالي اتخاذ المزيد من الإجراءات بخصوص طلبك. هناك احتمال أن يكون قد تم اقتطاع المبلغ من بطاقتك الائتمانية.\n"
-"الرجاء الاتصال بنا بخصوص أية أسئلة متعلّقة بالدفع على البريد الإلكتروني {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -6078,12 +6064,9 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
-"عذراً! لم نتمكّن من معالجة عملية الدفع الخاصة بك بسبب حدوث استثناء غير "
-"متوقّع. الرجاء الاتصال بنا على البريد الإلكتروني {email} للحصول على "
-"المساعدة."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -6136,7 +6119,7 @@ msgid ""
 "Invalid card verification number (CVN). Possible fix: retry with another "
 "form of payment"
 msgstr ""
-"رقم التعريف الخاص بالبطاقة غير صحيح (CVN). الإجراء التصحيحي الممكن: الرجاء "
+"رقم التعريف الخاص بالبطاقة (CVN) غير صحيح. الإجراء التصحيحي الممكن: الرجاء "
 "إعادة المحاولة بطريقة دفع أخرى "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6219,7 +6202,7 @@ msgstr "لا يتطابق الاسم المرتبط بحسابك مع الاسم
 
 #: lms/djangoapps/verify_student/models.py
 msgid "The image of your face was not clear."
-msgstr "الصورة المأخوذة عن وجهك كانت غير واضحة بدرجة كافية."
+msgstr "لم تكن الصورة المأخوذة لوجهك واضحة."
 
 #: lms/djangoapps/verify_student/models.py
 msgid "Your face was not visible in your self-photo"
@@ -6243,7 +6226,7 @@ msgstr "لم يتم اختيار سعر أو أن السعر الذي تم اخ
 
 #: lms/envs/common.py
 msgid "Taiwan"
-msgstr ""
+msgstr "تايوان"
 
 #: lms/lib/xblock/mixin.py
 msgid "Courseware Chrome"
@@ -7376,16 +7359,16 @@ msgid "Help"
 msgstr "المساعدة"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
-msgstr "إجراء عملية ترقية بالتسجيل في {}  |  قم باختيار المسار الخاص بك"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "قم بالتسجيل في {} | قم باختيار المسار الخاص بك"
+msgid "Enroll In {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr "للأسف، لقد حدث خطأ أثناء محاولة تسجيلك. "
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -7427,8 +7410,8 @@ msgid "):"
 msgstr "): "
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
-msgstr "إجراء عملية ترقية للتسجيل الخاص بك"
+msgid "Upgrade Your Enrollment"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Audit This Course"
@@ -7525,13 +7508,13 @@ msgid ""
 " on our {fb_link_start}facebook page{fb_link_end}. Though we may not have a "
 "chance to respond to every email, we take all feedback into consideration."
 msgstr ""
-"إذا كان لديك سؤالاً عاماً عن {platform_name} الرجاء إرسال رسالة عبر البريد "
+"إذا كان لديك سؤال عام عن {platform_name} الرجاء إرسال رسالة عبر البريد "
 "الإلكتروني إلى {contact_email}. وللتحقق مما إذا كانت قد تمّت الإجابة على "
-"سؤالك مسبقاً، قم بزيارة {faq_link_start}صفحة الأسئلة الأكثر "
-"تكراراً{faq_link_end}. بإمكانك كذلك الانضمام إلى نقاشنا على "
-"{fb_link_start}صفحتنا على موقع فيسبوك{fb_link_end}. وعلى الرغم من أننا قد لا"
-" نتمكن من الإجابة على كافة الرسائل الإلكترونية، إلا أننا نأخذ كافة الآراء "
-"والملاحظات الواردة بالاعتبار. "
+"سؤالك مسبقاً، قم بزيارة {faq_link_start}صفحة الأسئلة المتكررة{faq_link_end}."
+" بإمكانك كذلك الانضمام إلى نقاشنا على {fb_link_start}صفحتنا على موقع "
+"فيسبوك{fb_link_end}. وعلى الرغم من أننا قد لا نتمكن من الإجابة على كافة "
+"الرسائل الإلكترونية، إلا أننا نأخذ كافة الآراء والملاحظات الواردة بالاعتبار."
+" "
 
 #: lms/templates/contact.html
 msgid "Technical Inquiries and Feedback"
@@ -7705,7 +7688,7 @@ msgid ""
 "To uphold the credibility of your {platform} {cert_name_short}, all name "
 "changes will be recorded."
 msgstr ""
-"سيتم تسجيل وحفظ كافة التغييرات التي تطرأ على الاسم بغرض حفظ مصداقية شهادتك "
+"سيتم تسجيل وحفظ كافة التغييرات التي تطرأ على الاسم بغرض دعم مصداقية شهادتك "
 "{platform} {cert_name_short}."
 
 #. Translators: note that {platform} {cert_name_short} will look something
@@ -7818,7 +7801,7 @@ msgstr "فشلت عملية المصادقة الخارجية"
 
 #: lms/templates/folditbasic.html
 msgid "Due:"
-msgstr "موعد التسليم:"
+msgstr "تاريخ الاستحقاق:"
 
 #: lms/templates/folditbasic.html
 msgid "Status:"
@@ -7892,11 +7875,6 @@ msgstr "(روجعت في 16/4/2014)"
 msgid "About & Company Info"
 msgstr "نبذة ومعلومات عن الشركة"
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "نبذة عن"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr "أحدث الأخبار"
@@ -8076,6 +8054,7 @@ msgstr "قم بتضمين رسائل الخطأ التي تظهر، والخطو
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "تقديم"
 
@@ -8091,10 +8070,9 @@ msgid ""
 " where most questions have already been answered."
 msgstr ""
 "نشكرك على تقديم طلبك أو إعطاء آرائك وملاحظاتك. نقوم عادةً بالرد على الطلب في"
-" غضون يوم عملٍ واحد (الاثنين للأحد، {open_time} UTC to {close_time} التوقيت "
-"العالمي المنسّق). وفي هذه الأثناء، الرجاء القيام بمراجعة {link_start} "
-"الأسئلة الأكثر تكراراً المفصلة {link_end} حيث ستجد إجابات لغالبية الأسئلة "
-"المطروحة."
+" غضون يوم عملٍ واحد (الاثنين للأحد {open_time} بتوقيت UTC حتى {close_time} "
+"بتوقيت UTC). وفي هذه الأثناء، الرجاء القيام بمراجعة {link_start} الأسئلة "
+"الأكثر تكراراً المفصلة {link_end} حيث ستجد إجابات لغالبية الأسئلة المطروحة."
 
 #: lms/templates/help_modal.html
 msgid "problem"
@@ -8263,7 +8241,7 @@ msgstr "للوصول لحسابك ومساقاتك"
 
 #: lms/templates/login.html
 msgid "We're Sorry, {platform_name} accounts are unavailable currently"
-msgstr "نعتذر لكون حسابات  {platform_name}  غير متاحة حالياً"
+msgstr "عذرًا، حسابات  {platform_name}  غير متاحة حاليًا"
 
 #: lms/templates/login.html
 msgid "We couldn't log you in."
@@ -8405,6 +8383,11 @@ msgstr "البيانات الأولية:"
 msgid "Accepted"
 msgstr "مقبول"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "حدث خطأ"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "مرفوض"
@@ -8570,7 +8553,7 @@ msgstr "أدخل اسم مستخدم علني:"
 #: lms/templates/register-shib.html lms/templates/register.html
 #: lms/templates/register.html
 msgid "example: JaneDoe"
-msgstr "اسم المستخدم"
+msgstr "مثال: جين دو"
 
 #: lms/templates/register-shib.html lms/templates/register.html
 #: lms/templates/register.html
@@ -8644,7 +8627,7 @@ msgstr ""
 "وسيتعين عليك الضغط على رابط التفعيل لإكمال العملية. إذا لم تجد هذه الرسالة، "
 "قم بالبحث في ملف الرسائل غير المرغوب بها، ثم حدّد الرسائل الواردة من "
 "{platform_name} على أنها ’ليست رسائل غير مرغوب بها‘، حيث أننا في "
-"{platform_name} نعتمد في معظم اتصالالتنا على رسائل البريد الالكتروني. "
+"{platform_name} نعتمد في معظم اتصالاتنا على رسائل البريد الالكتروني. "
 
 #: lms/templates/register-sidebar.html
 msgid "Need help in registering with {platform_name}?"
@@ -8670,7 +8653,7 @@ msgstr "التسجيل في  {platform_name} "
 
 #: lms/templates/register.html
 msgid "Create My {platform_name} Account"
-msgstr "إنشئ حسابي على {platform_name}"
+msgstr "يرجى إنشاء حساب لي على {platform_name}"
 
 #: lms/templates/register.html
 msgid "Welcome!"
@@ -8678,7 +8661,7 @@ msgstr "مرحباً! "
 
 #: lms/templates/register.html
 msgid "Register below to create your {platform_name} account"
-msgstr "قم بالتسجيل أسفل لإنشاء حسابك على منصة {platform_name}"
+msgstr "قم بالتسجيل أدناه لإنشاء حسابك على منصة {platform_name}"
 
 #. Translators: provider_name is the name of an external, third-party user
 #. authentication service (like Google or LinkedIn).
@@ -8688,7 +8671,7 @@ msgstr "التسجيل من خلال {provider_name}"
 
 #: lms/templates/register.html
 msgid "Create your own {platform_name} account below"
-msgstr "أنشئ حسابك الخاص على  {platform_name} فيما يلي"
+msgstr "قم في الأسفل بإنشاء حسابك الخاص على  {platform_name} "
 
 #. Translators: selected_provider is the name of an external, third-party user
 #. authentication service (like Google or LinkedIn).
@@ -8707,7 +8690,7 @@ msgstr "الرجاء إكمال الحقول التالية للتسجيل لح
 
 #: lms/templates/register.html lms/templates/verify_student/face_upload.html
 msgid "example: Jane Doe"
-msgstr "الإسم الكامل"
+msgstr "مثال: جين دو"
 
 #: lms/templates/register.html lms/templates/register.html
 msgid "Needed for any certificates you may earn"
@@ -8811,9 +8794,7 @@ msgstr " على سبيل المثال  اسمك الكامل  (كما سيظهر
 
 #: lms/templates/signup_modal.html
 msgid "<i>Welcome</i> {name}"
-msgstr ""
-"</i>مرحباً<i> \n"
-"{name}"
+msgstr "</i>مرحباً<i> {name}"
 
 #: lms/templates/signup_modal.html
 msgid "Full Name *"
@@ -9056,7 +9037,7 @@ msgstr "رقم الإصدار الخاص بالموقع"
 #. Translators: Git is a version-control system; see http://git-scm.com/about
 #: lms/templates/sysadmin_dashboard_gitlogs.html
 msgid "Recent git load activity for {course_id}"
-msgstr "أحدث نشاط حِمل Git لـ {course_id}"
+msgstr "أحدث نشاط تحميل git لـ {course_id}"
 
 #: lms/templates/sysadmin_dashboard_gitlogs.html
 #: lms/templates/shoppingcart/verified_cert_receipt.html
@@ -9294,7 +9275,7 @@ msgstr "نموذج التقييم الكامل قابل للتبديل"
 #. graded rubrics the user might have received
 #: lms/templates/combinedopenended/combined_open_ended_results.html
 msgid "{result_of_task} from grader {number}"
-msgstr "العلامة {result_of_task} من المسؤول عن التقييم{number}"
+msgstr "العلامة {result_of_task} من المسؤول عن التقييم رقم {number}"
 
 #. Translators: "See full feedback" is the text of
 #. a link that allows a user to see more detailed
@@ -9479,13 +9460,6 @@ msgstr "استعراض منهاج المساق"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "هذا المساق موجود ضمن <a href=\"{cart_link}\">cart</a>سلّة التسوّق</a>. "
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"إضافة {course.display_number_with_default} إلى سلة التسوّق "
-"({currency_symbol}{cost})"
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "المساق ممتلئ بالكامل"
@@ -9498,6 +9472,13 @@ msgstr "التسجيل في هذا المساق يتم بموجب دعوة حص
 msgid "Enrollment is Closed"
 msgstr "باب التسجيل مغلق"
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"إضافة {course.display_number_with_default} إلى سلة التسوّق "
+"({currency_symbol}{cost})"
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "قم بالتسجيل في  {course.display_number_with_default} "
@@ -9518,15 +9499,15 @@ msgstr "المشاركة مع الأصدقاء والعائلة!"
 #. Twitter account. {url} should appear at the end of the text.
 #: lms/templates/courseware/course_about.html
 msgid "I just registered for {number} {title} through {account}: {url}"
-msgstr "لقد تسجّلت الآن في {number} {title} من خلال {url} :{account}"
+msgstr "لقد قمت الآن بالتسجيل في {number} {title} من خلال {url} :{account}"
 
 #: lms/templates/courseware/course_about.html
 msgid "Take a course with {platform} online"
-msgstr "التسجيل في مساق مع {platform} عبر الإنترنت"
+msgstr "التسجيل في مساق على منصة {platform} عبر الإنترنت"
 
 #: lms/templates/courseware/course_about.html
 msgid "I just registered for {number} {title} through {platform} {url}"
-msgstr "لقد تسجّلت الآن في  {number} {title} من خلال {platform} {url}"
+msgstr "لقد قمت الآن بالتسجيل في {number} {title} من خلال {platform} {url}"
 
 #: lms/templates/courseware/course_about.html
 msgid "Classes Start"
@@ -9580,7 +9561,7 @@ msgstr "استكشف المساقات المجانية من الجامعات ا
 
 #: lms/templates/courseware/courses.html
 msgid "Explore free courses from {university_name}."
-msgstr "استكشف المساقات المجانية من  {university_name}."
+msgstr "استكشف المساقات المجانية التي تقدّمها {university_name}."
 
 #: lms/templates/courseware/courseware-error.html
 msgid ""
@@ -9738,7 +9719,7 @@ msgstr "عرض التحديثات في الاستديو"
 
 #: lms/templates/courseware/info.html lms/templates/courseware/info.html
 msgid "Course Updates &amp; News"
-msgstr "تحديثات وأخبار المساق "
+msgstr "تحديثات وamp;أخبار المساق "
 
 #: lms/templates/courseware/info.html lms/templates/courseware/info.html
 msgid "Handout Navigation"
@@ -10204,7 +10185,7 @@ msgstr "حالة المهمة "
 
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Duration (sec)"
-msgstr "المدة المستغرقة (sec) "
+msgstr "المدة المستغرقة (ثواني) "
 
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Task Progress"
@@ -10288,7 +10269,7 @@ msgstr "عرض التقييم والدرجات في الاستوديو"
 
 #: lms/templates/courseware/progress.html
 msgid "Course Progress for Student '{username}' ({email})"
-msgstr "متابعة تحصيل الطالب (‏{username})‏ '‏{email}'‏ في المساق"
+msgstr "متابعة تحصيل الطالب '{username}' ({email}) في المساق"
 
 #: lms/templates/courseware/progress.html
 msgid "Download your certificate"
@@ -10387,7 +10368,7 @@ msgid ""
 "{cert_name_long} was generated, we could not grant you a verified "
 "{cert_name_short}. An honor code {cert_name_short} has been granted instead."
 msgstr ""
-"لم نستطع منحك شهادة {cert_name_short} مصدّقة، لعدم حصولنا منك على مجموعة من "
+"لم نستطع منحك شهادة {cert_name_short} موثّقة، لعدم حصولنا منك على مجموعة من "
 "الصور الخاصة بالتحقق من الهوية حتى وقت إعداد الشهادة {cert_name_long}. وتم "
 "بدلاً من ذلك منحك شهادة ميثاق الشرف الأكاديمي {cert_name_short}."
 
@@ -10411,7 +10392,7 @@ msgstr "استكمال استبيان الآراء والملاحظات الخا
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "{course_number} {course_name} Cover Image"
-msgstr "{course_number} {course_name} صورة الغلاف"
+msgstr "صورة غلاف {course_number} {course_name} "
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "You're enrolled as a verified student"
@@ -10426,9 +10407,6 @@ msgstr "مسجل كـ: "
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr "تم التحقق"
 
@@ -10460,11 +10438,11 @@ msgstr "التعليم المهني."
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "Course Completed - {end_date}"
-msgstr "تاريخ انتهاء المساق - {end_date} "
+msgstr "تاريخ استكمال المساق - {end_date} "
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "Course Started - {start_date}"
-msgstr "تاريخ ابتداء المساق - {start_date} "
+msgstr "تاريخ بدء المساق - {start_date} "
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "Course has not yet started"
@@ -10522,7 +10500,6 @@ msgstr "مراجعة المساق المحفوظ في الأرشيف"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "استعراض المساق "
 
@@ -10564,7 +10541,7 @@ msgid ""
 "verified certificates. Take a minute now to help us renew your identity."
 msgstr ""
 "الناس يتغيرون، ولذلك نطلب منك كل عام أن تعيد عملية التحقق من هويتك للتحقق من"
-" شهاداتنا. نرجو منك إعطاءنا دقيقة من وقتك لمساعدتنا في تجديد هويتك."
+" شهاداتنا الموثّقة. نرجو منك إعطاءنا دقيقة من وقتك لمساعدتنا في تجديد هويتك."
 
 #: lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html
 msgid "{course_name}: Re-verify by {date}"
@@ -10594,7 +10571,7 @@ msgid ""
 "us at {email}."
 msgstr ""
 "لم تنجح عملية إعادة التحقّق للمساق {course_name} ولم تعد مؤهّلاً لتسلّم "
-"شهادة مصدّقة. إذا كان هناك ثمّة خطأ ما، الرجاء الاتصال بنا على {email}."
+"شهادة موثّقة. إذا كنت تعتقد بوجود خطأ ما، الرجاء الاتصال بنا على {email}."
 
 #: lms/templates/dashboard/_dashboard_reverification_sidebar.html
 msgid "Re-verification now open for:"
@@ -10624,7 +10601,7 @@ msgstr "الحالة المرتبطة بالتحقّق من الهوية"
 
 #: lms/templates/dashboard/_dashboard_status_verification.html
 msgid "Reviewed and Verified"
-msgstr "تمت المعاينة والتحقّق"
+msgstr "تمت المراجعة والتوثيق"
 
 #: lms/templates/dashboard/_dashboard_status_verification.html
 msgid "Your verification status is good for one year after submission."
@@ -10645,7 +10622,7 @@ msgid ""
 " not receive a verified certificate."
 msgstr ""
 "في حال لم تتمكّن من اجتياز محاولة التحقّق قبل نهاية المساق الخاص بك، فلن "
-"تستلم شهادة مصدّقة."
+"تستلم شهادة موثّقة."
 
 #: lms/templates/dashboard/_dashboard_third_party_error.html
 msgid "Could Not Link Accounts"
@@ -11119,11 +11096,11 @@ msgstr ","
 #: lms/templates/discussion/_user_profile.html
 msgid "%s discussion started"
 msgid_plural "%s discussions started"
-msgstr[0] "%s بدأ النقاش"
-msgstr[1] "%s بدأ النقاش"
-msgstr[2] "%s بدأ النقاش"
-msgstr[3] "%s بدأ النقاش"
-msgstr[4] "%s بدأ النقاش"
+msgstr[0] "بدأ %s نقاش"
+msgstr[1] "بدأ %s نقاش"
+msgstr[2] "بدأ %s نقاش"
+msgstr[3] "بدأ %s نقاش"
+msgstr[4] "بدأ %s نقاش"
 msgstr[5] "بدأت %s مناقشات "
 
 #: lms/templates/discussion/_user_profile.html
@@ -11131,7 +11108,7 @@ msgid "%s comment"
 msgid_plural "%s comments"
 msgstr[0] "%s تعليق"
 msgstr[1] "%s تعليق"
-msgstr[2] "%s تعليقات"
+msgstr[2] "%s تعليق"
 msgstr[3] "%s تعليقات"
 msgstr[4] "%s تعليقات"
 msgstr[5] "%s تعليقات"
@@ -11685,7 +11662,7 @@ msgstr "ولكم جزيل الشكر،"
 
 #: lms/templates/emails/registration_codes_sale_email.txt
 msgid "[[Your Signature]]"
-msgstr "[[توقيعك]]"
+msgstr "[[Your Signature]]"
 
 #: lms/templates/emails/registration_codes_sale_invoice_attachment.txt
 msgid "INVOICE"
@@ -12100,9 +12077,8 @@ msgid ""
 "previously generated reports from this page."
 msgstr ""
 "التقارير المذكورة أدناه متاحة للتنزيل، ويبقى رابط لكل تقرير متاحًا على هذه "
-"الصفحة محددًا بحسب تاريخ التوقيت العالمي ووقت الإنشاء. لا يتم حذف التقارير "
-"لذا يمكنك دومًا أن تدخل إلى التقارير التي تم إنشاؤها مسبقًا من خلال هذه "
-"الصفحة."
+"الصفحة محددًا بحسب توقيت UTC ووقت الإنشاء. لا يتم حذف التقارير لذا يمكنك "
+"دومًا أن تدخل إلى التقارير التي تم إنشاؤها مسبقًا من خلال هذه الصفحة."
 
 #: lms/templates/instructor/instructor_dashboard_2/data_download.html
 msgid ""
@@ -12352,8 +12328,8 @@ msgid ""
 "Specify the extension due date and time (in UTC; please specify "
 "{format_string})."
 msgstr ""
-"حدّد تاريخ الاستحقاق وتوقيت التمديد (بحسب التوقيت العالمي؛ الرجاء استخدام "
-"الصيغة {format_string})."
+"حدّد تاريخ الاستحقاق وتوقيت التمديد (بحسب توقيت UTC؛ الرجاء استخدام الصيغة "
+"{format_string})."
 
 #: lms/templates/instructor/instructor_dashboard_2/extensions.html
 msgid "Change due date for student"
@@ -12502,22 +12478,6 @@ msgstr "أي مرجع خاص بالشركة المشترية، مثلاً رقم
 msgid "Send me a copy of the invoice"
 msgstr "أرسل لي نسخة من الفاتورة"
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr "الطلاب الفاعلون"
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-"عدد الطلاب الذين تفاعلوا مرة واحدة على الأقل من خلال فتح الصفحات، أو تشغيل "
-"الفيديو، أو النشر في المناقشات، أو تقديم المسائل، أو استكمال الأنشطة الأخرى."
-" ويشمل النطاق الزمني كافة الأنشطة اعتباراً من تاريخ البدء (ضمناً) في منتصف "
-"الليل حتّى تاريخ الانتهاء في منتصف الليل (غير مشمول)."
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr "توزيع الدرجات"
@@ -13362,7 +13322,7 @@ msgstr ""
 #: lms/templates/shoppingcart/billing_details.html
 #: lms/templates/shoppingcart/billing_details.html
 msgid "email@example.com"
-msgstr ""
+msgstr "email@example.com"
 
 #: lms/templates/shoppingcart/billing_details.html
 msgid "Additional Receipt Recipient"
@@ -13538,19 +13498,19 @@ msgstr ""
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Address 1"
-msgstr ""
+msgstr "العنوان 1"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Address 2"
-msgstr ""
+msgstr "العنوان 2"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "State"
-msgstr ""
+msgstr "الحالة"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Registration for"
-msgstr ""
+msgstr "التسجيل لـ"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Course Dates"
@@ -13558,7 +13518,7 @@ msgstr ""
 
 #: lms/templates/shoppingcart/receipt.html
 msgid " {course_name} "
-msgstr ""
+msgstr " {course_name} "
 
 #: lms/templates/shoppingcart/receipt.html
 #: lms/templates/shoppingcart/receipt.html
@@ -13808,7 +13768,7 @@ msgstr "اذهب للوحة المعلومات"
 
 #: lms/templates/shoppingcart/verified_cert_receipt.html
 msgid "Verified Status"
-msgstr "الحالة المعرّفة "
+msgstr "حالة التحقّق"
 
 #: lms/templates/shoppingcart/verified_cert_receipt.html
 msgid ""
@@ -13992,6 +13952,49 @@ msgstr "حساب الطالب"
 msgid "Student Profile"
 msgstr "صفحة الطالب"
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr "تعديل اسمك "
@@ -14058,36 +14061,36 @@ msgstr ""
 "الأسئلة الشائعة لما يتعلق بشهاداتنا{a_end}."
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
-msgstr "أنت حالياً تقوم بترقية تسجيلك بغرض"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
-msgstr "أنت تقوم بعملية إعادة التحقّق بالنسبة لـ"
+msgid "You are re-verifying for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
-msgstr "تقوم بالتسجيل لـ "
+msgid "You are enrolling in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
-msgstr "تهانينا! أنت الآن مسجل لتقوم بالتدقيق"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
 msgid "Professional Education"
 msgstr "التعليم المهني"
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
-msgstr "الترقية لـ:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
-msgstr "إجراء عملية إعادة التحقّق بالنسبة لـ:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
-msgstr "تقوم بالتسجيل كـ: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
 msgid "Technical Requirements"
@@ -14496,7 +14499,7 @@ msgid ""
 msgstr ""
 "حدث خطأ ما أثناء عملية التحقّق السابقة الخاصة بك. الرجاء إتمام الخطوات "
 "التالية من أجل المتابعة بالنسبة لمسار مساقاتك الحالية في شهادة الإتمام "
-"المصدّقة."
+"الموثّقة."
 
 #: lms/templates/verify_student/photo_reverification.html
 #: lms/templates/verify_student/reverification_confirmation.html
@@ -14874,7 +14877,7 @@ msgstr "ما الذي ستحتاجه للقيام بالتسجيل "
 #: lms/templates/verify_student/show_requirements.html
 msgid ""
 "There are three things you will need to register as an ID verified student:"
-msgstr "هنالك ثلاثة أشياء ستحتاج إليها للتسجيل كطالب معرّف بالبطاقة الشخصية: "
+msgstr "هنالك ثلاثة أشياء ستحتاج إليها للتسجيل كطالب موثّق بالبطاقة الشخصية: "
 
 #: lms/templates/verify_student/show_requirements.html
 msgid "Activate Your Account"
@@ -14966,7 +14969,7 @@ msgstr "التحقق باستخدام البطاقة الشخصية "
 
 #: lms/templates/verify_student/verified.html
 msgid "You've Been Verified Previously"
-msgstr "لقد تم التحقق من هويتك مسبقاً "
+msgstr "لقد جرى التحقق من هويتك مسبقاً "
 
 #: lms/templates/verify_student/verified.html
 msgid ""
@@ -15059,7 +15062,7 @@ msgid ""
 "to start working within edX Studio."
 msgstr ""
 "تم بالفعل تفعيل هذا الحساب، الذي تم إنشاؤه باستخدام {0}. الرجاء تسجيل الدخول"
-" للبدء في العمل ضمن برنامج استديو EDX."
+" للبدء في العمل ضمن برنامج استديو edX."
 
 #: cms/templates/activation_active.html cms/templates/activation_complete.html
 msgid "Sign into Studio"
@@ -15088,8 +15091,8 @@ msgid ""
 " it into two lines."
 msgstr ""
 "نعتذر بسبب حدوث خطأٍ ما أثناء عملية تفعيل حسابك. الرجاء التحقق من صحة "
-"العنوان -URL- الذي ذهبت إليه، حيث تقوم أحياناً برامج البريد الإلكتروني "
-"بتقسيم العنوان على سطرين. "
+"العنوان -URL- الذي ذهبت إليه&mdash;، حيث تقوم أحياناً برامج البريد "
+"الإلكتروني بتقسيم العنوان على سطرين. "
 
 #: cms/templates/activation_invalid.html
 msgid ""
@@ -15106,7 +15109,7 @@ msgstr "اتصل بفريق دعم edX"
 #: cms/templates/asset_index.html cms/templates/asset_index.html
 #: cms/templates/widgets/header.html
 msgid "Files &amp; Uploads"
-msgstr "الملفات والتحميل "
+msgstr "تحميل &amp; الملفات "
 
 #: cms/templates/asset_index.html cms/templates/course_info.html
 #: cms/templates/course_outline.html cms/templates/edit-tabs.html
@@ -15128,7 +15131,7 @@ msgstr "تحميل ملف جديد"
 
 #: cms/templates/asset_index.html
 msgid "Loading&hellip;"
-msgstr "التحميل والمساعدة"
+msgstr "التحميل&hellip;"
 
 #: cms/templates/asset_index.html
 msgid "Adding Files for Your Course"
@@ -15139,7 +15142,7 @@ msgid ""
 "To add files to use in your course, click {em_start}Upload New File{em_end}."
 " Then follow the prompts to upload a file from your computer."
 msgstr ""
-"انقر {em_start}تحميل ملف جديد{em_end} لإضافة ملفات لتستخدمها في مساقك، ثم "
+"انقر {em_start} تحميل ملف جديد {em_end} لإضافة ملفات لتستخدمها في مساقك، ثم "
 "اتبع التعليمات لتقوم بتحميل ملف من جهاز الكومبيوتر لديك."
 
 #: cms/templates/asset_index.html
@@ -15148,9 +15151,9 @@ msgid ""
 "{em_start}10 MB{em_end}. In addition, do not upload video or audio files. "
 "You should use a third party service to host multimedia files."
 msgstr ""
-"{em_start}تحذير{em_end}: توصيك edX أن لا يتجاوز حجم الملف {em_start}10 "
-"ميغابايت{em_end}. بالإضافة لذلك، لا يمكنك تحميل ملفات فيديو أو صوت حيث يتعين"
-" عليك استخدام خدمة طرف ثالث لاستضافة ملفات الوسائط المتعددة."
+"{em_start} تحذير {em_end}: توصيك edX أن لا يتجاوز حجم الملف {em_start}10 "
+"ميغابايت {em_end}. بالإضافة لذلك، لا يمكنك تحميل ملفات فيديو أو صوت حيث "
+"يتعين عليك استخدام خدمة طرف ثالث لاستضافة ملفات الوسائط المتعددة."
 
 #: cms/templates/asset_index.html
 msgid ""
@@ -15169,7 +15172,7 @@ msgid ""
 "Use the {em_start}Embed URL{em_end} value to link to the file or image from "
 "a component, a course update, or a course handout."
 msgstr ""
-"استخدم قيمة {em_start}الرابط الضمني{em_end} لربطه بالملف أو الصورة من أحد "
+"استخدم قيمة {em_start} الرابط الضمني {em_end} لربطه بالملف أو الصورة من أحد "
 "المركّبات أو تحديثات المساق أو ملحقات المساق."
 
 #: cms/templates/asset_index.html
@@ -15177,8 +15180,8 @@ msgid ""
 "Use the {em_start}External URL{em_end} value to reference the file or image "
 "only from outside of your course."
 msgstr ""
-"استخدم قيمة {em_start}الرابط الخارجي{em_end} للرجوع إلى الملف أو الصورة من "
-"خارج مساقك فقط."
+"استخدم قيمة {em_start} الرابط الخارجي {em_end} للرجوع إلى الملف أو الصورة من"
+" خارج مساقك فقط."
 
 #: cms/templates/asset_index.html
 msgid ""
@@ -15720,7 +15723,7 @@ msgstr ""
 #: cms/templates/edit-tabs.html cms/templates/howitworks.html
 #: cms/templates/howitworks.html cms/templates/howitworks.html
 msgid "close modal"
-msgstr "أغلاق النموذج "
+msgstr "إغلاق النموذج "
 
 #: cms/templates/error.html
 msgid "Internal Server Error"
@@ -15788,6 +15791,15 @@ msgstr ""
 "بصيغة .tar.gz (أي، ملف تار. مضغوط عبر برنامج جي زيب) ويتضمّن هيكل المساق "
 "ومحتواه. يمكن أيضاً إعادة استيراد المساقات التي قد تمّ تصديرها."
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr "تصدير محتوى المساق الخاص بي"
@@ -15800,6 +15812,11 @@ msgstr "تصدير محتوى المساق"
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr "البيانات {em_start} التي تمّ تصديرها مع {em_end} مساقك:"
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr "محتوى المساق (كلّ الأقسام، والأقسام الفرعية، والوحدات)"
@@ -15861,14 +15878,12 @@ msgstr "ما هو المحتوى الذي يتمّ تصديره؟"
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
-"يتمّ فقط تصدير محتوى وهيكل المساق (بما في ذلك، الأقسام، والأقسام الفرعية، "
-"والوحدات). لا يتمّ تصدير البينات الأخرى، بما فيها بيانات الطلاب، ومعلومات "
-"التقييم، وبيانات منتدى المناقشة، وإعدادات المساق، ومعلومات فريق المساق."
 
 #: cms/templates/export.html
 msgid "Opening the downloaded file"
@@ -15884,6 +15899,10 @@ msgstr ""
 "استخدام برنامج أرشفة لاستخراج البيانات من ملفّ  .tar.gz. تشمل البيانات "
 "المستخرجة ملف course.xml، والملفات الفرعية التي تتضمّن محتوى المساق."
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr "تصدير المساق إلى Git"
@@ -16000,7 +16019,7 @@ msgstr "إعدادات أخرى للمساق"
 #: cms/templates/group_configurations.html
 #: cms/templates/settings_advanced.html cms/templates/settings_graders.html
 msgid "Details &amp; Schedule"
-msgstr "التفاصيل والجدول "
+msgstr "جدول &amp; التفاصيل "
 
 #: cms/templates/group_configurations.html cms/templates/settings.html
 #: cms/templates/settings_advanced.html cms/templates/settings_graders.html
@@ -16568,7 +16587,7 @@ msgstr "إنشاء مساقك الأوّل"
 
 #: cms/templates/index.html
 msgid "Your new course is just a click away!"
-msgstr "مساقك الجديد هو على بعد نقرة واحدة فقط !"
+msgstr "مساقك الجديد هو على بعد نقرة واحدة فقط!"
 
 #: cms/templates/index.html
 msgid "Becoming a Course Creator in Studio"
@@ -16971,7 +16990,7 @@ msgstr ""
 
 #: cms/templates/settings.html
 msgid "Schedule &amp; Details Settings"
-msgstr "إعدادات الجدول والتفاصيل "
+msgstr "إعدادات جدول &amp; التفاصيل "
 
 #: cms/templates/settings.html
 msgid "Schedule & Details"
@@ -17008,8 +17027,9 @@ msgid ""
 "for enrollment. Please navigate to this course at {link_for_about_page} to "
 "enroll."
 msgstr ""
-"المساق \"{course_display_name}\" المزوّد من {platform_name} مفتوح للتسجيل، "
-"يرجى الذهاب إلى هذا المساق عبر الرابط {link_for_about_page} للتسجيل."
+"مساق \"{course_display_name}\" الذي تقدّمه منصّة {platform_name} مفتوح "
+"للتسجيل حاليًا. يرجى الذهاب إلى هذا المساق عبر الرابط {link_for_about_page} "
+"للتسجيل."
 
 #: cms/templates/settings.html
 msgid "Send a note to students via email"
@@ -17280,9 +17300,9 @@ msgid ""
 " you use double quotation marks (&quot;) around the string. Do not use "
 "single quotation marks (&apos;)."
 msgstr ""
-"{em_start}ملاحظة:{em_end} عند إدخال النصوص بمثابة قيم السياسة، يرجى التأكّد "
-"من استخدام علامات الاقتباس المزدوجة (\") حول الجملة. يرجى عدم استخدام علامات"
-" الاقتباس الفردية (')."
+"{em_start}ملاحظة:{em_end} عند إدخال سلسلة من الحروف كقيم للسياسة المستخدمة، "
+"الرجاءالتأكّد من استخدام علامات الاقتباس المزدوجة  (&quot;) حول هذه السلسلة."
+" يرجى عدم استخدام علامات الاقتباس الفردية (&apos;)."
 
 #: cms/templates/settings_graders.html
 msgid "Grading Settings"
@@ -17298,7 +17318,7 @@ msgstr "مقياس التقييم العام الخاص بك درجات الطل
 
 #: cms/templates/settings_graders.html
 msgid "Grading Rules &amp; Policies"
-msgstr "قواعد وسياسات التقييم"
+msgstr "سياسات قواعد  &amp; التصحيح"
 
 #: cms/templates/settings_graders.html
 msgid "Deadlines, requirements, and logistics around grading student work"
@@ -17500,7 +17520,7 @@ msgstr "التحديثات"
 
 #: cms/templates/widgets/header.html
 msgid "Schedule &amp; Details"
-msgstr "الجدول والتفاصيل "
+msgstr "تفاصيل &amp; الجدول "
 
 #: cms/templates/widgets/header.html
 msgid "Checklists"
@@ -17516,7 +17536,7 @@ msgstr "تصدير"
 
 #: cms/templates/widgets/header.html
 msgid "Help &amp; Account Navigation"
-msgstr "المساعدة وتصفح الحساب "
+msgstr "المساعدة في &amp; تصفح الحساب "
 
 #: cms/templates/widgets/header.html cms/templates/widgets/header.html
 msgid "Contextual Online Help"
diff --git a/conf/locale/ar/LC_MESSAGES/djangojs.mo b/conf/locale/ar/LC_MESSAGES/djangojs.mo
index 8ddd1927d7..829dd219f2 100644
Binary files a/conf/locale/ar/LC_MESSAGES/djangojs.mo and b/conf/locale/ar/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ar/LC_MESSAGES/djangojs.po b/conf/locale/ar/LC_MESSAGES/djangojs.po
index 318f211c58..129e3c6a25 100644
--- a/conf/locale/ar/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ar/LC_MESSAGES/djangojs.po
@@ -49,6 +49,7 @@
 # 
 # Translators:
 # Abdelghani Gadiri <wh.gnu.linux@gmail.com>, 2014
+# qrfahasan <ahasan@qrf.org>, 2014
 # mohammad hamdi <babrica@hotmail.com>, 2014
 # may <may@qordoba.com>, 2014
 # Nabeel El-Dughailib <nabeel@qordoba.com>, 2014
@@ -67,8 +68,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
-"PO-Revision-Date: 2014-10-13 16:51+0000\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
+"PO-Revision-Date: 2014-11-05 10:01+0000\n"
 "Last-Translator: Nabeel El-Dughailib <nabeel@qordoba.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/edx-platform/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -87,7 +88,7 @@ msgstr ""
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: common/static/coffee/src/discussion/utils.js
 msgid "OK"
-msgstr "حسناً"
+msgstr "حسنًا"
 
 #. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
@@ -100,8 +101,6 @@ msgstr "حسناً"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -119,9 +118,9 @@ msgstr "إلغاء"
 msgid "This link will open in a new browser window/tab"
 msgstr ""
 "#-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#\n"
-"هذا الرابط سيُفتح في نافذة متصفح /علامة تبويب جديدة\n"
+"سوف يُفتَح هذا الرابط في نافذة متصفح/صفحة جديدة\n"
 "#-#-#-#-#  underscore-studio.po (edx-platform)  #-#-#-#-#\n"
-"سيُفتح هذا الرابط في نافذة متصفّح/علامة تبويب جديدة"
+"سيُفتح هذا الرابط في نافذة متصفّح/صفحة جديدة"
 
 #: cms/static/js/factories/manage_users.js
 #: lms/static/coffee/src/instructor_dashboard/util.js
@@ -214,7 +213,7 @@ msgstr[5] "(%(earned)s/%(possible)s نقاط)"
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 msgid "(%(num_points)s point possible)"
 msgid_plural "(%(num_points)s points possible)"
-msgstr[0] "(%(num_points)s نقاط محتملة)"
+msgstr[0] "(%(num_points)s نقطة محتملة)"
 msgstr[1] "(%(num_points)s نقطة محتملة)"
 msgstr[2] "(%(num_points)s نقطة محتملة)"
 msgstr[3] "(%(num_points)s نقطة محتملة)"
@@ -237,7 +236,7 @@ msgstr "إخفاء الإجابات"
 #. student must solve.;
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 msgid "Show Answer"
-msgstr "أظهر الإجابات"
+msgstr "إظهار الإجابات"
 
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 msgid "Reveal Answer"
@@ -1743,32 +1742,32 @@ msgstr "انتهى الفيديو"
 #: common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
 msgid "%(value)s hour"
 msgid_plural "%(value)s hours"
-msgstr[0] "ساعات %(value)s"
-msgstr[1] "ساعة %(value)s"
-msgstr[2] "ساعتان %(value)s"
-msgstr[3] "ساعات %(value)s"
-msgstr[4] "ساعات %(value)s"
-msgstr[5] "ساعات %(value)s"
+msgstr[0] "%(value)s ساعة"
+msgstr[1] "%(value)s ساعة "
+msgstr[2] "%(value)s ساعة"
+msgstr[3] " %(value)s ساعات"
+msgstr[4] "%(value)s ساعات "
+msgstr[5] "%(value)s ساعات "
 
 #: common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
 msgid "%(value)s minute"
 msgid_plural "%(value)s minutes"
-msgstr[0] "دقائق %(value)s"
-msgstr[1] "دقيقة %(value)s"
-msgstr[2] "دقيقتان %(value)s"
-msgstr[3] "دقائق %(value)s"
-msgstr[4] "دقائق %(value)s"
-msgstr[5] "دقائق %(value)s"
+msgstr[0] "%(value)s دقيقة"
+msgstr[1] "%(value)s دقيقة "
+msgstr[2] "%(value)s دقيقة"
+msgstr[3] "%(value)s دقائق "
+msgstr[4] "%(value)s دقائق "
+msgstr[5] "%(value)s دقائق "
 
 #: common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
 msgid "%(value)s second"
 msgid_plural "%(value)s seconds"
-msgstr[0] "ثواني %(value)s"
-msgstr[1] "ثانية %(value)s"
-msgstr[2] "ثانيتان %(value)s"
-msgstr[3] "ثواني %(value)s"
-msgstr[4] "ثواني %(value)s"
-msgstr[5] "ثواني %(value)s"
+msgstr[0] "%(value)s ثانية"
+msgstr[1] "%(value)s ثانية "
+msgstr[2] "%(value)s ثانية"
+msgstr[3] "%(value)s ثواني "
+msgstr[4] "%(value)s ثواني "
+msgstr[5] "%(value)s ثواني "
 
 #: common/lib/xmodule/xmodule/js/src/video/09_video_caption.js
 msgid "Caption will be displayed when "
@@ -1784,7 +1783,7 @@ msgstr "إيقاف العناوين الفرعية"
 
 #: common/lib/xmodule/xmodule/public/js/split_test_author_view.js
 msgid "Creating missing groups&hellip;"
-msgstr "إنشاء المجموعات الناقصة&hellip؛"
+msgstr "إنشاء المجموعات الناقصة&hellip;"
 
 #: common/static/coffee/src/discussion/discussion_module_view.js
 #: common/static/coffee/src/discussion/discussion_module_view.js
@@ -1848,9 +1847,9 @@ msgstr "..."
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "currently %(numVotes)s vote"
 msgid_plural "currently %(numVotes)s votes"
-msgstr[0] "يوجد %(صفر)s صوت"
-msgstr[1] "يوجد صوت %(واحد)s"
-msgstr[2] "يوجد صوتان %(اثنان)s"
+msgstr[0] "يوجد %(numVotes)s صوت"
+msgstr[1] "يوجد %(numVotes)s صوت"
+msgstr[2] "يوجد %(numVotes)s صوت"
 msgstr[3] "يوجد %(numVotes)s أصوات"
 msgstr[4] "يوجد %(numVotes)s أصوات"
 msgstr[5] "يوجد %(numVotes)s صوت"
@@ -1858,11 +1857,11 @@ msgstr[5] "يوجد %(numVotes)s صوت"
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "%(numVotes)s Vote"
 msgid_plural "%(numVotes)s Votes"
-msgstr[0] "%(صفر)s أصوات"
-msgstr[1] "صوت %(واحد)s"
-msgstr[2] "صوتان %(اثنان)s"
-msgstr[3] "%(بعض)s الأصوات"
-msgstr[4] "%(عدة)s أصوات"
+msgstr[0] "%(numVotes)s صوت"
+msgstr[1] "%(numVotes)s صوت "
+msgstr[2] "%(numVotes)s صوت"
+msgstr[3] "%(numVotes)s أصوات"
+msgstr[4] "%(numVotes)s أصوات"
 msgstr[5] "%(numVotes)s صوت"
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
@@ -1942,12 +1941,12 @@ msgstr ""
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 msgid "%(unread_count)s new comment"
 msgid_plural "%(unread_count)s new comments"
-msgstr[0] "تعليق جديد %(unread_count)s"
-msgstr[1] "تعليق جديد %(unread_count)s"
-msgstr[2] "تعليق جديد %(unread_count)s"
-msgstr[3] "تعليق جديد %(unread_count)s"
-msgstr[4] "تعليق جديد %(unread_count)s"
-msgstr[5] "تعليقات جديدة %(unread_count)s"
+msgstr[0] "%(unread_count)s تعليق جديد "
+msgstr[1] "%(unread_count)s تعليق جديد"
+msgstr[2] "%(unread_count)s تعليقات جديدة"
+msgstr[3] "%(unread_count)s تعليقات جديدة"
+msgstr[4] " %(unread_count)s تعليقات جديدة"
+msgstr[5] " %(unread_count)s تعليقات جديدة"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 msgid "Search Results"
@@ -1989,22 +1988,22 @@ msgstr "هناك مشكلة ما في عملية تحميل المزيد من ا
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "%(numResponses)s other response"
 msgid_plural "%(numResponses)s other responses"
-msgstr[0] "%(صفر)s ردود أخرى"
-msgstr[1] "رد %(واحد)s آخر"
-msgstr[2] "ردّان %(اثنان)s آخران"
-msgstr[3] "%(بعض)s الردود الأخرى"
-msgstr[4] "%(عدة)s ردود أخرى"
+msgstr[0] "%(numResponses)s ردود أخرى"
+msgstr[1] "%(numResponses)s ردّ آخر"
+msgstr[2] "%(numResponses)s ردّ آخر"
+msgstr[3] "%(numResponses)s ردود أخرى"
+msgstr[4] "%(numResponses)s ردود أخرى"
 msgstr[5] "%(numResponses)s ردود أخرى"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "%(numResponses)s response"
 msgid_plural "%(numResponses)s responses"
-msgstr[0] "ردود %(numResponses)s"
-msgstr[1] "ردود %(numResponses)s"
-msgstr[2] "ردود %(numResponses)s"
-msgstr[3] "ردود %(numResponses)s"
-msgstr[4] "ردود %(numResponses)s"
-msgstr[5] "ردود %(numResponses)s"
+msgstr[0] "%(numResponses)s ردّ"
+msgstr[1] "%(numResponses)s ردّ"
+msgstr[2] "%(numResponses)s ردّ"
+msgstr[3] "%(numResponses)s ردود"
+msgstr[4] "%(numResponses)s ردود "
+msgstr[5] "%(numResponses)s ردود "
 
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "Showing all responses"
@@ -2100,7 +2099,7 @@ msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d دقيقة"
 msgstr[1] "%d دقيقة"
-msgstr[2] "%d دقيقتين"
+msgstr[2] "%d دقيقة"
 msgstr[3] "%d دقائق "
 msgstr[4] "%d دقيقة"
 msgstr[5] "%d دقيقة"
@@ -2114,7 +2113,7 @@ msgid "about %d hour"
 msgid_plural "about %d hours"
 msgstr[0] "حوالي %d ساعة"
 msgstr[1] "حوالي %d ساعة"
-msgstr[2] "حوالي %d ساعتين"
+msgstr[2] "حوالي %d ساعة"
 msgstr[3] "حوالي %d ساعات"
 msgstr[4] "حوالي %d ساعة"
 msgstr[5] "حوالي %d ساعة"
@@ -2127,8 +2126,8 @@ msgstr "يوم واحد"
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d يوم"
-msgstr[1] "%d يوم واحد"
-msgstr[2] "%d يومين"
+msgstr[1] "%d يوم"
+msgstr[2] "%d يوم"
 msgstr[3] "%d أيام"
 msgstr[4] "%d يوم"
 msgstr[5] "%d يوم"
@@ -2141,10 +2140,10 @@ msgstr "حوالي الشهر"
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d شهر"
-msgstr[1] "%d شهر واحد"
-msgstr[2] "%d شهرين"
+msgstr[1] "%d شهر"
+msgstr[2] "%d شهر"
 msgstr[3] "%d أشهر"
-msgstr[4] "%d شهر"
+msgstr[4] "%d أشهر"
 msgstr[5] "%d شهر"
 
 #: common/static/js/src/jquery.timeago.locale.js
@@ -2171,11 +2170,11 @@ msgstr "انقر على مربع الاختيار لإزالة جميع الإب
 #: common/static/js/vendor/ova/flagging-annotator.js
 msgid "Check the box to remove %(totalFlags)s flag."
 msgid_plural "Check the box to remove %(totalFlags)s flags."
-msgstr[0] "انقر مربع الاختيار لإزالة %(صفر)s إبلاغ."
-msgstr[1] "انقر مربع الاختيار لإزالة إبلاغ %(واحد)s "
-msgstr[2] "انقر مربع الاختيار لإزالة إبلاغين %(اثنين)s"
-msgstr[3] "انقر مربع الاختيار لإزالة %(بضعة)s إبلاغات"
-msgstr[4] "انقر مربع الاختيار لإزالة %(عدة)s إبلاغات"
+msgstr[0] "انقر مربع الاختيار لإزالة %(totalFlags)s إبلاغ."
+msgstr[1] "انقر مربع الاختيار لإزالة %(totalFlags)s إبلاغ"
+msgstr[2] "انقر مربع الاختيار لإزالة %(totalFlags)s إبلاغ"
+msgstr[3] "انقر مربع الاختيار لإزالة %(totalFlags)s إبلاغات"
+msgstr[4] "انقر مربع الاختيار لإزالة %(totalFlags)s إبلاغات"
 msgstr[5] "انقر مربع الاختيار لإزالة %(totalFlags)s إبلاغات"
 
 #. Translators: 'count' is the number of flags solely for that annotation that
@@ -2183,11 +2182,11 @@ msgstr[5] "انقر مربع الاختيار لإزالة %(totalFlags)s إبل
 #: common/static/js/vendor/ova/flagging-annotator.js
 msgid "Check the box to remove %(count)s flag."
 msgid_plural "Check the box to remove %(count)s flags."
-msgstr[0] "انقر مربع الاختيار لإزالة %(صفر)s إبلاغ"
-msgstr[1] "انقر مربع الاختيار لإزالة إبلاغ %(واحد)s"
-msgstr[2] "انقر مربع الاختيار لإزالة إبلاغين %(اثنين)s"
-msgstr[3] "انقر مربع الاختيار لإزالة %(بضعة)s إبلاغات"
-msgstr[4] "انقر مربع الاختيار لإزالة %(عدة)s إبلاغات"
+msgstr[0] "انقر مربع الاختيار لإزالة %(count)s إبلاغ"
+msgstr[1] "انقر مربع الاختيار لإزالة %(count)s إبلاغ "
+msgstr[2] "انقر مربع الاختيار لإزالة %(count)s إبلاغ"
+msgstr[3] "انقر مربع الاختيار لإزالة %(count)s إبلاغ"
+msgstr[4] "انقر مربع الاختيار لإزالة %(count)s إبلاغ"
 msgstr[5] "انقر مربع الاختيار لإزالة %(count)s إبلاغات"
 
 #: common/static/js/vendor/ova/flagging-annotator.js
@@ -2208,11 +2207,11 @@ msgstr "الإبلاغ عن الملاحظات التوضيحية على أنه
 #: common/static/js/vendor/ova/flagging-annotator.js
 msgid "This annotation has %(count)s flag."
 msgid_plural "This annotation has %(count)s flags."
-msgstr[0] "يوجد %(صفر)s إبلاغ على هذه الملاحظات التوضيحية"
-msgstr[1] "يوجد إبلاغ %(واحد)s على هذه الملاحظات التوضيحية"
-msgstr[2] "يوجد إبلاغان %(اثنان)s على هذه الملاحظات التوضيحية"
-msgstr[3] "توجد %(بضعة)s إبلاغات على هذه الملاحظات التوضيحية"
-msgstr[4] "توجد %(عدة)s إبلاغات على هذه الملاحظات التوضيحية"
+msgstr[0] "يوجد %(count)s إبلاغ على هذه الملاحظات التوضيحية"
+msgstr[1] "يوجد %(count)s إبلاغ على هذه الملاحظات التوضيحية"
+msgstr[2] "يوجد %(count)s إبلاغ على هذه الملاحظات التوضيحية"
+msgstr[3] "توجد %(count)s إبلاغات على هذه الملاحظات التوضيحية"
+msgstr[4] "توجد %(count)s إبلاغات على هذه الملاحظات التوضيحية"
 msgstr[5] "يوجد %(count)s إبلاغات على هذه الملاحظات التوضيحية"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
@@ -2311,169 +2310,6 @@ msgstr "الرد"
 msgid "Tags:"
 msgstr "بطاقات التعريف:"
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "%s متاح "
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-" هذه قائمة بالـ %s المتاحة. تستطيع اختيار البعض عن طريق انتقائهم في المربع "
-"أدناه ومن ثم الضغط على سهم \"اختيار\" الموجود بين المربعين."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "اطبع داخل هذا المربع لفلترة الخيارات في قائمة الـ %s المتاحة."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "فلترة"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "اختيار الكل"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "إضغط لاختيار جميع الـ %s في نفس الوقت"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "اختيار"
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr "حذف"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "الـ %s المختارة"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-" هذه قائمة بالـ %s المختارة. تستطيع حذف البعض عن طريق انتقائهم في المربع "
-"أدناه ومن ثم الضغط على سهم \"حذف\" الموجود بين المربعين."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "حذف الكل"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "إضغط لحذف جميع الـ %s المختارة في نفس الوقت."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(sel)s من %(cnt)s تم تحديدها "
-msgstr[1] "%(sel)s من %(cnt)s تم تحديدها"
-msgstr[2] "%(sel)s من %(cnt)s تم تحديدها"
-msgstr[3] "%(sel)s من %(cnt)s تم تحديدها"
-msgstr[4] "%(sel)s من %(cnt)s تم تحديدها"
-msgstr[5] "%(sel)s من %(cnt)s تم تحديدها"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"لديك بعض التغييرات التي لم يتم حفظها على حقول فردية قابلة للتعديل. إذا قمت "
-"بتشغيل أي عملية، ستلغى كافة التغييرات التي لم يتم حفظها."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"لقد قمت باختيار عملية، إلا أنك لم تقم بحفظ التغييرات التي قمت بها على الحقول"
-" الفردية حتى الآن. الرجاء الضغط على OK للحفظ. ستحتاج إلى إعادة ذلك الإجراء "
-"مرة أخرى."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"لقد قمت باختيار عملية، إلا أنك لم تقم بأي تغييرات على الحقول الفردية. على "
-"الأرجح أنك تبحث على زر GO عوضاً عن زر الحفظ."
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"يناير|فبراير|مارس|أبريل|مايو|يونيو|يوليو|أغسطس|سبتمبر|أكتوبر|نوفمبر|ديسمبر"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "الأحد|الإثنين|الثلاثاء|الأربعاء|الخميس|الجمعة|السبت"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "إظهار"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "إخفاء"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "الأحد|الإثنين|الثلاثاء|الأربعاء|الخميس|الجمعة|السبت"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "الآن"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "الساعة"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "اختر وقتاً"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "منتصف الليل"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6 صباحاً"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "الظهر"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "اليوم"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "التقويم"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "أمس"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "غداً"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "فتح الآلة الحاسبة "
@@ -3080,7 +2916,7 @@ msgstr "تم تقييم <%= num %>  "
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "<%= num %> more needed to start ML"
-msgstr "يلزم  <%= num %>  إضافية للبدء بـ ML"
+msgstr "يلزم  <%= num %>  إضافية للبدء بالتعلم الآلي"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "Re-check for submissions"
@@ -3122,7 +2958,7 @@ msgstr "للمساعدة في التحرير بلغة المارك داون"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Bold (Ctrl+B)"
-msgstr "سميك (Ctrl+B)"
+msgstr "خط عريض (Ctrl+B)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Italic (Ctrl+I)"
@@ -3204,13 +3040,17 @@ msgstr "عنوان"
 msgid "You have been logged out of your edX account. "
 msgstr "لقد تمّ تسجيل الخروج من حساب edX الخاص بك."
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr "حدث خطأ غير معروف."
 
 #: lms/static/js/staff_debug_actions.js
 msgid "Successfully reset the attempts for user {user}"
-msgstr "تم إعادة ضبط محاولات المستخدم {user} بنجاح"
+msgstr "تمت بنجاح إعادة ضبط عدد محاولات المستخدم {user} "
 
 #: lms/static/js/staff_debug_actions.js
 msgid "Failed to reset attempts."
@@ -3218,7 +3058,7 @@ msgstr "لم تنجح عمليات ضبط المحاولات."
 
 #: lms/static/js/staff_debug_actions.js
 msgid "Successfully deleted student state for user {user}"
-msgstr "تم حذف حالة المستخدم {user} بنجاح"
+msgstr "تم بنجاح حذف حالة المستخدم {user} "
 
 #: lms/static/js/staff_debug_actions.js
 msgid "Failed to delete student state."
@@ -3226,7 +3066,7 @@ msgstr "لم تنجح عملية حذف حالة الطالب."
 
 #: lms/static/js/staff_debug_actions.js
 msgid "Successfully rescored problem for user {user}"
-msgstr "تمت عمليات إعادة تقييم المستخدم {user} بنجاح"
+msgstr "تمت بنجاح إعادة تقييم المسألة للمستخدم {user} "
 
 #: lms/static/js/staff_debug_actions.js
 msgid "Failed to rescore problem."
@@ -3304,32 +3144,32 @@ msgstr "خطأ في إضافة الطلاب"
 #: lms/static/js/views/cohort_editor.js
 msgid "{numUsersAdded} student has been added to this cohort group"
 msgid_plural "{numUsersAdded} students have been added to this cohort group"
-msgstr[0] "لقد أضيفَ {صفر} طالب إلى هذه المجموعة"
-msgstr[1] "لقد أضيفَ طالب {واحد} إلى هذه المجموعة"
-msgstr[2] "لقد أضيفَ طالبان {اثنان} إلى هذه المجموعة"
-msgstr[3] "لقد أضيفَ {بضعة} طلاب إلى هذه المجموعة"
-msgstr[4] "لقد أضيفَ {عدة} طلاب إلى هذه المجموعة"
+msgstr[0] "لقد أضيفَ {numUsersAdded} طالب إلى هذه المجموعة"
+msgstr[1] "لقد أضيفَ {numUsersAdded} طالب إلى هذه المجموعة"
+msgstr[2] "لقد أضيفَ {numUsersAdded} طالب إلى هذه المجموعة"
+msgstr[3] "لقد أضيفَ {numUsersAdded} طلاب إلى هذه المجموعة"
+msgstr[4] "لقد أضيفَ {numUsersAdded} طلاب إلى هذه المجموعة"
 msgstr[5] "لقد أضيفَ {numUsersAdded} طلاب إلى هذه المجموعة"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "{numMoved} student was removed from {oldCohort}"
 msgid_plural "{numMoved} students were removed from {oldCohort}"
-msgstr[0] "لقد أزيلَ {صفر} طلاب من {oldCohort}"
-msgstr[1] "لقد أزيلَ طالب {واحد} من {oldCohort}"
-msgstr[2] "لقد أزيلَ طالبان {اثنان} من {oldCohort}"
-msgstr[3] "لقد أزيلَ {بضعة} طلاب من {oldCohort}"
-msgstr[4] "لقد أزيلَ {عدة} طلاب من {oldCohort}"
-msgstr[5] "لقد أزيلَ {numMoved} طلاب من {oldCohort}"
+msgstr[0] "لقد أزيلَ {numMoved} طالب من {oldCohort}"
+msgstr[1] "لقد أزيلَ {numMoved} طالب من {oldCohort}"
+msgstr[2] "لقد أزيلَ {numMoved} طالب من {oldCohort}"
+msgstr[3] "لقد أزيلَ {numMoved} طالب من {oldCohort}"
+msgstr[4] "لقد أزيلَ {numMoved} طالب من {oldCohort}"
+msgstr[5] "لقد أزيلَ {numMoved} طالب من {oldCohort}"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "{numPresent} student was already in the cohort group"
 msgid_plural "{numPresent} students were already in the cohort group"
-msgstr[0] "{صفر} طلاب موجودون مسبقًا في المجموعة"
-msgstr[1] "طالب {واحد} موجود مسبقًا في المجموعة"
-msgstr[2] "طالبان {اثنان} موجودان مسبقًا في المجموعة"
-msgstr[3] "{بضعة} طلاب موجودون مسبقًا في المجموعة"
-msgstr[4] "{عدة} طلاب موجودون مسبقًا في المجموعة"
-msgstr[5] "{numPresent} طلاب موجودون مسبقًا في المجموعة"
+msgstr[0] "{numPresent} طالب موجود مسبقًا في المجموعة"
+msgstr[1] "{numPresent} طالب موجود مسبقًا في المجموعة"
+msgstr[2] "{numPresent} طالب موجود مسبقًا في المجموعة"
+msgstr[3] "{numPresent} طلاب موجودين مسبقًا في المجموعة"
+msgstr[4] "{numPresent} طلاب موجودين مسبقًا في المجموعة"
+msgstr[5] "{numPresent} طلاب موجودين مسبقًا في المجموعة"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "Unknown user: {user}"
@@ -3338,11 +3178,11 @@ msgstr "مستخدم غير معروف: {user}"
 #: lms/static/js/views/cohort_editor.js
 msgid "There was an error when trying to add students:"
 msgid_plural "There were {numErrors} errors when trying to add students:"
-msgstr[0] "وقع {صفر} خطأ عند محاولة إضافة الطلاب:"
-msgstr[1] "وقع خطأ واحد عند محاولة إضافة الطلاب:"
-msgstr[2] "وقع خطآن {اثنان} عند محاولة إضافة الطلاب:"
-msgstr[3] "وقعت {بضعة} أخطاء عند محاولة إضافة الطلاب:"
-msgstr[4] "وقعت {عدة} أخطاء عند محاولة إضافة الطلاب:"
+msgstr[0] "وقع {numErrors} خطأ عند محاولة إضافة الطلاب:"
+msgstr[1] "وقع خطأ عند محاولة إضافة الطلاب:"
+msgstr[2] "وقع {numErrors} أخطاء عند محاولة إضافة الطلاب:"
+msgstr[3] "وقعت {numErrors} أخطاء عند محاولة إضافة الطلاب:"
+msgstr[4] "وقعت {numErrors} أخطاء عند محاولة إضافة الطلاب:"
 msgstr[5] "وقعت {numErrors} أخطاء عند محاولة إضافة الطلاب:"
 
 #: lms/static/js/views/cohort_editor.js
@@ -3451,7 +3291,7 @@ msgstr "هل أنت متأكد من رغبتك حذف هذه الصفحة؟ لا
 #: cms/static/js/views/course_info_update.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Deleting&hellip;"
-msgstr "الحذف &hellip;"
+msgstr "الحذف&hellip;"
 
 #: cms/static/coffee/src/xblock/cms.runtime.v1.js
 msgid "OpenAssessment Save Error"
@@ -3522,33 +3362,29 @@ msgstr ""
 
 #: cms/static/js/factories/import.js
 msgid "There was an error during the upload process."
-msgstr ""
+msgstr "حدث خطأ أثناء عملية التحميل.  "
 
 #: cms/static/js/factories/import.js
 msgid "There was an error while unpacking the file."
-msgstr ""
+msgstr "حدث خطأ أثناء عملية تفريغ الملف. "
 
 #: cms/static/js/factories/import.js
 msgid "There was an error while verifying the file you submitted."
-msgstr ""
+msgstr "حدث خطأ أثناء عملية التحقق من الملف الذي قمت بتقديمه. "
 
 #: cms/static/js/factories/import.js
 msgid "There was an error while importing the new course to our database."
-msgstr ""
+msgstr "حدث خطأ خلال عملية استيراد المساق الجديد إلى قاعدة البيانات لدينا. "
 
 #: cms/static/js/factories/import.js
 msgid "Your import has failed."
-msgstr ""
+msgstr "لم تنجح عملية الاستيراد"
 
 #: cms/static/js/factories/import.js cms/static/js/factories/import.js
 #: cms/static/js/views/import.js cms/static/js/views/import.js.c
 msgid "Choose new file"
 msgstr "اختر ملف جديد"
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3581,7 +3417,7 @@ msgstr ""
 
 #: cms/static/js/factories/manage_users.js
 msgid "Are you sure?"
-msgstr ""
+msgstr "هل أنت متأكّد؟"
 
 #: cms/static/js/factories/manage_users.js
 msgid ""
@@ -3598,15 +3434,15 @@ msgstr ""
 
 #: cms/static/js/factories/manage_users.js
 msgid "Try Again"
-msgstr ""
+msgstr "حاول مرة أخرى"
 
 #: cms/static/js/factories/settings_advanced.js
 msgid "Hide Deprecated Settings"
-msgstr ""
+msgstr "إخفاء الإعدادات المهملة"
 
 #: cms/static/js/factories/settings_advanced.js
 msgid "Show Deprecated Settings"
-msgstr ""
+msgstr "إظهار الإعدادات المهملة"
 
 #: cms/static/js/factories/textbooks.js
 #: cms/static/js/views/pages/group_configurations.js
@@ -3653,6 +3489,10 @@ msgstr ""
 msgid "or"
 msgstr "أو"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "لابد من أن يكون للمساق تاريخ بدء معيّن."
@@ -3795,9 +3635,9 @@ msgstr "غير مستخدم"
 #: cms/static/js/views/group_configuration_details.js
 msgid "Used in %(count)s unit"
 msgid_plural "Used in %(count)s units"
-msgstr[0] "مستخدم في %(صفر) وحدة"
-msgstr[1] "مستخدم في وحدة %(واحدة)"
-msgstr[2] "مستخدم في %(وحدتان)"
+msgstr[0] "مستخدم في %(count)s وحدة"
+msgstr[1] "مستخدم في %(count)s وحدة"
+msgstr[2] "مستخدم في %(count)s وحدة"
 msgstr[3] "مستخدم في %(count)s وحدة"
 msgstr[4] "مستخدم في %(count)s وحدة"
 msgstr[5] "مستخدم في %(count)s وحدة"
@@ -3861,7 +3701,8 @@ msgstr "تاريخ الإصدار:"
 
 #: cms/static/js/views/overview.js
 msgid "{month}/{day}/{year} at {hour}:{minute} UTC"
-msgstr "{month}/{day}/{year} at {hour}:{minute} التوقيت العالمي"
+msgstr ""
+"{month}/{day}/{year} في الساعة {hour}:{minute} بالتوقيت العالمي المنسّق UTC"
 
 #: cms/static/js/views/overview.js
 msgid "Edit section release date"
@@ -3964,10 +3805,24 @@ msgstr "إعدادات"
 msgid "New %(component_type)s"
 msgstr "%(component_type)s جديد"
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
-msgstr "الإضافة والمساعدة؛ Adding&hellip؛"
+msgstr "الإضافة&hellip;"
 
 #: cms/static/js/views/modals/course_outline_modals.js
 msgid "%(display_name)s Settings"
@@ -4019,7 +3874,7 @@ msgstr "التغيير يدويًا"
 
 #: cms/static/js/views/pages/container.js
 msgid "Duplicating&hellip;"
-msgstr "نسخة مطابقة ومساعدة؛ Duplicating&hellip؛"
+msgstr "جاري النسخ&hellip;"
 
 #: cms/static/js/views/pages/container_subviews.js
 msgid "Publishing&hellip;"
@@ -4054,7 +3909,7 @@ msgstr "جاري الإخفاء عن الطلاب&hellip;"
 
 #: cms/static/js/views/pages/container_subviews.js
 msgid "Explicitly Hiding from Students&hellip;"
-msgstr "جاري الإخفاء عن الطلاب "
+msgstr "جاري الإخفاء عن الطلاب&hellip;"
 
 #: cms/static/js/views/pages/container_subviews.js
 msgid "Inheriting Student Visibility&hellip;"
@@ -4416,7 +4271,7 @@ msgstr "إقفال/فتح الملفّ"
 
 #: cms/templates/js/checklist.underscore
 msgid "{number}% of checklists completed"
-msgstr "{number}% o من قوائم التحقّق تم استكمالها"
+msgstr "تم استكمال {number}% o من قوائم التحقّق "
 
 #: cms/templates/js/checklist.underscore
 msgid "Tasks Completed:"
@@ -4497,7 +4352,7 @@ msgstr "تم تقييمه بدرجة:"
 
 #: cms/templates/js/course-outline.underscore
 msgid "Due:"
-msgstr "موعد التسليم:"
+msgstr "تاريخ الاستحقاق:"
 
 #: cms/templates/js/course-outline.underscore
 #: cms/templates/js/xblock-outline.underscore
@@ -4968,6 +4823,10 @@ msgstr "خيارات الصفحة"
 msgid "New Group Configuration"
 msgstr "إعدادات مجموعة جديدة"
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr "حذف"
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr "إضافة روابط للإصدارات الإضافية"
diff --git a/conf/locale/az/LC_MESSAGES/django.mo b/conf/locale/az/LC_MESSAGES/django.mo
index 6467a547d9..d8f869abf3 100644
Binary files a/conf/locale/az/LC_MESSAGES/django.mo and b/conf/locale/az/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/az/LC_MESSAGES/django.po b/conf/locale/az/LC_MESSAGES/django.po
index 98603cdc0c..ae687f742a 100644
--- a/conf/locale/az/LC_MESSAGES/django.po
+++ b/conf/locale/az/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-04-07 13:46+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/edx-platform/language/az/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/az/LC_MESSAGES/djangojs.mo b/conf/locale/az/LC_MESSAGES/djangojs.mo
index 4729bcc4be..8131198433 100644
Binary files a/conf/locale/az/LC_MESSAGES/djangojs.mo and b/conf/locale/az/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/az/LC_MESSAGES/djangojs.po b/conf/locale/az/LC_MESSAGES/djangojs.po
index b6d43e1bf7..4de3beb3b7 100644
--- a/conf/locale/az/LC_MESSAGES/djangojs.po
+++ b/conf/locale/az/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/edx-platform/language/az/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/bg_BG/LC_MESSAGES/django.mo b/conf/locale/bg_BG/LC_MESSAGES/django.mo
index 7fd8ca4758..3469ee51fd 100644
Binary files a/conf/locale/bg_BG/LC_MESSAGES/django.mo and b/conf/locale/bg_BG/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/bg_BG/LC_MESSAGES/django.po b/conf/locale/bg_BG/LC_MESSAGES/django.po
index 88e5599bf7..3a7e9bc3de 100644
--- a/conf/locale/bg_BG/LC_MESSAGES/django.po
+++ b/conf/locale/bg_BG/LC_MESSAGES/django.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-06 03:04+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/edx-platform/language/bg_BG/)\n"
@@ -105,14 +105,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -204,6 +196,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2212,6 +2205,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2570,23 +2604,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2948,9 +2965,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4116,6 +4134,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5017,15 +5039,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5033,37 +5067,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5304,17 +5326,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5324,7 +5346,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5338,8 +5360,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6525,15 +6547,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6570,7 +6592,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6988,11 +7010,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7153,6 +7170,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7455,6 +7473,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8463,11 +8486,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8480,6 +8498,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9331,9 +9354,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9421,7 +9441,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11219,18 +11238,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12567,6 +12574,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12622,19 +12672,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12642,15 +12692,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14173,6 +14223,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14185,6 +14244,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14243,10 +14307,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14261,6 +14326,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/bg_BG/LC_MESSAGES/djangojs.mo b/conf/locale/bg_BG/LC_MESSAGES/djangojs.mo
index e93cb9a172..f36345f1c1 100644
Binary files a/conf/locale/bg_BG/LC_MESSAGES/djangojs.mo and b/conf/locale/bg_BG/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/bg_BG/LC_MESSAGES/djangojs.po b/conf/locale/bg_BG/LC_MESSAGES/djangojs.po
index dc8ce6e5a6..749bfc31a8 100644
--- a/conf/locale/bg_BG/LC_MESSAGES/djangojs.po
+++ b/conf/locale/bg_BG/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/edx-platform/language/bg_BG/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/bn_BD/LC_MESSAGES/django.mo b/conf/locale/bn_BD/LC_MESSAGES/django.mo
index 20130a174c..c1a1b415f1 100644
Binary files a/conf/locale/bn_BD/LC_MESSAGES/django.mo and b/conf/locale/bn_BD/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/bn_BD/LC_MESSAGES/django.po b/conf/locale/bn_BD/LC_MESSAGES/django.po
index 87d5c498d7..9e7915cb1c 100644
--- a/conf/locale/bn_BD/LC_MESSAGES/django.po
+++ b/conf/locale/bn_BD/LC_MESSAGES/django.po
@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-10-25 19:40+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/edx-platform/language/bn_BD/)\n"
@@ -107,14 +107,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -206,6 +198,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2214,6 +2207,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2572,23 +2606,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2950,9 +2967,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4118,6 +4136,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5019,15 +5041,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5035,37 +5069,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5306,17 +5328,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5326,7 +5348,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5340,8 +5362,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6527,15 +6549,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6572,7 +6594,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6990,11 +7012,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7155,6 +7172,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7457,6 +7475,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8465,11 +8488,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8482,6 +8500,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9333,9 +9356,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9423,7 +9443,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11221,18 +11240,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12569,6 +12576,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12624,19 +12674,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12644,15 +12694,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14175,6 +14225,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14187,6 +14246,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14245,10 +14309,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14263,6 +14328,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/bn_BD/LC_MESSAGES/djangojs.mo b/conf/locale/bn_BD/LC_MESSAGES/djangojs.mo
index f84c494d5c..06c4f39ad6 100644
Binary files a/conf/locale/bn_BD/LC_MESSAGES/djangojs.mo and b/conf/locale/bn_BD/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/bn_BD/LC_MESSAGES/djangojs.po b/conf/locale/bn_BD/LC_MESSAGES/djangojs.po
index d0404ea102..578f4d6516 100644
--- a/conf/locale/bn_BD/LC_MESSAGES/djangojs.po
+++ b/conf/locale/bn_BD/LC_MESSAGES/djangojs.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-25 19:40+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/edx-platform/language/bn_BD/)\n"
@@ -60,8 +60,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2142,153 +2140,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2947,6 +2798,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3256,10 +3111,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3362,6 +3213,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3646,6 +3501,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4588,6 +4457,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/bn_IN/LC_MESSAGES/django.mo b/conf/locale/bn_IN/LC_MESSAGES/django.mo
index fc327fc39d..6651347211 100644
Binary files a/conf/locale/bn_IN/LC_MESSAGES/django.mo and b/conf/locale/bn_IN/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/bn_IN/LC_MESSAGES/django.po b/conf/locale/bn_IN/LC_MESSAGES/django.po
index 9bf34f661c..d75bc54e85 100644
--- a/conf/locale/bn_IN/LC_MESSAGES/django.po
+++ b/conf/locale/bn_IN/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-06 03:04+0000\n"
 "Last-Translator: \n"
 "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/edx-platform/language/bn_IN/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/bn_IN/LC_MESSAGES/djangojs.mo b/conf/locale/bn_IN/LC_MESSAGES/djangojs.mo
index 7f3537172d..7e3e6d66f4 100644
Binary files a/conf/locale/bn_IN/LC_MESSAGES/djangojs.mo and b/conf/locale/bn_IN/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/bn_IN/LC_MESSAGES/djangojs.po b/conf/locale/bn_IN/LC_MESSAGES/djangojs.po
index 50e2bad1e2..387a4039b4 100644
--- a/conf/locale/bn_IN/LC_MESSAGES/djangojs.po
+++ b/conf/locale/bn_IN/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/edx-platform/language/bn_IN/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/bs/LC_MESSAGES/django.mo b/conf/locale/bs/LC_MESSAGES/django.mo
index 7d8be64ab4..19d2634ea9 100644
Binary files a/conf/locale/bs/LC_MESSAGES/django.mo and b/conf/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/bs/LC_MESSAGES/django.po b/conf/locale/bs/LC_MESSAGES/django.po
index ae7565181e..ac84c38a74 100644
--- a/conf/locale/bs/LC_MESSAGES/django.po
+++ b/conf/locale/bs/LC_MESSAGES/django.po
@@ -43,8 +43,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: ph8enix <mairona88pink@yahoo.com>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/edx-platform/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -109,14 +109,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -208,6 +200,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2218,6 +2211,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2576,23 +2610,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2954,9 +2971,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4122,6 +4140,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5025,15 +5047,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5041,37 +5075,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5312,17 +5334,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5332,7 +5354,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5346,8 +5368,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6533,15 +6555,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6578,7 +6600,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6996,11 +7018,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7161,6 +7178,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7463,6 +7481,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8473,11 +8496,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8490,6 +8508,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9341,9 +9364,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9431,7 +9451,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11231,18 +11250,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12579,6 +12586,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12634,19 +12684,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12654,15 +12704,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14185,6 +14235,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14197,6 +14256,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14255,10 +14319,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14273,6 +14338,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/bs/LC_MESSAGES/djangojs.mo b/conf/locale/bs/LC_MESSAGES/djangojs.mo
index cb15225ac5..f060c26130 100644
Binary files a/conf/locale/bs/LC_MESSAGES/djangojs.mo and b/conf/locale/bs/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/bs/LC_MESSAGES/djangojs.po b/conf/locale/bs/LC_MESSAGES/djangojs.po
index 8fccda4a4e..fd695d86f7 100644
--- a/conf/locale/bs/LC_MESSAGES/djangojs.po
+++ b/conf/locale/bs/LC_MESSAGES/djangojs.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/edx-platform/language/bs/)\n"
@@ -61,8 +61,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2162,154 +2160,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2968,6 +2818,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3284,10 +3138,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3390,6 +3240,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3676,6 +3530,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4619,6 +4487,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/ca/LC_MESSAGES/django.mo b/conf/locale/ca/LC_MESSAGES/django.mo
index 32e08b1b43..6bc75eac82 100644
Binary files a/conf/locale/ca/LC_MESSAGES/django.mo and b/conf/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ca/LC_MESSAGES/django.po b/conf/locale/ca/LC_MESSAGES/django.po
index 0c9744408b..026b55dd35 100644
--- a/conf/locale/ca/LC_MESSAGES/django.po
+++ b/conf/locale/ca/LC_MESSAGES/django.po
@@ -49,8 +49,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: mcolomer <mcmlilhity@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/edx-platform/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -115,14 +115,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "Certificat de Codi d'Honor"
@@ -215,6 +207,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2226,6 +2219,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2584,23 +2618,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2962,9 +2979,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4134,6 +4152,10 @@ msgstr "Descàrrega de dades"
 msgid "Analytics"
 msgstr "Analítica"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5064,15 +5086,27 @@ msgstr ""
 "La quantitat carregada per el processador {0} {1} és diferent que el cost "
 "total de la comanda {2} {3}."
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5080,37 +5114,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5369,17 +5391,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5389,7 +5411,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5403,8 +5425,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6656,15 +6678,15 @@ msgid "Help"
 msgstr "Ajuda"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6701,7 +6723,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7126,11 +7148,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7291,6 +7308,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "Enviar"
 
@@ -7593,6 +7611,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8601,11 +8624,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8618,6 +8636,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9469,9 +9492,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9559,7 +9579,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11357,18 +11376,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12709,6 +12716,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12764,19 +12814,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12784,15 +12834,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14324,6 +14374,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14336,6 +14395,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14394,10 +14458,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14412,6 +14477,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/ca/LC_MESSAGES/djangojs.mo b/conf/locale/ca/LC_MESSAGES/djangojs.mo
index 64929c0ddd..06b2cdb219 100644
Binary files a/conf/locale/ca/LC_MESSAGES/djangojs.mo and b/conf/locale/ca/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ca/LC_MESSAGES/djangojs.po b/conf/locale/ca/LC_MESSAGES/djangojs.po
index 6b994701d8..93ae02ad90 100644
--- a/conf/locale/ca/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ca/LC_MESSAGES/djangojs.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/edx-platform/language/ca/)\n"
@@ -63,8 +63,6 @@ msgstr "D'acord"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "Cancel·lar"
 
@@ -2163,166 +2161,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "Disponible %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Aquesta és la llista dels %s disponibles. Pots triar-ne alguns seleccionant-"
-"los al requadre inferior i clicant a continuació la fletxa \"Escollir\" "
-"entre els dos requadres."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "Escriu en aquest requadre per filtrar la llista dels %s disponibles."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Filtrar"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Escollir-ho tot"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Clica per escollir-los tots els %s a la vegada."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Escollir"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "Eliminar"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "Escollit %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Aquesta és la llista dels %s escollits. Pots esborrar-ne alguns "
-"seleccionant-los en el requadre inferior i clicant a continuació la fletxa "
-"\"Eliminar\" entre els dos requadres."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Elimina-ho tot"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Clica per eliminar tots els %s escollits a la vegada."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(sel)s de %(cnt)s seleccionats"
-msgstr[1] "%(sel)s de %(cnt)s seleccionades"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"No has guardat els canvis en els camps editables individuals. Si realitzes "
-"una acció, els teus canvis es perdran."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Has seleccionat una acció, però encara no has guardat els canvis en els "
-"camps individuals. Si us plau, clica \"D'acord\" per guardar-ho. Hauràs de "
-"tornar a realitzar l'acció."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"Has seleccionat una acció, però encara no has guardat els canvis en els "
-"camps individuals. Deus buscar el botó Anar en lloc del de Guardar."
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Gener|Febrer|Març|Abril|Maig|Juny|Juliol|Agost|Setembre|Octubre|Novembre|Desembre"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "Dg|Dl|Dm|Dc|Dj|Dv|Ds"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Mostrar"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Ocultar"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Diumenge|Dilluns|Dimarts|Dimecres|Dijous|Divendres|Dissabte"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Ara"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Rellotge"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Escull una hora"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Mitjanit"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6 a.m."
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Migdia"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Avui"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Calendari"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Ahir"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Demà"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "Obrir la calculadora"
@@ -3030,6 +2868,10 @@ msgstr "Capçalera"
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr "Hi ha hagut un error desconegut."
@@ -3342,10 +3184,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3451,6 +3289,10 @@ msgstr ""
 msgid "or"
 msgstr "o"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "El curs ha de tenir assignada una data d'inici."
@@ -3746,6 +3588,20 @@ msgstr "Configuració"
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4698,6 +4554,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/ca@valencia/LC_MESSAGES/django.mo b/conf/locale/ca@valencia/LC_MESSAGES/django.mo
index 680458a733..35865808a1 100644
Binary files a/conf/locale/ca@valencia/LC_MESSAGES/django.mo and b/conf/locale/ca@valencia/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ca@valencia/LC_MESSAGES/django.po b/conf/locale/ca@valencia/LC_MESSAGES/django.po
index e0fe61a896..4f9466424b 100644
--- a/conf/locale/ca@valencia/LC_MESSAGES/django.po
+++ b/conf/locale/ca@valencia/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-12 14:59+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/edx-platform/language/ca@valencia/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/ca@valencia/LC_MESSAGES/djangojs.mo b/conf/locale/ca@valencia/LC_MESSAGES/djangojs.mo
index 8085f3cb89..62bde108ba 100644
Binary files a/conf/locale/ca@valencia/LC_MESSAGES/djangojs.mo and b/conf/locale/ca@valencia/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ca@valencia/LC_MESSAGES/djangojs.po b/conf/locale/ca@valencia/LC_MESSAGES/djangojs.po
index 45f31e8f3f..5c6b64e5bc 100644
--- a/conf/locale/ca@valencia/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ca@valencia/LC_MESSAGES/djangojs.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/edx-platform/language/ca@valencia/)\n"
@@ -60,8 +60,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2142,153 +2140,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2947,6 +2798,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3256,10 +3111,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3362,6 +3213,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3646,6 +3501,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4588,6 +4457,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/cs/LC_MESSAGES/django.mo b/conf/locale/cs/LC_MESSAGES/django.mo
index 71a6955da3..56185d162d 100644
Binary files a/conf/locale/cs/LC_MESSAGES/django.mo and b/conf/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/cs/LC_MESSAGES/django.po b/conf/locale/cs/LC_MESSAGES/django.po
index 737b5412cb..5aa903c834 100644
--- a/conf/locale/cs/LC_MESSAGES/django.po
+++ b/conf/locale/cs/LC_MESSAGES/django.po
@@ -56,8 +56,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: TomHermanek <T.Hermanovsky@seznam.cz>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/edx-platform/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -122,14 +122,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -221,6 +213,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2231,6 +2224,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2589,23 +2623,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2967,9 +2984,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4133,6 +4151,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5035,15 +5057,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5051,37 +5085,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5322,17 +5344,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5342,7 +5364,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5356,8 +5378,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6542,15 +6564,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6587,7 +6609,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7005,11 +7027,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7170,6 +7187,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7472,6 +7490,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8482,11 +8505,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8499,6 +8517,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9350,9 +9373,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9440,7 +9460,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11240,18 +11259,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12588,6 +12595,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12643,19 +12693,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12663,15 +12713,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14194,6 +14244,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14206,6 +14265,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14264,10 +14328,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14282,6 +14347,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/cs/LC_MESSAGES/djangojs.mo b/conf/locale/cs/LC_MESSAGES/djangojs.mo
index 7548abd122..f2a01d8c27 100644
Binary files a/conf/locale/cs/LC_MESSAGES/djangojs.mo and b/conf/locale/cs/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/cs/LC_MESSAGES/djangojs.po b/conf/locale/cs/LC_MESSAGES/djangojs.po
index 0672b97581..3836b81f92 100644
--- a/conf/locale/cs/LC_MESSAGES/djangojs.po
+++ b/conf/locale/cs/LC_MESSAGES/djangojs.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/edx-platform/language/cs/)\n"
@@ -68,8 +68,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2169,153 +2167,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Filtr"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Vybrat vše"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Vybrat"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "Odstranit"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Odstranit vše"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Zobrazit"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Skrýt"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Nyní"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Hodiny"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Zvolte čas"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Dnes"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Kalendář"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Včera"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Zítra"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2974,6 +2825,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3290,10 +3145,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3396,6 +3247,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3682,6 +3537,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4625,6 +4494,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/cy/LC_MESSAGES/django.mo b/conf/locale/cy/LC_MESSAGES/django.mo
index 3601c36f58..f4a8b33ecb 100644
Binary files a/conf/locale/cy/LC_MESSAGES/django.mo and b/conf/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/cy/LC_MESSAGES/django.po b/conf/locale/cy/LC_MESSAGES/django.po
index ffc20f0b55..08f80d4313 100644
--- a/conf/locale/cy/LC_MESSAGES/django.po
+++ b/conf/locale/cy/LC_MESSAGES/django.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-06 03:04+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Welsh (http://www.transifex.com/projects/p/edx-platform/language/cy/)\n"
@@ -106,14 +106,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -205,6 +197,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2217,6 +2210,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2575,23 +2609,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2953,9 +2970,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4121,6 +4139,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5026,15 +5048,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5042,37 +5076,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5313,17 +5335,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5333,7 +5355,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5347,8 +5369,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6534,15 +6556,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6579,7 +6601,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6997,11 +7019,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7162,6 +7179,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7464,6 +7482,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8476,11 +8499,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8493,6 +8511,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9344,9 +9367,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9434,7 +9454,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11236,18 +11255,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12584,6 +12591,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12639,19 +12689,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12659,15 +12709,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14190,6 +14240,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14202,6 +14261,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14260,10 +14324,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14278,6 +14343,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/cy/LC_MESSAGES/djangojs.mo b/conf/locale/cy/LC_MESSAGES/djangojs.mo
index af9a6e3f5e..8e9b31ea0b 100644
Binary files a/conf/locale/cy/LC_MESSAGES/djangojs.mo and b/conf/locale/cy/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/cy/LC_MESSAGES/djangojs.po b/conf/locale/cy/LC_MESSAGES/djangojs.po
index de9e68d279..56da775338 100644
--- a/conf/locale/cy/LC_MESSAGES/djangojs.po
+++ b/conf/locale/cy/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Welsh (http://www.transifex.com/projects/p/edx-platform/language/cy/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2179,155 +2177,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2986,6 +2835,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3309,10 +3162,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3415,6 +3264,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3703,6 +3556,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4647,6 +4514,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/da/LC_MESSAGES/django.mo b/conf/locale/da/LC_MESSAGES/django.mo
index fabffb01b2..58bd9cdf31 100644
Binary files a/conf/locale/da/LC_MESSAGES/django.mo and b/conf/locale/da/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/da/LC_MESSAGES/django.po b/conf/locale/da/LC_MESSAGES/django.po
index a80fa3c0bb..ee0a3577e7 100644
--- a/conf/locale/da/LC_MESSAGES/django.po
+++ b/conf/locale/da/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-06 03:04+0000\n"
 "Last-Translator: \n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/edx-platform/language/da/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/da/LC_MESSAGES/djangojs.mo b/conf/locale/da/LC_MESSAGES/djangojs.mo
index 51be972f37..18f5294159 100644
Binary files a/conf/locale/da/LC_MESSAGES/djangojs.mo and b/conf/locale/da/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/da/LC_MESSAGES/djangojs.po b/conf/locale/da/LC_MESSAGES/djangojs.po
index 29944efbe6..519f4c4ed5 100644
--- a/conf/locale/da/LC_MESSAGES/djangojs.po
+++ b/conf/locale/da/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/edx-platform/language/da/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/de_DE/LC_MESSAGES/django.mo b/conf/locale/de_DE/LC_MESSAGES/django.mo
index 611c9163c6..5a1e1e76ad 100644
Binary files a/conf/locale/de_DE/LC_MESSAGES/django.mo and b/conf/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/de_DE/LC_MESSAGES/django.po b/conf/locale/de_DE/LC_MESSAGES/django.po
index a4d4aad159..2ea5191051 100644
--- a/conf/locale/de_DE/LC_MESSAGES/django.po
+++ b/conf/locale/de_DE/LC_MESSAGES/django.po
@@ -109,8 +109,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Alexander L. <alexander.lohberg@paluno.uni-due.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/edx-platform/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -166,14 +166,6 @@ msgstr "Lerneinheit"
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "Ehrenkodexzertifikat"
@@ -268,6 +260,7 @@ msgstr "Grundschule"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "kein"
 
@@ -2527,6 +2520,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr "Nur auf Einladung"
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "Allgemein"
@@ -2944,20 +2978,6 @@ msgstr "Gib das Datum ein, bis wann Fragestellungen zu bearbeiten sind."
 msgid "Group ID {group_id}"
 msgstr "Gruppen-ID {group_id}"
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr "Warnung"
-
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Error"
-msgstr "Fehler"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr "Nicht ausgewählt"
@@ -3371,9 +3391,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4630,6 +4651,10 @@ msgstr "Daten-Download"
 msgid "Analytics"
 msgstr "Analytik"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 msgid "Metrics"
 msgstr "Metriken"
@@ -5567,15 +5592,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5583,37 +5620,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5854,17 +5879,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5874,7 +5899,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5888,8 +5913,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -7075,15 +7100,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7120,7 +7145,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7538,11 +7563,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7703,6 +7723,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -8005,6 +8026,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -9013,11 +9039,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -9030,6 +9051,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9881,9 +9907,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9971,7 +9994,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11769,18 +11791,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -13117,6 +13127,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -13172,19 +13225,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -13192,15 +13245,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14723,6 +14776,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14735,6 +14797,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14793,10 +14860,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14811,6 +14879,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/de_DE/LC_MESSAGES/djangojs.mo b/conf/locale/de_DE/LC_MESSAGES/djangojs.mo
index 1f443c54eb..c30f9dc01f 100644
Binary files a/conf/locale/de_DE/LC_MESSAGES/djangojs.mo and b/conf/locale/de_DE/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/de_DE/LC_MESSAGES/djangojs.po b/conf/locale/de_DE/LC_MESSAGES/djangojs.po
index 9e1c6eda3d..ad4891b146 100644
--- a/conf/locale/de_DE/LC_MESSAGES/djangojs.po
+++ b/conf/locale/de_DE/LC_MESSAGES/djangojs.po
@@ -60,7 +60,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/edx-platform/language/de_DE/)\n"
@@ -92,8 +92,6 @@ msgstr "OK"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -2170,168 +2168,6 @@ msgstr "Antworte"
 msgid "Tags:"
 msgstr "Stichworte:"
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "Verfügbare %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Dies ist die Liste der verfügbaren %s. Du kannst einige hiervon auswählen, "
-"indem du dieses im untenstehenden Rahmen markierst, und dann den "
-"\"Auswählen\"-Pfeil der zwischen den beiden Rahmen liegt anklickst."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-"Schreibe in diesen Rahmen, um die Liste der verfügbaren %s zu filtern."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Filtern"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Alles auswählen"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Klicke um alle %s auf einmal auszuwählen."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Wähle aus"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "Entferne"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "Ausgewählte %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Dies ist die Liste der ausgewählten %s. Du kannst einige hiervon entfernen, "
-"indem du diese in dem untenstehenden Rahmen markierst, und dann den "
-"\"Entfernen\"-Pfeil, der zwischen den beiden Rahmen liegt, anklickst. "
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Alles löschen"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Klicke um alle ausgewählen %s gleichzeitig zu entfernen."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(sel)s der %(cnt)s ausgewählten"
-msgstr[1] "%(sel)s der %(cnt)s ausgewählten"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"Es gibt ungespeicherte Änderungen in individell bearbeitbaren Feldern. Wenn "
-"du eine Aktion ausführst, gehen ungespeicherte Änderungen verloren."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Du habst eine Aktion ausgewählt, aber du hast die Änderungen an "
-"individuellen Feldern bisher nicht gespeichert. Bitte klicke zum Speichern "
-"auf OK. Du musst die Aktion von neuem starten."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"Du hast eine Aktion ausgewählt, aber du hast bisher keine Änderungen an "
-"individuellen Feldern vorgenommen. Wahrscheinlich suchst du den Go-Knopf und"
-" nicht den Speichern-Knopf."
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "S|M|D|M|D|F|S"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Anzeigen"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Verstecken"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Sonntag|Montag|Dienstag|Mittwoch|Donnerstag|Freitag|Samstag"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Jetzt"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Uhr"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Uhrzeit auswählen"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Mitternacht"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6 Uhr"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Mittags"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Heute"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Kalender"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Gestern"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Morgen"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "Taschenrechner öffnen"
@@ -3065,6 +2901,10 @@ msgstr "Überschrift"
 msgid "You have been logged out of your edX account. "
 msgstr "Du wurdest von deinem edX-Benutzerkonto abgemeldet."
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr "Unbekannter Fehler aufgetreten."
@@ -3375,10 +3215,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3481,6 +3317,10 @@ msgstr ""
 msgid "or"
 msgstr "oder"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3763,6 +3603,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4705,6 +4559,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/el/LC_MESSAGES/django.mo b/conf/locale/el/LC_MESSAGES/django.mo
index 2f05b08983..9de5a3846d 100644
Binary files a/conf/locale/el/LC_MESSAGES/django.mo and b/conf/locale/el/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/el/LC_MESSAGES/django.po b/conf/locale/el/LC_MESSAGES/django.po
index 7c78861a22..49a96888da 100644
--- a/conf/locale/el/LC_MESSAGES/django.po
+++ b/conf/locale/el/LC_MESSAGES/django.po
@@ -5,6 +5,7 @@
 # 
 # Translators:
 # Elisabeth Georgiado <almanean@yahoo.gr>, 2014
+# Georgios Vasileiadis <gvasileiadis@outlook.com.gr>, 2014
 # Nick Gikopoulos <ngick1@gmail.com>, 2014
 # Panos Chronis <panosfyra4@yahoo.gr>, 2014
 # Panos Chronis <panosfyra4@yahoo.gr>, 2014
@@ -23,6 +24,7 @@
 # This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
 # 
 # Translators:
+# Georgios Vasileiadis <gvasileiadis@outlook.com.gr>, 2014
 # Aika1 <katepapastavrou@gmail.com>, 2014
 # Nick Gikopoulos <ngick1@gmail.com>, 2014
 # #-#-#-#-#  mako-studio.po (edx-platform)  #-#-#-#-#
@@ -50,8 +52,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Panos Chronis <panosfyra4@yahoo.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/edx-platform/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -116,14 +118,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -215,6 +209,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2223,6 +2218,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2581,23 +2617,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2959,9 +2978,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4127,6 +4147,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5028,15 +5052,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5044,37 +5080,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5315,17 +5339,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5335,7 +5359,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5349,8 +5373,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6536,15 +6560,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6581,7 +6605,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6999,11 +7023,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7164,6 +7183,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7466,6 +7486,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8474,11 +8499,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8491,6 +8511,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9342,9 +9367,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9432,7 +9454,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11230,18 +11251,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12578,6 +12587,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12633,19 +12685,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12653,15 +12705,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14184,6 +14236,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14196,6 +14257,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14254,10 +14320,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14272,6 +14339,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/el/LC_MESSAGES/djangojs.mo b/conf/locale/el/LC_MESSAGES/djangojs.mo
index 4ffbfd001a..f0a2a15b74 100644
Binary files a/conf/locale/el/LC_MESSAGES/djangojs.mo and b/conf/locale/el/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/el/LC_MESSAGES/djangojs.po b/conf/locale/el/LC_MESSAGES/djangojs.po
index 14eb6525aa..31c0152400 100644
--- a/conf/locale/el/LC_MESSAGES/djangojs.po
+++ b/conf/locale/el/LC_MESSAGES/djangojs.po
@@ -36,7 +36,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/edx-platform/language/el/)\n"
@@ -69,8 +69,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2151,153 +2149,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2956,6 +2807,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3265,10 +3120,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3371,6 +3222,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3655,6 +3510,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4597,6 +4466,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/en_GB/LC_MESSAGES/django.mo b/conf/locale/en_GB/LC_MESSAGES/django.mo
index f4fbbc483f..8fefd099fc 100644
Binary files a/conf/locale/en_GB/LC_MESSAGES/django.mo and b/conf/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/en_GB/LC_MESSAGES/django.po b/conf/locale/en_GB/LC_MESSAGES/django.po
index 3d314194c3..f026bc683c 100644
--- a/conf/locale/en_GB/LC_MESSAGES/django.po
+++ b/conf/locale/en_GB/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-06 03:04+0000\n"
 "Last-Translator: \n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/edx-platform/language/en_GB/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/en_GB/LC_MESSAGES/djangojs.mo b/conf/locale/en_GB/LC_MESSAGES/djangojs.mo
index 0b412892e3..16c92c10f7 100644
Binary files a/conf/locale/en_GB/LC_MESSAGES/djangojs.mo and b/conf/locale/en_GB/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/en_GB/LC_MESSAGES/djangojs.po b/conf/locale/en_GB/LC_MESSAGES/djangojs.po
index 31656fbd74..17fc1975f0 100644
--- a/conf/locale/en_GB/LC_MESSAGES/djangojs.po
+++ b/conf/locale/en_GB/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/edx-platform/language/en_GB/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/eo/LC_MESSAGES/django.mo b/conf/locale/eo/LC_MESSAGES/django.mo
index f05e2a5eff..feefcaa2e9 100644
Binary files a/conf/locale/eo/LC_MESSAGES/django.mo and b/conf/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/eo/LC_MESSAGES/django.po b/conf/locale/eo/LC_MESSAGES/django.po
index 39e500d8df..dc89def53a 100644
--- a/conf/locale/eo/LC_MESSAGES/django.po
+++ b/conf/locale/eo/LC_MESSAGES/django.po
@@ -37,8 +37,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 11:02-0400\n"
-"PO-Revision-Date: 2014-10-27 15:02:51.541121\n"
+"POT-Creation-Date: 2014-11-10 09:42-0500\n"
+"PO-Revision-Date: 2014-11-10 14:42:09.270615\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -103,14 +103,6 @@ msgstr "Ûnït Ⱡ'σяєм#"
 msgid "You cannot create two cohorts with the same name"
 msgstr "Ýöü çännöt çréäté twö çöhörts wïth thé sämé nämé Ⱡ'σяєм ιρѕυм #"
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr "Réqüéstéd pägé müst ßé nümérïç Ⱡ'σяєм #"
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr "Réqüéstéd pägé müst ßé gréätér thän zérö Ⱡ'σяєм ιρѕυ#"
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "Hönör Çödé Çértïfïçäté Ⱡ'σяє#"
@@ -205,6 +197,7 @@ msgstr "Éléméntärý/prïmärý sçhööl Ⱡ'σяєм#"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "Nöné Ⱡ'σяєм#"
 
@@ -2521,6 +2514,59 @@ msgstr ""
 msgid "Invitation Only"
 msgstr "Ìnvïtätïön Önlý Ⱡ'#"
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr "Pré-Çöürsé Sürvéý Nämé Ⱡ'σяє#"
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+"Nämé öf SürvéýFörm tö dïspläý äs ä pré-çöürsé sürvéý tö thé üsér. Ⱡ'σяєм "
+"ιρѕυм ∂σłσя #"
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr "Pré-Çöürsé Sürvéý Réqüïréd Ⱡ'σяєм#"
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+"Spéçïfý whéthér stüdénts müst çömplété ä sürvéý ßéföré théý çän vïéw ýöür "
+"çöürsé çöntént. Ìf ýöü sét thïs välüé tö trüé, ýöü müst ädd ä nämé för thé "
+"sürvéý tö thé Çöürsé Sürvéý Nämé séttïng äßövé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт,"
+" ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂#"
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr "Çöürsé Vïsïßïlïtý Ìn Çätälög Ⱡ'σяєм #"
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+"Défïnés thé äççéss pérmïssïöns för shöwïng thé çöürsé ïn thé çöürsé çätälög."
+" Thïs çän ßé sét tö öné öf thréé välüés: 'ßöth' (shöw ïn çätälög änd ällöw "
+"äççéss tö äßöüt pägé), 'äßöüt' (önlý ällöw äççéss tö äßöüt pägé), 'nöné' (dö"
+" nöt shöw ïn çätälög änd dö nöt ällöw äççéss tö än äßöüt pägé). Ⱡ'σяєм ιρѕυм"
+" ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя "
+"ιη¢ι∂ι∂υηт υ#"
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr "Böth Ⱡ'σяєм#"
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "Àßöüt Ⱡ'σяєм ι#"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "Généräl #"
@@ -2950,23 +2996,6 @@ msgstr "Éntér thé däté ßý whïçh prößléms äré düé. Ⱡ'σяєм 
 msgid "Group ID {group_id}"
 msgstr "Gröüp ÌD {group_id} Ⱡ#"
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr "Wärnïng #"
-
-#. #-#-#-#-#  django-partial.po (0.1a)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "Érrör Ⱡ'σяєм ι#"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr "Nöt Séléçtéd Ⱡ#"
@@ -3404,14 +3433,16 @@ msgstr "Shöw Rését Büttön för Prößléms Ⱡ'σяєм #"
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
-"Éntér trüé ör fälsé. Ìf trüé, prößléms défäült tö dïspläýïng ä 'Rését' "
-"ßüttön. Thïs välüé mäý ßé övérrïdén ïn éäçh prößlém's séttïngs. Éxïstïng "
-"prößléms whösé rését séttïng hävé nöt ßéén çhängéd äré äfféçtéd. Ⱡ'σяєм "
-"ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ #"
+"Éntér trüé ör fälsé. Ìf trüé, prößléms ïn thé çöürsé défäült tö älwäýs "
+"dïspläýïng ä 'Rését' ßüttön. Ýöü çän övérrïdé thïs ïn éäçh prößlém's "
+"séttïngs. Àll éxïstïng prößléms äré äfféçtéd whén thïs çöürsé-wïdé séttïng "
+"ïs çhängéd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ "
+"∂σ єιυѕмσ#"
 
 #. Translators: "Self" is used to denote an openended response that is self-
 #. graded
@@ -4740,6 +4771,10 @@ msgstr "Dätä Döwnlöäd Ⱡ'#"
 msgid "Analytics"
 msgstr "Ànälýtïçs #"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr "Démögräphïç dätä ïs nöw äväïläßlé ïn {dashboard_link}. Ⱡ'σяєм ιρѕυ#"
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5759,87 +5794,87 @@ msgstr ""
 "Thé ämöünt çhärgéd ßý thé pröçéssör {0} {1} ïs dïfférént thän thé tötäl çöst"
 " öf thé ördér {2} {3}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#"
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sörrý! Öür päýmént pröçéssör dïd nöt äççépt ýöür päýmént.\n"
+"        Thé déçïsïön théý rétürnéd wäs <span class=\"decision\">{decision}</span>,\n"
+"        änd thé réäsön wäs <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        Ýöü wéré nöt çhärgéd. Pléäsé trý ä dïfférént förm öf päýmént.\n"
+"        Çöntäçt üs wïth päýmént-rélätéd qüéstïöns ät {email}.\n"
+"        </p>\n"
+"         Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє є#"
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sörrý! Öür päýmént pröçéssör dïd nöt äççépt ýöür päýmént.\n"
-"            Thé déçïsïön théý rétürnéd wäs <span class=\"decision\">{decision}</span>,\n"
-"            änd thé réäsön wäs <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            Ýöü wéré nöt çhärgéd. Pléäsé trý ä dïfférént förm öf päýmént.\n"
-"            Çöntäçt üs wïth päýmént-rélätéd qüéstïöns ät {email}.\n"
+"            Sörrý! Öür päýmént pröçéssör sént üs ßäçk ä päýmént çönfïrmätïön thät häd ïnçönsïstént dätä!\n"
+"            Wé äpölögïzé thät wé çännöt vérïfý whéthér thé çhärgé wént thröügh änd täké fürthér äçtïön ön ýöür ördér.\n"
+"            Thé spéçïfïç érrör méssägé ïs: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Ýöür çrédït çärd mäý pössïßlý hävé ßéén çhärgéd.  Çöntäçt üs wïth päýmént-spéçïfïç qüéstïöns ät {email}.\n"
 "            </p>\n"
-"             Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє м#"
+"             Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηι#"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sörrý! Öür päýmént pröçéssör sént üs ßäçk ä päýmént çönfïrmätïön thät häd ïnçönsïstént dätä!\n"
-"                Wé äpölögïzé thät wé çännöt vérïfý whéthér thé çhärgé wént thröügh änd täké fürthér äçtïön ön ýöür ördér.\n"
-"                Thé spéçïfïç érrör méssägé ïs: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Ýöür çrédït çärd mäý pössïßlý hävé ßéén çhärgéd.  Çöntäçt üs wïth päýmént-spéçïfïç qüéstïöns ät {email}.\n"
-"                </p>\n"
-"                 Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм νєηιαм,#"
+"            <p class=\"error_msg\">\n"
+"            Sörrý! Düé tö än érrör ýöür pürçhäsé wäs çhärgéd för ä dïfférént ämöünt thän thé ördér tötäl!\n"
+"            Thé spéçïfïç érrör méssägé ïs: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Ýöür çrédït çärd häs prößäßlý ßéén çhärgéd. Çöntäçt üs wïth päýmént-spéçïfïç qüéstïöns ät {email}.\n"
+"            </p>\n"
+"             Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσя#"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sörrý! Düé tö än érrör ýöür pürçhäsé wäs çhärgéd för ä dïfférént ämöünt thän thé ördér tötäl!\n"
-"                Thé spéçïfïç érrör méssägé ïs: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Ýöür çrédït çärd häs prößäßlý ßéén çhärgéd. Çöntäçt üs wïth päýmént-spéçïfïç qüéstïöns ät {email}.\n"
-"                </p>\n"
-"                 Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σł#"
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sörrý! Öür päýmént pröçéssör sént üs ßäçk ä çörrüptéd méssägé régärdïng ýöür çhärgé, sö wé äré\n"
-"                ünäßlé tö välïdäté thät thé méssägé äçtüällý çämé fröm thé päýmént pröçéssör.\n"
-"                Thé spéçïfïç érrör méssägé ïs: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Wé äpölögïzé thät wé çännöt vérïfý whéthér thé çhärgé wént thröügh änd täké fürthér äçtïön ön ýöür ördér.\n"
-"                Ýöür çrédït çärd mäý pössïßlý hävé ßéén çhärgéd.  Çöntäçt üs wïth päýmént-spéçïfïç qüéstïöns ät {email}.\n"
-"                </p>\n"
-"                 Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση υłłαм#"
+"            <p class=\"error_msg\">\n"
+"            Sörrý! Öür päýmént pröçéssör sént üs ßäçk ä çörrüptéd méssägé régärdïng ýöür çhärgé, sö wé äré\n"
+"            ünäßlé tö välïdäté thät thé méssägé äçtüällý çämé fröm thé päýmént pröçéssör.\n"
+"            Thé spéçïfïç érrör méssägé ïs: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Wé äpölögïzé thät wé çännöt vérïfý whéthér thé çhärgé wént thröügh änd täké fürthér äçtïön ön ýöür ördér.\n"
+"            Ýöür çrédït çärd mäý pössïßlý hävé ßéén çhärgéd.  Çöntäçt üs wïth päýmént-spéçïfïç qüéstïöns ät {email}.\n"
+"            </p>\n"
+"             Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιт#"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6168,31 +6203,31 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 "Sörrý! Öür päýmént pröçéssör sént üs ßäçk ä päýmént çönfïrmätïön thät häd "
-"ïnçönsïstént dätä!  Wé äpölögïzé thät wé çännöt vérïfý whéthér thé çhärgé "
-"wént thröügh änd täké fürthér äçtïön ön ýöür ördér.  Thé spéçïfïç érrör "
-"méssägé ïs: {msg}  Ýöür çrédït çärd mäý pössïßlý hävé ßéén çhärgéd.  Çöntäçt"
-" üs wïth päýmént-spéçïfïç qüéstïöns ät {email}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт,"
-" ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт"
-" ∂σłσ#"
+"ïnçönsïstént dätä! Wé äpölögïzé thät wé çännöt vérïfý whéthér thé çhärgé "
+"wént thröügh änd täké fürthér äçtïön ön ýöür ördér. Thé spéçïfïç érrör "
+"méssägé ïs: {msg} Ýöür çrédït çärd mäý pössïßlý hävé ßéén çhärgéd.  Çöntäçt "
+"üs wïth päýmént-spéçïfïç qüéstïöns ät {email}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
+"¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт "
+"∂σł#"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 "Sörrý! Düé tö än érrör ýöür pürçhäsé wäs çhärgéd för ä dïfférént ämöünt thän"
-" thé ördér tötäl!  Thé spéçïfïç érrör méssägé ïs: {msg}.  Ýöür çrédït çärd "
-"häs prößäßlý ßéén çhärgéd. Çöntäçt üs wïth päýmént-spéçïfïç qüéstïöns ät "
+" thé ördér tötäl! Thé spéçïfïç érrör méssägé ïs: {msg}. Ýöür çrédït çärd häs"
+" prößäßlý ßéén çhärgéd. Çöntäçt üs wïth päýmént-spéçïfïç qüéstïöns ät "
 "{email}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ "
-"єιυѕмσ#"
+"єιυѕм#"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -6200,14 +6235,14 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 "Sörrý! Öür päýmént pröçéssör sént üs ßäçk ä çörrüptéd méssägé régärdïng ýöür"
 " çhärgé, sö wé äré ünäßlé tö välïdäté thät thé méssägé äçtüällý çämé fröm "
 "thé päýmént pröçéssör. Thé spéçïfïç érrör méssägé ïs: {msg}. Wé äpölögïzé "
 "thät wé çännöt vérïfý whéthér thé çhärgé wént thröügh änd täké fürthér "
-"äçtïön ön ýöür ördér. Ýöür çrédït çärd mäý pössïßlý hävé ßéén çhärgéd.  "
+"äçtïön ön ýöür ördér. Ýöür çrédït çärd mäý pössïßlý hävé ßéén çhärgéd. "
 "Çöntäçt üs wïth päýmént-spéçïfïç qüéstïöns ät {email}. Ⱡ'σяєм ιρѕυм ∂σłσя "
 "ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт "
 "łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм #"
@@ -6227,11 +6262,11 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
-"Sörrý!  Ýöür päýmént çöüld nöt ßé pröçésséd ßéçäüsé än ünéxpéçtéd éxçéptïön "
-"öççürréd.  Pléäsé çöntäçt üs ät {email} för ässïstänçé. Ⱡ'σяєм ιρѕυм ∂σłσя "
+"Sörrý! Ýöür päýmént çöüld nöt ßé pröçésséd ßéçäüsé än ünéxpéçtéd éxçéptïön "
+"öççürréd. Pléäsé çöntäçt üs ät {email} för ässïstänçé. Ⱡ'σяєм ιρѕυм ∂σłσя "
 "ѕιт αмєт, ¢σηѕє¢тєтυ#"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -7565,17 +7600,16 @@ msgid "Help"
 msgstr "Hélp Ⱡ'σяєм#"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
-msgstr "Ûpgrädé Ýöür Régïsträtïön för {} | Çhöösé Ýöür Träçk Ⱡ'σяєм ιρѕυм ∂σ#"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
+msgstr "Ûpgrädé Ýöür Énröllmént för {} | Çhöösé Ýöür Träçk Ⱡ'σяєм ιρѕυм ∂#"
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "Régïstér för {} | Çhöösé Ýöür Träçk Ⱡ'σяєм ιρ#"
+msgid "Enroll In {} | Choose Your Track"
+msgstr "Énröll Ìn {} | Çhöösé Ýöür Träçk Ⱡ'σяєм ι#"
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr ""
-"Sörrý, théré wäs än érrör whén trýïng tö régïstér ýöü Ⱡ'σяєм ιρѕυм ∂σ#"
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr "Sörrý, théré wäs än érrör whén trýïng tö énröll ýöü Ⱡ'σяєм ιρѕυм ∂#"
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -7620,8 +7654,8 @@ msgid "):"
 msgstr "): Ⱡ'#"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
-msgstr "Ûpgrädé Ýöür Régïsträtïön Ⱡ'σяєм#"
+msgid "Upgrade Your Enrollment"
+msgstr "Ûpgrädé Ýöür Énröllmént Ⱡ'σяє#"
 
 #: common/templates/course_modes/choose.html
 msgid "Audit This Course"
@@ -8093,11 +8127,6 @@ msgstr "(Révïséd 4/16/2014) Ⱡ'σя#"
 msgid "About & Company Info"
 msgstr "Àßöüt & Çömpäný Ìnfö Ⱡ'σя#"
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "Àßöüt Ⱡ'σяєм ι#"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr "Néws Ⱡ'σяєм#"
@@ -8282,6 +8311,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "Süßmït Ⱡ'σяєм ιρѕ#"
 
@@ -8621,6 +8651,11 @@ msgstr "Räw dätä: #"
 msgid "Accepted"
 msgstr "Àççéptéd #"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "Érrör Ⱡ'σяєм ι#"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "Réjéçtéd #"
@@ -9713,13 +9748,6 @@ msgstr "Vïéw Çöürséwäré Ⱡ'#"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "Thïs çöürsé ïs ïn ýöür <a href=\"{cart_link}\">çärt</a>. Ⱡ'σяєм ιρ#"
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"Àdd {course.display_number_with_default} tö Çärt ({currency_symbol}{cost}) "
-"Ⱡ'σяє#"
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "Çöürsé ïs füll Ⱡ'#"
@@ -9732,6 +9760,13 @@ msgstr "Énröllmént ïn thïs çöürsé ïs ßý ïnvïtätïön önlý Ⱡ'
 msgid "Enrollment is Closed"
 msgstr "Énröllmént ïs Çlöséd Ⱡ'σя#"
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"Àdd {course.display_number_with_default} tö Çärt ({currency_symbol}{cost}) "
+"Ⱡ'σяє#"
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "Régïstér för {course.display_number_with_default} Ⱡ'σ#"
@@ -10691,9 +10726,6 @@ msgstr "Énrölléd äs:  Ⱡ'#"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr "Vérïfïéd #"
 
@@ -10789,7 +10821,6 @@ msgstr "Vïéw Àrçhïvéd Çöürsé Ⱡ'σя#"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "Vïéw Çöürsé Ⱡ#"
 
@@ -12859,24 +12890,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr "Sénd mé ä çöpý öf thé ïnvöïçé Ⱡ'σяєм #"
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr "Àçtïvé Stüdénts Ⱡ'#"
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-"Thé çöünt öf stüdénts whö ïntéräçtéd ät léäst önçé ßý öpénïng pägés, pläýïng"
-" vïdéös, pöstïng ïn dïsçüssïöns, süßmïttïng prößléms, ör çömplétïng öthér "
-"äçtïvïtïés. Thé däté rängé ïnçlüdés äll äçtïvïtïés fröm mïdnïght ön thé "
-"stärt däté (ïnçlüsïvé) thöügh mïdnïght ön thé énd däté (éxçlüsïvé). Ⱡ'σяєм "
-"ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя "
-"ιη¢ι∂ι∂υηт υ#"
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr "Sçöré Dïstrïßütïön Ⱡ'σ#"
@@ -14441,6 +14454,58 @@ msgstr "Stüdént Àççöünt Ⱡ'#"
 msgid "Student Profile"
 msgstr "Stüdént Pröfïlé Ⱡ'#"
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr "Ûsér Sürvéý Ⱡ#"
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr "Pré-Çöürsé Sürvéý Ⱡ'σ#"
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+"Ýöü çän ßégïn ýöür çöürsé äs söön äs ýöü çömplété thé föllöwïng förm. "
+"Réqüïréd fïélds äré märkéd wïth än ästérïsk (*). Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт "
+"αмєт, ¢σηѕє¢т#"
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr "Ýöü äré mïssïng thé föllöwïng réqüïréd fïélds: Ⱡ'σяєм ιρѕυм #"
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr "Çänçél änd Rétürn tö Däshßöärd Ⱡ'σяєм #"
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr "Whý dö Ì nééd tö çömplété thïs ïnförmätïön? Ⱡ'σяєм ιρѕυм#"
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+"Wé üsé thé ïnförmätïön ýöü prövïdé tö ïmprövé öür çöürsé för ßöth çürrént "
+"änd fütüré stüdénts. Thé möré wé knöw äßöüt ýöür spéçïfïç nééds, thé ßéttér "
+"wé çän mäké ýöür çöürsé éxpérïénçé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя"
+" α∂ιριѕι¢ιηg єłιт, #"
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr "Whö çän Ì çöntäçt ïf Ì hävé qüéstïöns? Ⱡ'σяєм ιρѕ#"
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+"Ìf ýöü hävé äný qüéstïöns äßöüt thïs çöürsé ör thïs förm, ýöü çän çöntäçt <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr "Édït Ýöür Nämé Ⱡ'#"
@@ -14510,36 +14575,40 @@ msgstr ""
 "çértïfïçätés{a_end}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
-msgstr "Ýöü äré üpgrädïng ýöür régïsträtïön för Ⱡ'σяєм ιρѕ#"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
+msgstr ""
+"Ýöü äré üpgrädïng ýöür énröllmént för {organization}'s {course_name} Ⱡ'σяєм "
+"ιρѕυм #"
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
-msgstr "Ýöü äré ré-vérïfýïng för Ⱡ'σяє#"
+msgid "You are re-verifying for {organization}'s {course_name}"
+msgstr "Ýöü äré ré-vérïfýïng för {organization}'s {course_name} Ⱡ'σяєм ιρ#"
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
-msgstr "Ýöü äré régïstérïng för Ⱡ'σяє#"
+msgid "You are enrolling in {organization}'s {course_name}"
+msgstr "Ýöü äré énröllïng ïn {organization}'s {course_name} Ⱡ'σяєм #"
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
-msgstr "Çöngräts! Ýöü äré nöw régïstéréd tö äüdït Ⱡ'σяєм ιρѕυ#"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
+msgstr ""
+"Çöngräts! Ýöü äré nöw énrölléd ïn {organization}'s {course_name} Ⱡ'σяєм "
+"ιρѕυм#"
 
 #: lms/templates/verify_student/_verification_header.html
 msgid "Professional Education"
 msgstr "Pröféssïönäl Édüçätïön Ⱡ'σяє#"
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
-msgstr "Ûpgrädïng tö: Ⱡ'#"
+msgid "{span_start}Upgrading to:{span_end} Verified"
+msgstr "{span_start}Ûpgrädïng tö:{span_end} Vérïfïéd Ⱡ'σяєм #"
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
-msgstr "Ré-vérïfýïng för: Ⱡ'σ#"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
+msgstr "{span_start}Ré-vérïfýïng för:{span_end} Vérïfïéd Ⱡ'σяєм ι#"
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
-msgstr "Régïstérïng äs:  Ⱡ'σ#"
+msgid "{span_start}Enrolling as:{span_end} Verified"
+msgstr "{span_start}Énröllïng äs:{span_end} Vérïfïéd Ⱡ'σяєм #"
 
 #: lms/templates/verify_student/_verification_support.html
 msgid "Technical Requirements"
@@ -16344,6 +16413,21 @@ msgstr ""
 "ýöü'vé éxpörtéd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, "
 "ѕє∂ ∂σ єιυѕмσ∂ тє#"
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+"{em_start}Çäütïön:{em_end} Whén ýöü éxpört ä çöürsé, ïnförmätïön süçh äs "
+"MÀTLÀB ÀPÌ kéýs, LTÌ pässpörts, ännötätïön séçrét tökén strïngs, änd "
+"ännötätïön störägé ÛRLs äré ïnçlüdéd ïn thé éxpörtéd dätä. Ìf ýöü shäré ýöür"
+" éxpörtéd fïlés, ýöü mäý älsö ßé shärïng sénsïtïvé ör lïçénsé-spéçïfïç "
+"ïnförmätïön. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ "
+"∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υ#"
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr "Éxpört Mý Çöürsé Çöntént Ⱡ'σяє#"
@@ -16356,6 +16440,13 @@ msgstr "Éxpört Çöürsé Çöntént Ⱡ'σя#"
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr "Dätä {em_start}éxpörtéd wïth{em_end} ýöür çöürsé: Ⱡ'σяєм ιρѕ#"
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+"Välüés fröm Àdvänçéd Séttïngs, ïnçlüdïng MÀTLÀB ÀPÌ kéýs änd LTÌ pässpörts "
+"Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -16420,16 +16511,19 @@ msgstr "Whät çöntént ïs éxpörtéd? Ⱡ'σяєм#"
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
-"Önlý thé çöürsé çöntént änd strüçtüré (ïnçlüdïng séçtïöns, süßséçtïöns, änd "
-"ünïts) äré éxpörtéd. Öthér dätä, ïnçlüdïng stüdént dätä, grädïng "
-"ïnförmätïön, dïsçüssïön förüm dätä, çöürsé séttïngs, änd çöürsé téäm "
-"ïnförmätïön, ïs nöt éxpörtéd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя "
-"α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тє#"
+"Thé çöürsé çöntént änd strüçtüré (ïnçlüdïng séçtïöns, süßséçtïöns, änd "
+"ünïts) äré éxpörtéd. Välüés fröm Àdvänçéd Séttïngs, ïnçlüdïng MÀTLÀB ÀPÌ "
+"kéýs änd LTÌ pässpörts, äré älsö éxpörtéd. Öthér dätä, ïnçlüdïng stüdént "
+"dätä, grädïng ïnförmätïön, dïsçüssïön förüm dätä, çöürsé séttïngs, änd "
+"çöürsé téäm ïnförmätïön, ïs nöt éxpörtéd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
+"¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт "
+"∂#"
 
 #: cms/templates/export.html
 msgid "Opening the downloaded file"
@@ -16446,6 +16540,10 @@ msgstr ""
 "dätä ïnçlüdés thé çöürsé.xml fïlé, äs wéll äs süßföldérs thät çöntäïn çöürsé"
 " çöntént. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιη#"
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr "Léärn möré äßöüt éxpörtïng ä çöürsé Ⱡ'σяєм ιρ#"
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr "Éxpört Çöürsé tö Gït Ⱡ'σя#"
diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.mo b/conf/locale/eo/LC_MESSAGES/djangojs.mo
index 87e575ea9f..93aeec6183 100644
Binary files a/conf/locale/eo/LC_MESSAGES/djangojs.mo and b/conf/locale/eo/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.po b/conf/locale/eo/LC_MESSAGES/djangojs.po
index 40a75d4706..03b4e44bce 100644
--- a/conf/locale/eo/LC_MESSAGES/djangojs.po
+++ b/conf/locale/eo/LC_MESSAGES/djangojs.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 11:01-0400\n"
-"PO-Revision-Date: 2014-10-27 15:02:51.591584\n"
+"POT-Creation-Date: 2014-11-10 09:40-0500\n"
+"PO-Revision-Date: 2014-11-10 14:42:09.315985\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -59,8 +59,6 @@ msgstr "ÖK Ⱡ'#"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2233,173 +2231,6 @@ msgstr "Réplý Ⱡ'σяєм ι#"
 msgid "Tags:"
 msgstr "Tägs: Ⱡ'σяєм ι#"
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "Àväïläßlé %s Ⱡ#"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Thïs ïs thé lïst öf äväïläßlé %s. Ýöü mäý çhöösé sömé ßý séléçtïng thém ïn "
-"thé ßöx ßélöw änd thén çlïçkïng thé \"Çhöösé\" ärröw ßétwéén thé twö ßöxés. "
-"Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιρι#"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-"Týpé ïntö thïs ßöx tö fïltér döwn thé lïst öf äväïläßlé %s. Ⱡ'σяєм ιρѕυм "
-"∂σłσ#"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Fïltér Ⱡ'σяєм ιρѕ#"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Çhöösé äll Ⱡ#"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Çlïçk tö çhöösé äll %s ät önçé. Ⱡ'σяєм ι#"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Çhöösé Ⱡ'σяєм ιρѕ#"
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr "Rémövé Ⱡ'σяєм ιρѕ#"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "Çhösén %s #"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Thïs ïs thé lïst öf çhösén %s. Ýöü mäý rémövé sömé ßý séléçtïng thém ïn thé "
-"ßöx ßélöw änd thén çlïçkïng thé \"Rémövé\" ärröw ßétwéén thé twö ßöxés. "
-"Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιρ#"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Rémövé äll Ⱡ#"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Çlïçk tö rémövé äll çhösén %s ät önçé. Ⱡ'σяєм ιρѕ#"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(sel)s öf %(cnt)s séléçtéd Ⱡ'σя#"
-msgstr[1] "%(sel)s öf %(cnt)s séléçtéd Ⱡ'σя#"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"Ýöü hävé ünsävéd çhängés ön ïndïvïdüäl édïtäßlé fïélds. Ìf ýöü rün än "
-"äçtïön, ýöür ünsävéd çhängés wïll ßé löst. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
-"¢σηѕє#"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Ýöü hävé séléçtéd än äçtïön, ßüt ýöü hävén't sävéd ýöür çhängés tö "
-"ïndïvïdüäl fïélds ýét. Pléäsé çlïçk ÖK tö sävé. Ýöü'll nééd tö ré-rün thé "
-"äçtïön. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιρι#"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"Ýöü hävé séléçtéd än äçtïön, änd ýöü hävén't mädé äný çhängés ön ïndïvïdüäl "
-"fïélds. Ýöü'ré prößäßlý löökïng för thé Gö ßüttön räthér thän thé Sävé "
-"ßüttön. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι#"
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Jänüärý|Féßrüärý|Märçh|Àprïl|Mäý|Jüné|Jülý|Àügüst|Séptémßér|Öçtößér|Növémßér|Déçémßér"
-" Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "S|M|T|W|T|F|S Ⱡ'#"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Shöw Ⱡ'σяєм#"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Hïdé Ⱡ'σяєм#"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-"Sündäý|Möndäý|Tüésdäý|Wédnésdäý|Thürsdäý|Frïdäý|Sätürdäý Ⱡ'σяєм ιρѕυм ∂σł#"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Nöw Ⱡ'σя#"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Çlöçk Ⱡ'σяєм ι#"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Çhöösé ä tïmé Ⱡ'#"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Mïdnïght #"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6 ä.m. Ⱡ'σяєм ιρѕ#"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Nöön Ⱡ'σяєм#"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Tödäý Ⱡ'σяєм ι#"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Çäléndär #"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Ýéstérdäý #"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Tömörröw #"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "Öpén Çälçülätör Ⱡ'#"
@@ -3146,6 +2977,10 @@ msgstr "Héädïng #"
 msgid "You have been logged out of your edX account. "
 msgstr "Ýöü hävé ßéén löggéd öüt öf ýöür édX äççöünt.  Ⱡ'σяєм ιρѕυм #"
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr "Théré häs ßéén än érrör pröçéssïng ýöür sürvéý. Ⱡ'σяєм ιρѕυм #"
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr "Ûnknöwn Érrör Öççürréd. Ⱡ'σяє#"
@@ -3488,12 +3323,6 @@ msgstr "Ýöür ïmpört häs fäïléd. Ⱡ'σяє#"
 msgid "Choose new file"
 msgstr "Çhöösé néw fïlé Ⱡ'#"
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-"Ýöür ïmpört ïs ïn prögréss; nävïgätïng äwäý wïll äßört ït. Ⱡ'σяєм ιρѕυм "
-"∂σłσ#"
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr "À välïd émäïl äddréss ïs réqüïréd Ⱡ'σяєм ι#"
@@ -3607,6 +3436,10 @@ msgstr ""
 msgid "or"
 msgstr "ör Ⱡ'#"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr "Thïs çömpönént häs välïdätïön ïssüés. Ⱡ'σяєм ιρѕ#"
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "Thé çöürsé müst hävé än ässïgnéd stärt däté. Ⱡ'σяєм ιρѕυм#"
@@ -3920,6 +3753,20 @@ msgstr "Séttïngs #"
 msgid "New %(component_type)s"
 msgstr "Néw %(component_type)s #"
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr "Wärnïng #"
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr "Érrör Ⱡ'σяєм ι#"
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4934,6 +4781,10 @@ msgstr "Pägé Àçtïöns Ⱡ#"
 msgid "New Group Configuration"
 msgstr "Néw Gröüp Çönfïgürätïön Ⱡ'σяє#"
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr "Rémövé Ⱡ'σяєм ιρѕ#"
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr "Àdd ÛRLs för äddïtïönäl vérsïöns Ⱡ'σяєм ι#"
diff --git a/conf/locale/es_419/LC_MESSAGES/django.mo b/conf/locale/es_419/LC_MESSAGES/django.mo
index 0e1e1e536c..6c7bf213e4 100644
Binary files a/conf/locale/es_419/LC_MESSAGES/django.mo and b/conf/locale/es_419/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/es_419/LC_MESSAGES/django.po b/conf/locale/es_419/LC_MESSAGES/django.po
index 2ce31955fc..103e51d61c 100644
--- a/conf/locale/es_419/LC_MESSAGES/django.po
+++ b/conf/locale/es_419/LC_MESSAGES/django.po
@@ -71,6 +71,7 @@
 # Juan Camilo Montoya Franco <juan.montoya@hmltda.com>, 2013-2014
 # Juan Camilo Montoya Franco <juan.montoya@hmltda.com>, 2013-2014
 # Juan Camilo Montoya Franco <juan.montoya@hmltda.com>, 2013
+# Lalo Cabrera <laloogcabrera@yahoo.com.mx>, 2014
 # camilomaiden <inactive+camilomaiden@transifex.com>, 2014
 # Luis Ricardo Ruiz <luislicardo1307@gmail.com>, 2013
 # Luis Ricardo Ruiz <luislicardo1307@gmail.com>, 2013-2014
@@ -126,8 +127,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Cristian Salamea <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Latin America) (http://www.transifex.com/projects/p/edx-platform/language/es_419/)\n"
 "MIME-Version: 1.0\n"
@@ -190,15 +191,7 @@ msgstr "Unidad"
 
 #: common/djangoapps/course_groups/cohorts.py
 msgid "You cannot create two cohorts with the same name"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr "La página solicitada debe ser solicitada con un número"
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr "La página solicitada debe ser un número mayor que cero"
+msgstr "No puede crear dos cohortes con el mismo nombre"
 
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
@@ -293,6 +286,7 @@ msgstr "Primaria"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "Ninguno"
 
@@ -310,7 +304,7 @@ msgstr "El ID del curso no es válido"
 
 #: common/djangoapps/student/views.py
 msgid "Could not enroll"
-msgstr ""
+msgstr "No se ha podido inscribir"
 
 #: common/djangoapps/student/views.py
 msgid "You are not enrolled in this course"
@@ -1447,13 +1441,16 @@ msgstr "Fuerza el botón Guardar para que aparezca en la página"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Show Reset Button"
-msgstr ""
+msgstr "Mostrar botón de resetear"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
 "Determines whether a 'Reset' button is shown so the user may reset their "
 "answer. A default value can be set in Advanced Settings."
 msgstr ""
+"Determina si un \"Botón\" de reset es mostrado al usuario para resetear la "
+"respuesta. El valor por defecto puede configurarse en Configuraciones "
+"avanzadas"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
@@ -1925,6 +1922,13 @@ msgid ""
 "like this: [[\"2014-09-15\", \"2014-09-21\"], [\"2014-10-01\", "
 "\"2014-10-08\"]]"
 msgstr ""
+"Ingrese un par de fechas en las que los estudiantes no podrán publicar "
+"comentarios en los foros de discusión con el formato  [\"AAAA-MM-DD\", "
+"\"AAAA-MM-DD\"]. Para especificar fecha y hora, use el formato[\"AAAA-MM-"
+"DDTHH:MM\", \"AAAA-MM-DDTHH:MM\"]  (Asegúrese de incluir la \"T\" entre la "
+"fecha y la hora). Si requiere mas de un periodo de exclusión, puede "
+"ingresarlo por ejemplo así: [[\"2014-09-15\", \"2014-09-21\"], "
+"[\"2014-10-01\", \"2014-10-08\"]]"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Discussion Topic Mapping"
@@ -1973,6 +1977,10 @@ msgid ""
 "student assignment to groups, or identify any course-wide discussion topics "
 "as private to cohort members."
 msgstr ""
+"Ingrese los las variables y valores de configuración para habilitar la "
+"funcionalidad de cohortes, definir la asignación automática de estudiantes a"
+" grupos, o identificar cualquier tema de discusión del curso como privado "
+"para los miembros de la cohorte."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Is New"
@@ -2542,6 +2550,51 @@ msgstr ""
 msgid "Invitation Only"
 msgstr "Sólo por invitación"
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr "Nombre de la encuesta previa al curso"
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+"Nombre para mostrar en el formulario de encuesta para aplicar al usuario "
+"previo al curso."
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr "Se requiere encuesta previa al curso"
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+"Especificar si los estudiantes deben completar una encuesta antes de poder "
+"ver los contenidos del curso. Si configura este valor en true, debe añadir "
+"un nombre para la encuesta."
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "Acerca de"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "General"
@@ -2838,27 +2891,33 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "Request user's username"
-msgstr ""
+msgstr "Solicite el nombre del usuario"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
 "Select True to request the user's username. You must also set Open in New "
 "Page to True to get the user's information."
 msgstr ""
+"Seleccione True para solicitar el nombre de usuario al usuario. También "
+"puede configurar La apertura en una nueva página en True para obtener la "
+"información del usuario."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "Request user's email"
-msgstr ""
+msgstr "Solicite la dirección de correo del usuario"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
 "Select True to request the user's email address. You must also set Open in "
 "New Page to True to get the user's information."
 msgstr ""
+"Seleccione True para solicitar el correo electrónico del usuario. También "
+"puede configurar la apertura en una nueva página en True para obtener la "
+"información del usuario."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "LTI Application Information"
-msgstr ""
+msgstr "Información sobre la aplicación LTI"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
@@ -2866,15 +2925,21 @@ msgid ""
 "and/or email, use this text box to inform users why their username and/or "
 "email will be forwarded to a third party application."
 msgstr ""
+"Provea una descripción de la aplicación de un tercero. Si se solicita el "
+"nombre del usuario o su correo, use este cuadro de texto para informar al "
+"usuario que su nombre de usuario y su correo serán redireccionados a una "
+"aplicación de un tercero."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "Button Text"
-msgstr ""
+msgstr "Texto para el botón"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
 "Enter the text on the button used to launch the third party application."
 msgstr ""
+"Ingrese el texto para el botón que se usará para lanzar la aplicación de "
+"terceros."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
@@ -2955,23 +3020,6 @@ msgstr "Ingrese la fecha límite para entrega de los problemas"
 msgid "Group ID {group_id}"
 msgstr "ID de Grupo {group_id}"
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr "Atención:"
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "Error"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr "No seleccionado"
@@ -3342,6 +3390,11 @@ msgid ""
 "specific number, you cannot set the Maximum Attempts for individual problems"
 " to unlimited."
 msgstr ""
+"Ingrese el número máximo de veces que un estudiante puede intentar responder"
+" los problemas. Por defecto, máximo de respuestas es nulo, significa que los"
+" estudiantes tienen un número ilimitado de intentos. Puedes definir si la "
+"configuración es global o para un problema. Si la configuración es un número"
+" globla de intentos, no se podrá ser específico en los problemas."
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid "Matlab API key"
@@ -3389,14 +3442,19 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid "Show Reset Button for Problems"
-msgstr ""
+msgstr "Mostrar botón de reset para problemas"
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
+"Ingrese true o false. Si se configura en true, todos los problemas del curso"
+" mostrarán por defecto y botón de 'Reiniciar'. Puede sobreescribir esta "
+"configuración en cada problema. Todos los problemas existentes son afectados"
+" cuando se cambia esta configuración."
 
 #. Translators: "Self" is used to denote an openended response that is self-
 #. graded
@@ -4087,6 +4145,8 @@ msgstr ""
 "nombre de la misma."
 
 #: lms/djangoapps/dashboard/support.py
+#: lms/templates/shoppingcart/billing_details.html
+#: lms/templates/shoppingcart/billing_details.html
 msgid "Email Address"
 msgstr "Dirección de correo electrónico"
 
@@ -4296,6 +4356,8 @@ msgid "Loaded course {course_name}<br/>Errors:"
 msgstr "Curso cargado {course_name}<br/>Errores:"
 
 #: lms/djangoapps/dashboard/sysadmin.py lms/djangoapps/dashboard/sysadmin.py
+#: cms/templates/course-create-rerun.html cms/templates/index.html
+#: lms/templates/shoppingcart/receipt.html
 msgid "Course Name"
 msgstr "Nombre del curso"
 
@@ -4387,7 +4449,7 @@ msgstr "El cuerpo no puede estar vacío"
 
 #: lms/djangoapps/django_comment_client/base/views.py
 msgid "Topic doesn't exist"
-msgstr ""
+msgstr "El tema no existe"
 
 #: lms/djangoapps/django_comment_client/base/views.py
 #: lms/djangoapps/django_comment_client/base/views.py
@@ -4423,31 +4485,35 @@ msgstr "La tarea ya se está ejecutando."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Could not read uploaded file."
-msgstr ""
+msgstr "No podemos leer el archivo subido"
 
 #: lms/djangoapps/instructor/views/api.py
 msgid ""
 "Data in row #{row_num} must have exactly four columns: email, username, full"
 " name, and country"
 msgstr ""
+"Datos en fila #{row_num} debe tener cuatro columnas: email, nombre de "
+"usuario, nombre completo y país"
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Invalid email {email_address}."
-msgstr ""
+msgstr "Mail inválido {email_address}"
 
 #: lms/djangoapps/instructor/views/api.py
 msgid ""
 "An account with email {email} exists but the provided username {username} is"
 " different. Enrolling anyway with {email}."
 msgstr ""
+"Una cuenta con email {email} existe pero el nombre de usuario {username} es "
+"diferente. Inscribir de todas formas con {email}"
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Username {user} already exists."
-msgstr ""
+msgstr "Nombre de usuario {user} ya existe."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "File is not attached."
-msgstr ""
+msgstr "Archivo no adjuntado."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Invoice number '{0}' does not exist."
@@ -4514,13 +4580,16 @@ msgstr "Objetivos"
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Cohort"
-msgstr ""
+msgstr "Cohorte"
 
 #: lms/djangoapps/instructor/views/api.py
 msgid ""
 "Your enrolled student profile report is being generated! You can view the "
 "status of the generation task in the 'Pending Instructor Tasks' section."
 msgstr ""
+"Su reporte de perfiles de inscritos está siendo generado! Puede ver el "
+"estado de la tarea de generación en la sección de 'Tareas Pendientes de "
+"Instructor'"
 
 #: lms/djangoapps/instructor/views/api.py
 msgid ""
@@ -4528,6 +4597,10 @@ msgid ""
 "Check the 'Pending Instructor Tasks' table for the status of the task. When "
 "completed, the report will be available for download in the table below."
 msgstr ""
+"Una tarea de reporte de perfiles de inscritos ya está en progreso. Verifique"
+" la tabla de 'Tareas pendientes de instructor' para ver el estado de esta "
+"tarea. Cuando se haya completado, el reporte estará disponible para ser "
+"descargado en la tabla a continuación."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Module does not exist."
@@ -4632,6 +4705,9 @@ msgid ""
 "To gain insights into student enrollment and participation {link_start}visit"
 " {analytics_dashboard_name}, our new course analytics product{link_end}."
 msgstr ""
+"Para comprender mas sobre las inscripciones y participación de los "
+"estudiantes {link_start}visite el {analytics_dashboard_name}, nuestro nuevo "
+"producto para las analíticas del curso{link_end}."
 
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 msgid "E-Commerce"
@@ -4671,6 +4747,10 @@ msgstr "Descarga de Datos"
 msgid "Analytics"
 msgstr "Analíticas"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr "Los datos demográficos están disponibles en {dashboard_link}."
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5079,7 +5159,7 @@ msgstr "calificado"
 #. messages as {action}.
 #: lms/djangoapps/instructor_task/tasks.py
 msgid "generated"
-msgstr ""
+msgstr "generado"
 
 #: lms/djangoapps/instructor_task/views.py
 #: lms/djangoapps/instructor_task/views.py
@@ -5360,6 +5440,8 @@ msgid ""
 "Confirmation and Registration Codes for the following courses: "
 "{course_name_list}"
 msgstr ""
+"Códigos de confirmación e inscripción para los siguientes cursos: "
+"{course_name_list}"
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Trying to add a different currency into the cart"
@@ -5379,7 +5461,7 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Enrollment codes for Course: {course_name}"
-msgstr ""
+msgstr "Códigos de Registro para el Curso: {course_name}"
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "[Refund] User-Requested Refund"
@@ -5416,18 +5498,22 @@ msgid ""
 "contributions for tax purposes.  We confirm that neither goods nor services "
 "were provided in exchange for this gift."
 msgstr ""
+"Apreciamos esta generosa contribución y su aporte para la misión de "
+"{platform_name}. Este recibo es elaborado para brindar soporte a las "
+"contribuciones para propósitos de impuestos. Confirmamos que ninguna "
+"mercancía o servicio fue suministrada a cambio de este regalo."
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Could not find a course with the ID '{course_id}'"
-msgstr ""
+msgstr "No se encontró ningún curso con el ID '{course_id}'"
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Donation for {course}"
-msgstr ""
+msgstr "Donación para el curso {course}"
 
 #: lms/djangoapps/shoppingcart/models.py
 msgid "Donation for {platform_name}"
-msgstr ""
+msgstr "Donación para {platform_name}"
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Order Number"
@@ -5627,7 +5713,7 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/views.py
 msgid "success"
-msgstr ""
+msgstr "Exito"
 
 #: lms/djangoapps/shoppingcart/views.py
 msgid "You do not have permission to view this page."
@@ -5662,86 +5748,54 @@ msgstr ""
 "La cantidad cargada por el encargado de procesar el pago {0} {1} es "
 "diferente del costo total de la orden {2} {3}."
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
+
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"           ¡Lo sentimos! Nuestro sistema de procesamiento de pagos no ha aceptado su pago.\n"
-"            El mensaje retornado ha sido: <span class=\"decision\">{decision}</span>,\n"
-"            y la razón fue: <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            No se le ha realizado ningún cargo. Por favor intente con otro medio de pago.\n"
-"            Contáctenos por sus inquietudes en relación a los pagos al correo {email}.\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
+msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Lo sentimos! Nuestro sistema de procesamiento de pagos ha enviado un mensaje de confirmación con información inconsistente!\n"
-"                Pedimos disculpas porque no podemos verificar si el pago fue procesado para avanzar con su orden.\n"
-"                El mensaje de error específico es: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Su tarjeta de crédito puede haber sido cargada. Contáctenos por sus inquietudes en relación con los pagos al correo electrónico {email}.\n"
-"                </p>\n"
-"                "
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Lo sentimos! Debido a un error su compra ha sido cargada por un valor diferente al valor total de la orden!\n"
-"                El mensaje de error específico es: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Su tarjeta de crédito puede haber sido cargada. Contáctenos con sus inquietudes en relación con los pagos al correo electrónico {email}.\n"
-"                </p>\n"
-"                "
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                ¡Lo sentimos! ¡Nuestro sistema de procesamiento de pagos ha enviado un mensaje con datos corruptos que no nos permite validar el pago!.\n"
-"               El error específico es: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Pedimos disculpas porque no podemos verificar si el pago fue procesado para avanzar con su orden.\n"
-"                Su tarjeta de crédito puede haber sido cargada.  Contáctenos con sus inquietudes en relación con los pagos al correo electrónico {email}.\n"
-"                </p>\n"
-"                "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6059,29 +6113,19 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
-"Lo sentimos! Nuestro sistema de procesamiento de pagos ha enviado un mensaje"
-" de confirmación con información inconsistente!  Pedimos disculpas porque no"
-" podemos verificar si el pagó fue procesado para avanzar con su orden.  El "
-"mensaje de error específico es:  {msg}. Su tarjeta de crédito puede haber "
-"sido cargada. Contáctenos con sus inquietudes en relación con los pagos al "
-"correo electrónico {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
-"Lo sentimos! Debido a un error su compra ha sido cargada por un valor "
-"diferente al valor total de la orden! El mensaje de error específico es: "
-"{msg}. Su tarjeta de crédito puede haber sido cargada. Contáctenos con sus "
-"inquietudes en relación con los pagos al correo electrónico {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -6089,15 +6133,9 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
-"Lo sentimos! Nuestro sistema de procesamiento de pagos ha enviado un mensaje"
-" con datos corruptos que no nos permite validar el pago!. El mensajes de "
-"error específico es: {msg}.  Pedimos disculpas porque no podemos verificar "
-"si el pagó fue procesado para avanzar con su orden.  Su tarjeta de crédito "
-"puede haber sido cargada.  Contáctenos con sus inquietudes en relación con "
-"los pagos al correo electrónico {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -6114,12 +6152,9 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
-"Lo sentimos! Su pago no ha podido ser procesado debido a un error "
-"inesperado. Por favor contáctenos al correo {email} para solicitar "
-"asistencia."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -6288,7 +6323,7 @@ msgstr ""
 
 #: lms/envs/common.py
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
 
 #: lms/lib/xblock/mixin.py
 msgid "Courseware Chrome"
@@ -7434,16 +7469,16 @@ msgid "Help"
 msgstr "Ayuda"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
-msgstr "Actualice su registro para {} | Elija su ruta"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
+msgstr "Actualice su incripción para  {} | Elegir su camino"
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "Registrado para {} | Elija su ruta"
+msgid "Enroll In {} | Choose Your Track"
+msgstr "Inscribirse en  {} | Elegir su camino"
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr "Lo sentimos, ocurrió un error en su proceso de registro"
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr "Lo sentimos, hubo un error al intentar inscribirlo"
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -7487,8 +7522,8 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
-msgstr "Actualice su Inscripción"
+msgid "Upgrade Your Enrollment"
+msgstr "Actualizar su inscripción"
 
 #: common/templates/course_modes/choose.html
 msgid "Audit This Course"
@@ -7700,7 +7735,7 @@ msgstr "Cursos activos"
 
 #: lms/templates/dashboard.html lms/templates/dashboard.html
 msgid "Looks like you haven't enrolled in any courses yet."
-msgstr ""
+msgstr "Parece que no se ha registrado aún a ningún curso."
 
 #: lms/templates/dashboard.html
 msgid "Find courses now!"
@@ -7955,11 +7990,6 @@ msgstr "(Revisado 16/04/2014)"
 msgid "About & Company Info"
 msgstr "Acerca de & Info de Compañía"
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "Acerca de"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr "Noticias"
@@ -8142,6 +8172,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "Enviar"
 
@@ -8475,6 +8506,11 @@ msgstr "Datos planos:"
 msgid "Accepted"
 msgstr "Aceptado"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "Error"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "Rechazado"
@@ -9150,7 +9186,7 @@ msgstr "Acción de Git"
 #. Translators: git is a version-control system; see http://git-scm.com/about
 #: lms/templates/sysadmin_dashboard_gitlogs.html
 msgid "No git import logs have been recorded for this course."
-msgstr ""
+msgstr "No se han registrado logs de importación de GIT para este curso."
 
 #: lms/templates/textannotation.html
 msgid "Source:"
@@ -9555,13 +9591,6 @@ msgstr "Ver contenido del curso"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "Este curso ya está en su <a href=\"{cart_link}\">carrito</a>."
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"Añadir {course.display_number_with_default} al carrito "
-"({currency_symbol}{cost})"
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "El curso está lleno"
@@ -9574,6 +9603,13 @@ msgstr "La inscripción en este curso es sólo por invitación"
 msgid "Enrollment is Closed"
 msgstr "Inscripción cerrada"
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"Añadir {course.display_number_with_default} al carrito "
+"({currency_symbol}{cost})"
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "Registrarse en {course.display_number_with_default}"
@@ -10330,11 +10366,11 @@ msgstr "Acceder al Contenido del Curso"
 
 #: lms/templates/courseware/mktg_course_about.html
 msgid "You Are Enrolled"
-msgstr ""
+msgstr "Usted está inscrito"
 
 #: lms/templates/courseware/mktg_course_about.html
 msgid "Enroll in"
-msgstr ""
+msgstr "Inscribirse a"
 
 #. Translators: This is the second line on a button users can click.  The
 #. first
@@ -10357,7 +10393,7 @@ msgstr "y proceda a la verificación"
 
 #: lms/templates/courseware/mktg_course_about.html
 msgid "Enrollment Is Closed"
-msgstr ""
+msgstr "Las inscripciones están cerradas"
 
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
@@ -10482,10 +10518,10 @@ msgid ""
 "{cert_name_long} was generated, we could not grant you a verified "
 "{cert_name_short}. An honor code {cert_name_short} has been granted instead."
 msgstr ""
-"Dado que no contamos con un conjunto válido de fotos de verificación suyan "
-"en el momento de generación de su {cert_name_long}, no hemos podido "
-"otorgarle un {cert_name_short} verificado. En su lugar, se le ha generado un"
-" {cert_name_short} de código de honor."
+"Dado que no contamos con un conjunto válido de fotos de verificación suya en"
+" el momento de generación de su {cert_name_long}, no hemos podido otorgarle "
+"un {cert_name_short} verificado. En su lugar, se le ha generado un "
+"{cert_name_short} de código de honor."
 
 #: lms/templates/dashboard/_dashboard_certificate_information.html
 msgid ""
@@ -10522,9 +10558,6 @@ msgstr "Inscrito como;"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr "Verificado"
 
@@ -10606,7 +10639,7 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "unenroll"
-msgstr ""
+msgstr "Cancelar su inscripción"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "for this course."
@@ -10619,7 +10652,6 @@ msgstr "Ver Curso Archivado"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "Ver curso"
 
@@ -10629,11 +10661,12 @@ msgstr "Ver curso"
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "Are you sure you want to unenroll from the purchased course"
 msgstr ""
+"¿Está seguro de que desea cancelar su inscripción del curso adquirido?"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
 msgid "Are you sure you want to unenroll from"
-msgstr ""
+msgstr "¿Está seguro de que desea cancelar su inscripción de "
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
@@ -10643,6 +10676,8 @@ msgid ""
 "Are you sure you want to unenroll from the verified {cert_name_long} track "
 "of"
 msgstr ""
+"¿Está seguro de que desea eliminarse de la modalidad verificada de "
+"{cert_name_long}"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
@@ -10660,6 +10695,9 @@ msgid ""
 "People change, and each year we ask you to re-verify your identity for our "
 "verified certificates. Take a minute now to help us renew your identity."
 msgstr ""
+"La gente cambia, por lo que cada año se requiere verificar nuevamente su "
+"identidad para nuestros certificados verificados. Tome un minuto ahora para "
+"ayudarnos a renovar su identificación."
 
 #: lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html
 msgid "{course_name}: Re-verify by {date}"
@@ -10745,7 +10783,7 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_third_party_error.html
 msgid "Could Not Link Accounts"
-msgstr ""
+msgstr "No se puede conectar las cuentas"
 
 #. Translators: this message is displayed when a user tries to link their
 #. account with a third-party authentication provider (for example, Google or
@@ -11087,6 +11125,9 @@ msgid ""
 "Discussion admins, moderators, and TAs can make their posts visible to all "
 "students or specify a single cohort group."
 msgstr ""
+"Los administradores de foros de discusión y los profesores asistentes pueden"
+" hacer sus publicaciones visibles a todos los estudiantes o especificar un "
+"grupo de cohorte en particular."
 
 #: lms/templates/discussion/_underscore_templates.html
 msgid "Title:"
@@ -11262,33 +11303,35 @@ msgstr "Hilos Activos"
 
 #: lms/templates/emails/account_creation_and_enroll_emailMessage.txt
 msgid "Welcome to {course_name}"
-msgstr ""
+msgstr "Bienvenido a {course_name}"
 
 #: lms/templates/emails/account_creation_and_enroll_emailMessage.txt
 msgid ""
 "To get started, please visit https://{site_name}. The login information for "
 "your account follows."
 msgstr ""
+"Para iniciar, por favor visite https://{site_name}. La siguiente es la "
+"información de acceso a su cuenta."
 
 #: lms/templates/emails/account_creation_and_enroll_emailMessage.txt
 msgid "email: {email}"
-msgstr ""
+msgstr "Correo electrónico: {email}"
 
 #: lms/templates/emails/account_creation_and_enroll_emailMessage.txt
 msgid "password: {password}"
-msgstr ""
+msgstr "Contraseña: {password}"
 
 #: lms/templates/emails/account_creation_and_enroll_emailMessage.txt
 msgid "It is recommended that you change your password."
-msgstr ""
+msgstr "Se recomienda que cambie su contraseña."
 
 #: lms/templates/emails/account_creation_and_enroll_emailMessage.txt
 msgid "Sincerely yours,"
-msgstr ""
+msgstr "Cordialmente, "
 
 #: lms/templates/emails/account_creation_and_enroll_emailMessage.txt
 msgid "The {course_name} Team"
-msgstr ""
+msgstr "El equipo de {course_name}"
 
 #: lms/templates/emails/activation_email.txt
 msgid "Thank you for signing up for {platform_name}."
@@ -11409,15 +11452,15 @@ msgstr "Usted ha sido invitado una prueba beta para el curso {course_name}"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid "Hi {name},"
-msgstr ""
+msgstr "Hola {name},"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid "Thank you for your purchase of "
-msgstr ""
+msgstr "Gracias por su compra de"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid "Your payment was successful."
-msgstr ""
+msgstr "Su pago se completó con exito."
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 #: lms/templates/emails/order_confirmation_email.txt
@@ -11440,12 +11483,16 @@ msgid ""
 "{order_placed_by} placed an order and mentioned your name as the "
 "Organization contact."
 msgstr ""
+"{order_placed_by} colocó una orden y mencionó su nombre como el contacto "
+"organizacional."
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid ""
 "{order_placed_by} placed an order and mentioned your name as the additional "
 "receipt recipient."
 msgstr ""
+"{order_placed_by} colocó una orden y mencionó su nombre como el receptor "
+"adicional del recibo de pago."
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 #: lms/templates/emails/order_confirmation_email.txt
@@ -11465,27 +11512,27 @@ msgstr ""
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid "Company Name:"
-msgstr ""
+msgstr "Nombre de la organización:"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid "Purchase Order Number:"
-msgstr ""
+msgstr "Número de orden de compra:"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid "Company Contact Name:"
-msgstr ""
+msgstr "Nombre del contacto en la organización:"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid "Company Contact Email:"
-msgstr ""
+msgstr "Correo del contacto en la organización:"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid "Recipient Name:"
-msgstr ""
+msgstr "Nombre del destinatario:"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid "Recipient Email:"
-msgstr ""
+msgstr "Correo del destinatario:"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 #: lms/templates/emails/order_confirmation_email.txt
@@ -11494,7 +11541,7 @@ msgstr "#:"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid "Order Number: {order_number}"
-msgstr ""
+msgstr "Número de orden: {order_number}"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid ""
@@ -11502,28 +11549,38 @@ msgid ""
 "registration URLs to each student planning to enroll using the email "
 "template below."
 msgstr ""
+"Un archivo CSV de sus URL de registro ha sido añadido. Por favor distribuya "
+"las URLs de registro a cada estudiante que planeé inscribirse usando la "
+"plantilla de correo a continuación."
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 #: lms/templates/emails/order_confirmation_email.txt
 msgid "Warm regards,"
-msgstr ""
+msgstr "Cordial saludo,"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid ""
 "(1) Register for an account at <a href='https://{site_name}' "
 ">https://{site_name}</a>."
 msgstr ""
+"(1) Registrarse para una cuenta en <a href='https://{site_name}' "
+">https://{site_name}</a>."
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid ""
 "(2) Once registered, copy the redeem URL and paste it in your web browser."
 msgstr ""
+"(2) Una vez registrado, copie la URL para redimir y péguela en su navegador "
+"web."
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid ""
 "(3) On the enrollment confirmation page, Click the 'Activate Enrollment "
 "Code' button. This will show the enrollment confirmation."
 msgstr ""
+"(3) En la página de confirmación de inscripción, haga clic en el botón de "
+"'Activar el código de inscripción'. Esto le mostrará la confirmación de la "
+"inscripción."
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid ""
@@ -11531,11 +11588,16 @@ msgid ""
 "on your student dashboard at <a "
 "href='https://{dashboard_url}'>https://{dashboard_url}</a>"
 msgstr ""
+"(4) Deberá ver un botón 'Ver Curso' que le permitirá acceder al curso en su "
+"panel de control:.<a "
+"href='https://{dashboard_url}'>https://{dashboard_url}</a>"
 
 #: lms/templates/emails/business_order_confirmation_email.txt
 msgid ""
 "(5) Course materials will not be available until the course start date."
 msgstr ""
+"(5) Los materiales del curso solo estarán disponibles a partir de la fecha "
+"de inicio del curso"
 
 #: lms/templates/emails/confirm_email_change.txt
 msgid ""
@@ -11918,12 +11980,14 @@ msgstr "Usted ha sido des inscrito del curso {course_name}"
 
 #: lms/templates/enrollment/course_enrollment_message.html
 msgid "Enrollment Successful"
-msgstr ""
+msgstr "Inscripción exitosa"
 
 #: lms/templates/enrollment/course_enrollment_message.html
 msgid ""
 "Thank you for enrolling in {enrolled_course}. We hope you enjoy the course."
 msgstr ""
+"Gracias por registrarse en {enrolled_course}. Esperamos que disfrute del "
+"curso."
 
 #: lms/templates/enrollment/course_enrollment_message.html
 msgid ""
@@ -11931,10 +11995,14 @@ msgid ""
 "everywhere. Your help allows us to continuously improve the learning "
 "experience for millions and make a better future one learner at a time."
 msgstr ""
+"{platform_name} es una organización sin fines de lucro que ofrece educación "
+"de alta calidad para todos, en todas partes. Su ayuda nos ayuda a mejorar "
+"continuamente la experiencia de aprendizaje de millones y a construir un "
+"mejor futuro, un estudiante a la vez."
 
 #: lms/templates/enrollment/course_enrollment_message.html
 msgid "Donation Actions"
-msgstr ""
+msgstr "Acciones de donación"
 
 #: lms/templates/instructor/staff_grading.html
 msgid "{course_number} Staff Grading"
@@ -12143,12 +12211,20 @@ msgid ""
 "background, meaning it is OK to navigate away from this page while your "
 "report is generating."
 msgstr ""
+"Para los cursos más grandes, la generación de algunos reportes puede tomar "
+"varias horas. Cuando un reporte haya sido generado, un vínculo con la fecha "
+"y la hora de generación aparecerá en la tabla a continuación. Estos reportes"
+" se generan en segundo plano, así que puede salirse de esta página mientra "
+"el reporte es generado."
 
 #: lms/templates/instructor/instructor_dashboard_2/data_download.html
 msgid ""
 "Please be patient and do not click these buttons multiple times. Clicking "
 "these buttons multiple times will significantly slow the generation process."
 msgstr ""
+"Por favor sea paciente y no haga clic en el botón varias veces, ya que esto "
+"reducirá significativamente la velocidad del proceso de generación del "
+"reporte."
 
 #: lms/templates/instructor/instructor_dashboard_2/data_download.html
 msgid ""
@@ -12161,7 +12237,7 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/data_download.html
 msgid "Download profile information as a CSV"
-msgstr "Descargar la informaicón de perfíl como archivo CSV"
+msgstr "Descargar la información de perfíl como archivo CSV"
 
 #: lms/templates/instructor/instructor_dashboard_2/data_download.html
 msgid ""
@@ -12179,6 +12255,8 @@ msgstr "Listar la información de perfil de los estudiantes inscritos"
 msgid ""
 "Click to generate a CSV grade report for all currently enrolled students."
 msgstr ""
+"Haga clic para generar un reporte de calificaciones en un archivo CSV para "
+"todos los estudiantes actualmente inscritos."
 
 #: lms/templates/instructor/instructor_dashboard_2/data_download.html
 msgid "Generate Grade Report"
@@ -12195,6 +12273,11 @@ msgid ""
 "generation. Reports are not deleted, so you will always be able to access "
 "previously generated reports from this page."
 msgstr ""
+"Los reportes listados a continuación están disponibles para descargar. Un "
+"vínculo a cada reporte permanecerá disponible en esta página, identificado "
+"por la fecha y hora UTC de generación. Los reportes no serán borrados, así "
+"que siempre podrá acceder a los reportes generados previamente desde esta "
+"página."
 
 #: lms/templates/instructor/instructor_dashboard_2/data_download.html
 msgid ""
@@ -12309,11 +12392,11 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Download All Invoice Sales"
-msgstr ""
+msgstr "Descargar todas las facturas"
 
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Download All Order Sales"
-msgstr ""
+msgstr "Descargar todas ordenes"
 
 #: lms/templates/instructor/instructor_dashboard_2/e-commerce.html
 msgid "Enter the invoice number to invalidate or re-validate sale"
@@ -12602,23 +12685,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr "Enviarme una copia de la factura"
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr "Estudiantes activos"
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-"Cantidad de estudiantes que interactuaron al menos una vez con el curso, "
-"abriendo páginas, reproduciendo videos, publicando en discusiones, o "
-"completando otras actividades. Incluye todas las actividades ejecutadas "
-"desde la media noche de la fecha de inicio del curso (inclusive) hasta la "
-"media noche de la fecha final (exclusive)."
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr "Distribución de puntajes"
@@ -12721,7 +12787,7 @@ msgstr "Inscribirse"
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Register/Enroll Students"
-msgstr ""
+msgstr "Registrar/Inscribir estudiantes"
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
@@ -12730,10 +12796,15 @@ msgid ""
 "name, and country. Please include one student per row and do not include any"
 " headers, footers, or blank lines."
 msgstr ""
+"Para registrar e inscribir una lista de usuarios en este curso, elija un "
+"archivo CSV que contenga las siguientes columnas en este orden exacto: "
+"correo electrónico, nombre de usuario, y país. Por favor incluya un "
+"estudiante por renglón y no incluya títulos, pies de página, o lineas "
+"vacías."
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Upload CSV"
-msgstr ""
+msgstr "Subir CSV"
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Batch Beta Tester Addition"
@@ -13409,7 +13480,7 @@ msgstr "Volver Atrás"
 
 #: lms/templates/registration/activate_account_notice.html
 msgid "Thanks for Registering!"
-msgstr ""
+msgstr "Gracias por Registrarte!"
 
 #: lms/templates/registration/activate_account_notice.html
 msgid ""
@@ -13417,6 +13488,9 @@ msgid ""
 "account activation message to {email}. To activate your account and start "
 "enrolling in courses, click the link in the message."
 msgstr ""
+"Ha creado con exito una cuenta en {platform_name}. Hemos enviado un correo "
+"de activación a {email}. Para activar su cuenta y comenzar a inscribirse en "
+"los cursos, haga clic en el vínculo en el mensaje."
 
 #: lms/templates/registration/activation_complete.html
 msgid "Activation Complete!"
@@ -13466,54 +13540,58 @@ msgstr ""
 #: lms/templates/shoppingcart/receipt.html
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid "Billing Details"
-msgstr ""
+msgstr "Detalles de facturación"
 
 #: lms/templates/shoppingcart/billing_details.html
 msgid ""
 "You can proceed to payment at any point in time. Any additional information "
 "you provide will be included in your receipt."
 msgstr ""
+"Puede proceder con el pago en cualquier momento. Cualquier información "
+"adicional que suministre será incluida en su recibo."
 
 #: lms/templates/shoppingcart/billing_details.html
 msgid "Purchasing Organizational Details"
-msgstr ""
+msgstr "Detalles de compra de la organización"
 
 #: lms/templates/shoppingcart/billing_details.html
 msgid "Purchasing organization"
-msgstr ""
+msgstr "Organización que efectúa la compra"
 
 #: lms/templates/shoppingcart/billing_details.html
 msgid "Purchase order number (if any)"
-msgstr ""
+msgstr "Número de orden de compra (si aplica)"
 
 #: lms/templates/shoppingcart/billing_details.html
 #: lms/templates/shoppingcart/billing_details.html
 msgid "email@example.com"
-msgstr ""
+msgstr "email@example.com"
 
 #: lms/templates/shoppingcart/billing_details.html
 msgid "Additional Receipt Recipient"
-msgstr ""
+msgstr "Receptor adicional del recibo"
 
 #: lms/templates/shoppingcart/billing_details.html
 msgid ""
 "If no additional billing details are populated the payment confirmation will"
 " be sent to the user making the purchase"
 msgstr ""
+"Si no se diligencia información adicional para la factura, la confirmación "
+"del pago le será enviada al usuario que realiza la compra."
 
 #: lms/templates/shoppingcart/billing_details.html
 msgid "Payment processing occurs on a separate secure site."
-msgstr ""
+msgstr "El procesamiento del pago ocurre en un sitio seguro separado."
 
 #: lms/templates/shoppingcart/billing_details.html
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid "Your Shopping cart is currently empty."
-msgstr ""
+msgstr "Su carrito de compras está vacío."
 
 #: lms/templates/shoppingcart/billing_details.html
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid "View Courses"
-msgstr ""
+msgstr "Ver los cursos"
 
 #: lms/templates/shoppingcart/download_report.html
 msgid "Download CSV Data"
@@ -13563,7 +13641,7 @@ msgstr "¡Gracias por su compra!"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "View Dashboard"
-msgstr ""
+msgstr "Ver el panel de contro"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid ""
@@ -13571,6 +13649,8 @@ msgid ""
 "following receipt has been emailed to "
 "<strong>{appended_recipient_emails}</strong>"
 msgstr ""
+"Se ha inscrito con exito en <b>{appended_course_names}</b>. El siguiente "
+"recibo ha sido enviado a <strong>{appended_recipient_emails}</strong>"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid ""
@@ -13578,6 +13658,9 @@ msgid ""
 "registration codes</b> for <b>{appended_course_names}. </b>The following "
 "receipt has been emailed to <strong>{appended_recipient_emails}</strong>"
 msgstr ""
+"Ha comprado <b>{total_registration_codes} códigos de inscripción a "
+"cursos</b> para <b>{appended_course_names}. </b>El siguiente recibo  ha sido"
+" enviado a <strong>{appended_recipient_emails}</strong>"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid ""
@@ -13585,14 +13668,18 @@ msgid ""
 "enroll into the course. The confirmation/receipt email you will receive has "
 "an example email template with directions for the individuals enrolling."
 msgstr ""
+"Por favor envíe a cada profesional uno de estos códigos únicos de "
+"inscripción al curso. El recibo/correo de confirmación que usted recibirá "
+"tiene una plantilla de correo de ejemplo con las instrucciones para las "
+"inscripciones individuales."
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Enrollment Code"
-msgstr ""
+msgstr "Código de inscripción"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Enrollment Link"
-msgstr ""
+msgstr "Vínculo de inscripción"
 
 #: lms/templates/shoppingcart/receipt.html
 #: lms/templates/shoppingcart/registration_code_receipt.html
@@ -13601,91 +13688,91 @@ msgstr "{course_name}"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Date of purchase"
-msgstr ""
+msgstr "Fecha de compra"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Print Receipt"
-msgstr ""
+msgstr "Imprimir recibo"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Billed To Details"
-msgstr ""
+msgstr "Detalles de facturación"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Company Name"
-msgstr ""
+msgstr "Nombre de la organización"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "{company_name}"
-msgstr ""
+msgstr "{company_name}"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Purchase Order Number"
-msgstr ""
+msgstr "Número de orden de compra"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "{customer_reference_number}"
-msgstr ""
+msgstr "{customer_reference_number}"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Company Contact Name"
-msgstr ""
+msgstr "Nombre del contacto en la organización"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "{company_contact_name}"
-msgstr ""
+msgstr "{company_contact_name}"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Company Contact Email"
-msgstr ""
+msgstr "Correo del contacto en la organización"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Recipient Name"
-msgstr ""
+msgstr "Nombre del destinatario"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "{recipient_name}"
-msgstr ""
+msgstr "{recipient_name}"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Recipient Email"
-msgstr ""
+msgstr "Correo del destinatario"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Card Type"
-msgstr ""
+msgstr "Tipo de tarjeta"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Credit Card Number"
-msgstr ""
+msgstr "Número de tarjeta de crédito"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Address 1"
-msgstr ""
+msgstr "Dirección línea 1"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Address 2"
-msgstr ""
+msgstr "Dirección línea 2"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Registration for"
-msgstr ""
+msgstr "Inscripción para"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid "Course Dates"
-msgstr ""
+msgstr "Fechas del curso"
 
 #: lms/templates/shoppingcart/receipt.html
 msgid " {course_name} "
-msgstr ""
+msgstr " {course_name} "
 
 #: lms/templates/shoppingcart/receipt.html
 #: lms/templates/shoppingcart/receipt.html
@@ -13694,13 +13781,13 @@ msgstr ""
 #: lms/templates/shoppingcart/shopping_cart.html
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid "Price per student:"
-msgstr ""
+msgstr "Precio por estudiante:"
 
 #: lms/templates/shoppingcart/receipt.html
 #: lms/templates/shoppingcart/receipt.html
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid "Discount Applied:"
-msgstr ""
+msgstr "Descuento aplicado:"
 
 #. Translators: Please keep the "<del>" and "</del>" tags around your
 #. translation of the word "this" in your translation.
@@ -13776,45 +13863,47 @@ msgstr "Ver Curso &nbsp; &nbsp; &#x25b8;"
 
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid "Registration for:"
-msgstr ""
+msgstr "Inscripción para:"
 
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid "Course Dates:"
-msgstr ""
+msgstr "Fechas del curso:"
 
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid "Students:"
-msgstr ""
+msgstr "Estudiantes:"
 
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid "code has been applied"
-msgstr ""
+msgstr "el código ha sido aplicado"
 
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid ""
 "After this purchase is complete, a receipt is generated with relative "
 "billing details and registration codes for students."
 msgstr ""
+"Después de que la compra esté completada, se genera un recibo con la "
+"información de facturación y los códigos de registro para los estudiantes."
 
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid "After this purchase is complete,"
-msgstr ""
+msgstr "Después de completada la compra,"
 
 #: lms/templates/shoppingcart/shopping_cart.html
 msgid "will be enrolled in this course."
-msgstr ""
+msgstr "estará inscrito en este curso."
 
 #: lms/templates/shoppingcart/shopping_cart_flow.html
 msgid "Shopping cart"
-msgstr ""
+msgstr "Carrito de compras"
 
 #: lms/templates/shoppingcart/shopping_cart_flow.html
 msgid "{platform_name} -  Shopping Cart"
-msgstr ""
+msgstr "{platform_name} - Carrito de compras"
 
 #: lms/templates/shoppingcart/shopping_cart_flow.html
 #: lms/templates/shoppingcart/verified_cert_receipt.html
@@ -13828,7 +13917,7 @@ msgstr "Revisión"
 
 #: lms/templates/shoppingcart/shopping_cart_flow.html
 msgid "Payment"
-msgstr ""
+msgstr "Pago"
 
 #: lms/templates/shoppingcart/shopping_cart_flow.html
 #: lms/templates/shoppingcart/verified_cert_receipt.html
@@ -14088,40 +14177,96 @@ msgstr "Actualmente los servidores  de {platform_name} están sobrecargados"
 
 #: lms/templates/student_account/email_change_failed.html
 msgid "Email change failed."
-msgstr ""
+msgstr "Cambio de Email fallido"
 
 #: lms/templates/student_account/email_change_failed.html
 msgid "Something went wrong. Please contact {support} for help."
-msgstr ""
+msgstr "Algo falló, Por favor contacta {support} para ayuda."
 
 #: lms/templates/student_account/email_change_failed.html
 msgid ""
 "The email address you wanted to use is already used by another "
 "{platform_name} account."
 msgstr ""
+"La dirección de correo que ingresó ya está siendo utilizada por otra cuenta "
+"de usuario en {platform_name}."
 
 #: lms/templates/student_account/email_change_failed.html
 msgid ""
 "You can try again from the {link_start}account settings{link_end} page."
 msgstr ""
+"Puedes intentar de nuevo desde la pagina  {link_start}configurar "
+"cuenta{link_end}."
 
 #: lms/templates/student_account/email_change_successful.html
 msgid "Email change successful!"
-msgstr ""
+msgstr "Email cambiado correctamente"
 
 #: lms/templates/student_account/email_change_successful.html
 msgid ""
 "You should see your new email address listed on the {link_start}account "
 "settings{link_end} page."
 msgstr ""
+"Debería ver su nuevo correo en su {link_start}página de configuración de "
+"cuenta{link_end}."
 
 #: lms/templates/student_account/index.html
 msgid "Student Account"
-msgstr ""
+msgstr "Cuenta de Estudiante"
 
 #: lms/templates/student_profile/index.html
 msgid "Student Profile"
+msgstr "Perfil de Estudiante"
+
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr "Encuesta de usuario"
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr "Encuesta previa al curso"
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
 msgstr ""
+"Puede comenzar su curso tan pronto como diligencie el siguiente formulario. "
+"Los campos obligatorios están marcados con un asterisco (*)."
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr "Hace falta diligenciar los siguientes campos obligatorios:"
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr "Cancelar o volver al panel de control"
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr "¿Por qué debo completar esta información?"
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+"La información que usted suministra nos ayuda a mejorar el curso para los "
+"estudiantes actuales y futuros. Entre más podamos conocer sobre sus "
+"necesidades específicas, podremos hacer mejor su experiencia con el curso."
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr "¿A quién puedo contactar si tengo más preguntas?"
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+"Si tiene preguntas sobre este curso o formulario, puede contactar a <a "
+"href=\"{mail_to_link}\"\">{mail_to_link}</a>."
 
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
@@ -14191,36 +14336,36 @@ msgstr ""
 "dudas sobre nuestros certificados{a_end}."
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
-msgstr "Está elevando su afiliación para"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
-msgstr "Usted está re verificando para"
+msgid "You are re-verifying for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
-msgstr "Usted está registrandose para"
+msgid "You are enrolling in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
-msgstr "Felicitaciones! Ya está registrado para ver el curso:"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
 msgid "Professional Education"
 msgstr "Educación profesional"
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
-msgstr "Elevando su afiliación a:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
-msgstr "Re verificando para:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
-msgstr "Registrandose como:"
+msgid "{span_start}Enrolling as:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
 msgid "Technical Requirements"
@@ -15307,13 +15452,16 @@ msgstr "Cargando&hellip;"
 
 #: cms/templates/asset_index.html
 msgid "Adding Files for Your Course"
-msgstr ""
+msgstr "Añadiendo Archivos a su Curso"
 
 #: cms/templates/asset_index.html
 msgid ""
 "To add files to use in your course, click {em_start}Upload New File{em_end}."
 " Then follow the prompts to upload a file from your computer."
 msgstr ""
+"Para añadir archivos para ser utilizados en el curso, haga clic en "
+"{em_start}Subir nuevo archivo{em_end}. Luego siga las instrucciones para "
+"cargar un archivo desde su computador."
 
 #: cms/templates/asset_index.html
 msgid ""
@@ -15321,38 +15469,50 @@ msgid ""
 "{em_start}10 MB{em_end}. In addition, do not upload video or audio files. "
 "You should use a third party service to host multimedia files."
 msgstr ""
+"{em_start}Cuidado{em_end}: edX recomienda que limite el tamaño de sus "
+"archivos a {em_start}10 MB{em_end}. Adicionalmente, no se recomienda subir "
+"archivos de audio o de videdo. Los archivos multimedia se deben publicar "
+"utilizando servicios de terceros."
 
 #: cms/templates/asset_index.html
 msgid ""
 "The course image, textbook chapters, and files that appear on your Course "
 "Handouts sidebar also appear in this list."
 msgstr ""
+"La imagen del curso, los capítulos de libros de texto y otros archivos que  "
+"aparezcan en los link del curso también aparecerán en esta lista."
 
 #: cms/templates/asset_index.html
 msgid "Using File URLs"
-msgstr ""
+msgstr "Usando URLs de archivo"
 
 #: cms/templates/asset_index.html
 msgid ""
 "Use the {em_start}Embed URL{em_end} value to link to the file or image from "
 "a component, a course update, or a course handout."
 msgstr ""
+"Utilice el valor de {em_start}URL interna{em_end} para vincular el archivo o"
+" la imagen de un componente, una actualización de curso o un vínculo útil."
 
 #: cms/templates/asset_index.html
 msgid ""
 "Use the {em_start}External URL{em_end} value to reference the file or image "
 "only from outside of your course."
 msgstr ""
+"Utilice el valor de {em_start}URL externa{em_end} para hacer referencia a un"
+" archivo o imagen desde fuera de su curso únicamente."
 
 #: cms/templates/asset_index.html
 msgid ""
 "Click in the Embed URL or External URL column to select the value, then copy"
 " it."
 msgstr ""
+"Haga clic en la columna URL Interna o URL externa para seleccionar un valor "
+"y luego copiarlo."
 
 #: cms/templates/asset_index.html
 msgid "Learn more about managing files"
-msgstr ""
+msgstr "Aprenda más sobre el manejo de archivos"
 
 #: cms/templates/asset_index.html
 msgid "Choose File"
@@ -15433,54 +15593,63 @@ msgstr "Previsualizar los cambios"
 
 #: cms/templates/container.html
 msgid "Adding components"
-msgstr ""
+msgstr "Agregando componentes"
 
 #: cms/templates/container.html
 msgid ""
 "Select a component type under {em_start}Add New Component{em_end}. Then "
 "select a template."
 msgstr ""
+"Seleccione un tipo de componente en {em_start}Añadir nuevo "
+"componente{em_end}. Luego seleccione una plantilla."
 
 #: cms/templates/container.html
 msgid ""
 "The new component is added at the bottom of the page or group. You can then "
 "edit and move the component."
 msgstr ""
+"El nuevo componente se añade al final de la pagina o grupo. Entonces puedes "
+"cambiar o mover el componente."
 
 #: cms/templates/container.html
 msgid "Editing components"
-msgstr ""
+msgstr "Editando componentes"
 
 #: cms/templates/container.html
 msgid ""
 "Click the {em_start}Edit{em_end} icon in a component to edit its content."
 msgstr ""
+"Da clic el icono {em_start}Editar{em_end} en un componente para editar su "
+"contenido."
 
 #: cms/templates/container.html
 msgid "Reorganizing components"
-msgstr ""
+msgstr "Reorganizando componentes"
 
 #: cms/templates/container.html
 msgid "Drag components to new locations within this component."
-msgstr ""
+msgstr "Arrastrar componentes a nueva posición dentro de este componente."
 
 #: cms/templates/container.html
 msgid "For content experiments, you can drag components to other groups."
 msgstr ""
+"Para contenidos experimentales, puede arrastrar componentes a otros grupos."
 
 #: cms/templates/container.html
 msgid "Working with content experiments"
-msgstr ""
+msgstr "Trabajando con contenidos experimentales"
 
 #: cms/templates/container.html
 msgid ""
 "Confirm that you have properly configured content in each of your experiment"
 " groups."
 msgstr ""
+"Asegurese de que ha configurado correctamente el contenido en cada un de sus"
+" grupos de experimento."
 
 #: cms/templates/container.html
 msgid "Learn more about component containers"
-msgstr ""
+msgstr "Aprender mas sobre contenedores de componentes"
 
 #: cms/templates/container.html
 msgid "Unit Location"
@@ -15682,6 +15851,11 @@ msgid ""
 "the course team; review course updates and other assets for dated material; "
 "and seed the discussions and wiki."
 msgstr ""
+"Ningún contenido está actualmente visible para el curso y no hay estudiantes"
+" inscritos. Asegúrese de revisar y reiniciar las fechas, incluyendo la fecha"
+" de inicio, definir el equipo del curso, revisar las actualizaciones del "
+"curso y otros recursos con fecha, así como de crear y alimentar las "
+"discusiones y la wiki."
 
 #: cms/templates/course_outline.html
 msgid "Click to add a new section"
@@ -15782,7 +15956,7 @@ msgstr ""
 
 #: cms/templates/course_outline.html
 msgid "Learn more about the course outline"
-msgstr ""
+msgstr "Aprenda más sobre la estructura del curso"
 
 #. Translators: Pages refer to the tabs that appear in the top navigation of
 #. each course.
@@ -15963,6 +16137,15 @@ msgstr ""
 "GNU Zip) y contendrá la estructura del curso y su contenido. También puede "
 "re importar cursos que haya exportado previamente."
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr "Exportar el contenido de mi curso"
@@ -15975,6 +16158,11 @@ msgstr "Exportar el contenido del curso"
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr "Datos {em_start}exportados con{em_end} su curso:"
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr "Contenido del Curso (Todas las secciones, subsecciones y unidades)"
@@ -16037,15 +16225,12 @@ msgstr "¿Que tipo de contenido es exportado?"
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
-"Solo se exportan el contenido del curso y la estructura, (incluyendo la "
-"secciones, subsecciones, y unidades). Otros datos como la información de "
-"estudiantes, calificaciones, discusiones, ajustes del curso y detalles del "
-"equipo de apoyo no son exportados."
 
 #: cms/templates/export.html
 msgid "Opening the downloaded file"
@@ -16062,6 +16247,10 @@ msgstr ""
 " datos extraidos incluirán el archivo course.xml, así como las carpetas que "
 "contienen el contenido del curso."
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr "Exportar Curso a Git:"
@@ -16700,7 +16889,7 @@ msgstr "Crear"
 
 #: cms/templates/index.html
 msgid "Courses Being Processed"
-msgstr ""
+msgstr "Cursos que están siendo procesados"
 
 #: cms/templates/index.html cms/templates/index.html cms/templates/index.html
 msgid "Course Run:"
@@ -16708,7 +16897,7 @@ msgstr "Impartición del Curso:"
 
 #: cms/templates/index.html
 msgid "This course run is currently being created."
-msgstr ""
+msgstr "Esta instancia del curso está actualmente siendo creada."
 
 #. Translators: This is a status message, used to inform the user of what the
 #. system is doing. This status means that the user has requested to re-run an
@@ -16716,7 +16905,7 @@ msgstr ""
 #. and configuring the existing course so that it can be re-run.
 #: cms/templates/index.html
 msgid "Configuring as re-run"
-msgstr ""
+msgstr "Está siendo configurado para su reutilización."
 
 #: cms/templates/index.html
 msgid ""
@@ -16724,6 +16913,9 @@ msgid ""
 "this page or {link_start}refresh it{link_end} to update the course list. The"
 " new course will need some manual configuration."
 msgstr ""
+"El nuevo curso será agregado a su lista de cursos en 5-10 minutos. Regrese a"
+" esta página o {link_start}recarguela{link_end} para actualizar la lista de "
+"cursos. El nuevo curso necesitará alguna configuración manual."
 
 #: cms/templates/index.html
 msgid ""
@@ -16864,6 +17056,7 @@ msgstr "Empezando a utilizar edX Studio"
 #: cms/templates/index.html cms/templates/index.html
 msgid "Use our feedback tool, Tender, to request help"
 msgstr ""
+"Utilice nuestra herramienta de retroalimentación para solicitar ayuda."
 
 #: cms/templates/index.html cms/templates/widgets/sock.html
 msgid "Request help with edX Studio"
@@ -16878,6 +17071,8 @@ msgid ""
 "In order to create courses in Studio, you must {link_start}contact edX staff"
 " to help you create a course{link_end}."
 msgstr ""
+"Para crear cursos en Studio debe {link_start}contactar al personal de "
+"apoyo{link_end}."
 
 #: cms/templates/index.html
 msgid ""
@@ -16892,6 +17087,8 @@ msgid ""
 "Your request to author courses in Studio has been denied. Please "
 "{link_start}contact edX Staff with further questions{link_end}."
 msgstr ""
+"Su solicitud para crear cursos en Studio ha sido denegada. Por favor "
+"{link_start}contacte al personal de edX para cualquier inquietud{link_end}."
 
 #: cms/templates/index.html
 msgid "Thanks for signing up, %(name)s!"
@@ -16927,7 +17124,7 @@ msgstr ""
 
 #: cms/templates/index.html
 msgid "Request help with your Studio account"
-msgstr ""
+msgstr "Solicitar ayuda con su cuenta en Studio"
 
 #: cms/templates/login.html cms/templates/widgets/header.html
 msgid "Sign In"
@@ -17258,7 +17455,7 @@ msgstr "Hora de inicio del curso"
 #: cms/templates/settings.html cms/templates/settings.html
 #: cms/templates/settings.html cms/templates/settings.html
 msgid "(UTC)"
-msgstr ""
+msgstr "(UTC)"
 
 #: cms/templates/settings.html
 msgid "Course End Date"
@@ -17617,7 +17814,7 @@ msgstr ""
 
 #: cms/templates/textbooks.html
 msgid "Learn more about textbooks"
-msgstr ""
+msgstr "Aprenda más sobre los libros de texto"
 
 #: cms/templates/emails/activation_email.txt
 msgid ""
diff --git a/conf/locale/es_419/LC_MESSAGES/djangojs.mo b/conf/locale/es_419/LC_MESSAGES/djangojs.mo
index 47f1a46dac..01fdc00db3 100644
Binary files a/conf/locale/es_419/LC_MESSAGES/djangojs.mo and b/conf/locale/es_419/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/es_419/LC_MESSAGES/djangojs.po b/conf/locale/es_419/LC_MESSAGES/djangojs.po
index 78e2d09b2a..5d74f39a3d 100644
--- a/conf/locale/es_419/LC_MESSAGES/djangojs.po
+++ b/conf/locale/es_419/LC_MESSAGES/djangojs.po
@@ -17,6 +17,7 @@
 # Juan Camilo Montoya Franco <juan.montoya@hmltda.com>, 2013-2014
 # Juan Camilo Montoya Franco <juan.montoya@hmltda.com>, 2013
 # karlman72 <karlman72@gmail.com>, 2014
+# Lalo Cabrera <laloogcabrera@yahoo.com.mx>, 2014
 # Luis Ricardo Ruiz <luislicardo1307@gmail.com>, 2013
 # Luis Ricardo Ruiz <luislicardo1307@gmail.com>, 2013
 # Natalia, 2013
@@ -38,6 +39,7 @@
 # Natalia, 2013
 # Natalia, 2014
 # Cristian Salamea <ovnicraft@gmail.com>, 2013
+# Pedro Guimarães Martins <pedrogmartins7@gmail.com>, 2014
 # #-#-#-#-#  underscore.po (edx-platform)  #-#-#-#-#
 # edX translation file
 # Copyright (C) 2014 edX
@@ -60,7 +62,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Spanish (Latin America) (http://www.transifex.com/projects/p/edx-platform/language/es_419/)\n"
@@ -82,6 +84,7 @@ msgstr ""
 msgid "OK"
 msgstr "Aceptar"
 
+#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: cms/static/coffee/src/views/tabs.js cms/static/js/factories/export.js
@@ -92,8 +95,14 @@ msgstr "Aceptar"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
+#: cms/templates/js/add-xblock-component-menu-problem.underscore
+#: cms/templates/js/add-xblock-component-menu.underscore
+#: cms/templates/js/course_info_handouts.underscore
+#: cms/templates/js/edit-textbook.underscore
+#: cms/templates/js/group-configuration-edit.underscore
+#: cms/templates/js/section-name-edit.underscore
+#: cms/templates/js/xblock-string-field-editor.underscore
+#: lms/templates/instructor/instructor_dashboard_2/add-cohort-form.underscore
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -136,10 +145,17 @@ msgstr "Borrar"
 msgid "Name"
 msgstr "Nombre"
 
+#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: cms/static/js/views/modals/base_modal.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
+#: cms/templates/js/course_info_handouts.underscore
+#: cms/templates/js/edit-textbook.underscore
+#: cms/templates/js/group-configuration-edit.underscore
+#: cms/templates/js/section-name-edit.underscore
+#: cms/templates/js/xblock-string-field-editor.underscore
+#: lms/templates/instructor/instructor_dashboard_2/add-cohort-form.underscore
 msgid "Save"
 msgstr "Guardar"
 
@@ -1569,6 +1585,9 @@ msgid ""
 "\n"
 "Click Cancel to return to this page without sending your information."
 msgstr ""
+"Haga Clic en ACEPTAR para que su nombre de usuario y correo electrónico sean enviados a una aplicación de 3ros.\n"
+"\n"
+"Haga Clic en CANCELAR para volver a está página sin que se que envíe su información."
 
 #: common/lib/xmodule/xmodule/js/src/lti/lti.js
 msgid ""
@@ -1576,6 +1595,9 @@ msgid ""
 "\n"
 "Click Cancel to return to this page without sending your information."
 msgstr ""
+"Haga Clic en ACEPTAR para que su nombre de usuario sea enviado a una aplicación de 3ros.\n"
+"\n"
+"Haga Clic en CANCELAR para volver a está página sin que se que envíe su información."
 
 #: common/lib/xmodule/xmodule/js/src/lti/lti.js
 msgid ""
@@ -1583,6 +1605,9 @@ msgid ""
 "\n"
 "Click Cancel to return to this page without sending your information."
 msgstr ""
+"Haga Clic en ACEPTAR para que su correo electrónico sea enviado a una aplicación de 3ros.\n"
+"\n"
+"Haga Clic en CANCELAR para volver a está página sin que se que envíe su información."
 
 #: common/lib/xmodule/xmodule/js/src/sequence/display.js
 msgid ""
@@ -2222,168 +2247,6 @@ msgstr "Responder"
 msgid "Tags:"
 msgstr "Etiquetas"
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "Disponible %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Esta es la lista de %s disponibles. Puede elegir algunos seleccionándolos en"
-" el cuadro de abajo y luego haciendo clic en la flecha \"Seleccionar\" en "
-"medio de los dos cuadros."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "Escriba en este cuadro para filtrar la lista de %s disponibles."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Filtrar"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Seleccionar todo"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Haga clic para seleccionar todos los %s."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Seleccionar"
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr "Eliminar"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "%s seleccionados"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Esta es la lista de los %s seleccionados. Puede remover algunos "
-"seleccionándolos en el cuadro de abajo y luego haciendo clic en la flecha "
-"\"Eliminar\" en medio de los dos cuadros."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Eliminar todo"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Haga clic para eliminar todos los %s a la vez."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(sel)s de %(cnt)s seleccionado"
-msgstr[1] "%(sel)s de %(cnt)s seleccionados"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"Tiene cambios sin guardar en campos editables individuales. Si realiza una "
-"acción, sus cambios no guardados se perderán."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Ha seleccionado una acción, pero todavía no ha guardado sus cambios en los "
-"campos individuales. Por favor seleccione Aceptar para guardar. Deberá "
-"volver a correr la acción."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"Ha seleccionado una acción, y no ha realizado ningún cambio en los campos "
-"individuales. Probablemente está buscando el botón de Ir en lugar del botón "
-"de Guardar."
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Enero|Febrero|Marzo|Abril|Mayo|Junio|Julio|Agosto|Septiembre|Octubre|Noviembre|Diciembre"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "D|L|M|M|J|V|S"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Mostrar"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Ocultar"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Domingo|Lunes|Martes|Miércoles|Jueves|Viernes|Sábado"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Ahora"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Reloj"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Seleccione una hora"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Medianoche"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6 a.m."
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Mediodía"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Hoy"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Calendario"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Ayer"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Mañana"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "Abrir Calculadora"
@@ -2426,6 +2289,8 @@ msgstr "<%= num_students %> estudiantes calificados."
 #: lms/static/coffee/src/instructor_dashboard/data_download.js
 msgid "Error generating student profile information. Please try again."
 msgstr ""
+"Error al generar la información de perfil de estudiante. Por favor inténtelo"
+" nuevamente."
 
 #: lms/static/coffee/src/instructor_dashboard/data_download.js
 #: cms/templates/js/mock/mock-group-configuration-page.underscore
@@ -2507,15 +2372,15 @@ msgstr "Error: No puede eliminarse a usted mismo del grupo de instructores!"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "The following errors were generated:"
-msgstr ""
+msgstr "Se generaron los siguientes errores:"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "The following warnings were generated:"
-msgstr ""
+msgstr "Se generaron las siguientes advertencias:"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "All accounts were created successfully."
-msgstr ""
+msgstr "Todas las cuentas fueron creadas exitosamente."
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "Error adding/removing users as beta testers."
@@ -3125,6 +2990,10 @@ msgstr "Encabezado"
 msgid "You have been logged out of your edX account. "
 msgstr "Ha cerrado su sesión de edX."
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr "Ocurrió un error al procesar su encuesta."
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr "Ocurrió un error desconocido."
@@ -3155,128 +3024,139 @@ msgstr "Falló al re puntuar el problema."
 
 #: lms/static/js/dashboard/donation.js
 msgid "Please enter a valid donation amount."
-msgstr ""
+msgstr "Por favor entre un valor de donación válido"
 
 #: lms/static/js/dashboard/donation.js
 msgid "Your donation could not be submitted."
-msgstr ""
+msgstr "Su donación no pudo ser enviada."
 
 #: lms/static/js/dashboard/legacy.js
 msgid "An error occurred. Please try again later."
-msgstr ""
+msgstr "Ocurrió un error. Por favor intente nuevamente más tarde."
 
 #: lms/static/js/dashboard/legacy.js
 msgid "Please verify your new email address"
-msgstr ""
+msgstr "Por favor verifique su dirección de correo electrónico "
 
 #: lms/static/js/dashboard/legacy.js
 msgid ""
 "You'll receive a confirmation in your inbox. Please follow the link in the "
 "email to confirm your email address change."
 msgstr ""
+"Recibirá una confirmación en su buzón de correo. Por favor haga clic en el "
+"vínculo que aparecerá en el correo electrónico para confirmar el cambio de "
+"su dirección de correo."
 
 #: lms/static/js/student_account/account.js
 #: lms/static/js/student_profile/profile.js
 msgid "The data could not be saved."
-msgstr ""
+msgstr "Los datos no pudieron ser guardados."
 
 #: lms/static/js/student_account/account.js
 msgid "Please enter a valid email address"
-msgstr ""
+msgstr "Por favor ingrese una dirección de correo electrónico válida."
 
 #: lms/static/js/student_account/account.js
 msgid "Please enter a valid password"
-msgstr ""
+msgstr "Por favor ingrese una contraseña válida"
 
 #: lms/static/js/student_account/account.js
 msgid ""
 "Password reset email sent. Follow the link in the email to change your "
 "password."
 msgstr ""
+"Se ha enviado el correo para restablecer su contraseña.  Siga el vínculo "
+"enviado en el correo para realizar el cambio."
 
 #: lms/static/js/student_account/account.js
 msgid "We weren't able to send you a password reset email."
-msgstr ""
+msgstr "No se ha podido enviar el correo para restablecer su contraseña."
 
 #: lms/static/js/student_account/account.js
 msgid "Please check your email to confirm the change"
-msgstr ""
+msgstr "Por favor revise su correo para confirmar el cambio"
 
 #: lms/static/js/student_profile/profile.js
 msgid "Full name cannot be blank"
-msgstr ""
+msgstr "El nombre completo no puede estar vacío"
 
 #: lms/static/js/student_profile/profile.js
 msgid "Language cannot be blank"
-msgstr ""
+msgstr "El idioma no puede estar vacío"
 
 #: lms/static/js/student_profile/profile.js
 msgid "We couldn't populate the list of language choices."
-msgstr ""
+msgstr "No hemos podido cargar la lista de idiomas."
 
 #: lms/static/js/student_profile/profile.js
 msgid "Saved"
-msgstr ""
+msgstr "Guardado"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "Error adding students."
-msgstr ""
+msgstr "Error al añadir estudiantes."
 
 #: lms/static/js/views/cohort_editor.js
 msgid "{numUsersAdded} student has been added to this cohort group"
 msgid_plural "{numUsersAdded} students have been added to this cohort group"
-msgstr[0] ""
+msgstr[0] "{numUsersAdded} estudiante ha sido añadido a este grupo de cohorte"
 msgstr[1] ""
+"{numUsersAdded} estudiantes han sido añadidos a este grupo de cohorte"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "{numMoved} student was removed from {oldCohort}"
 msgid_plural "{numMoved} students were removed from {oldCohort}"
-msgstr[0] ""
+msgstr[0] "{numMoved} estudiante ha sido eliminado de la cohorte {oldCohort}"
 msgstr[1] ""
+"{numMoved} estudiantes han sido eliminados de la cohorte {oldCohort}"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "{numPresent} student was already in the cohort group"
 msgid_plural "{numPresent} students were already in the cohort group"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{numPresent} estudiante ya estaba en el grupo de cohorte"
+msgstr[1] "{numPresent} estudiantes ya estaban en el grupo de cohorte"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "Unknown user: {user}"
-msgstr ""
+msgstr "Usuario desconocido: {user}"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "There was an error when trying to add students:"
 msgid_plural "There were {numErrors} errors when trying to add students:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ocurrió un error al añadir estudiantes:"
+msgstr[1] "Ocurrieron {numErrors} errores al añadir estudiantes:"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "View all errors"
-msgstr ""
+msgstr "Ver todos los errores"
 
 #: lms/static/js/views/cohorts.js
 msgid "You currently have no cohort groups configured"
-msgstr ""
+msgstr "Actualmente no tiene grupos de cohorte configurados"
 
 #: lms/static/js/views/cohorts.js
 #: lms/templates/instructor/instructor_dashboard_2/cohorts.underscore
 msgid "Add Cohort Group"
-msgstr ""
+msgstr "Añadir grupo de cohorte"
 
 #: lms/static/js/views/cohorts.js
 msgid ""
 "The {cohortGroupName} cohort group has been created. You can manually add "
 "students to this group below."
 msgstr ""
+"El grupo de cohorte {cohortGroupName} ha sido creado. Puede añadir "
+"manualmente estudiantes a continuación."
 
 #: lms/static/js/views/cohorts.js
 msgid ""
 "We've encountered an error. Please refresh your browser and then try again."
 msgstr ""
+"Hemos detectado un error. Por favor recargue la página en el navegador e "
+"intente nuevamente."
 
 #: lms/static/js/views/cohorts.js
 msgid "Please enter a name for your new cohort group."
-msgstr ""
+msgstr "Por favor ingrese un nombre para su nuevo grupo de cohorte."
 
 #: lms/templates/class_dashboard/all_section_metrics.js
 #: lms/templates/class_dashboard/all_section_metrics.js
@@ -3377,7 +3257,7 @@ msgstr "ABCDEFGHIJKLMNÑOPQRSTUVWXYZ"
 
 #: cms/static/js/factories/export.js
 msgid "There has been an error while exporting."
-msgstr ""
+msgstr "Ha habido un error exportando"
 
 #: cms/static/js/factories/export.js
 msgid ""
@@ -3386,14 +3266,18 @@ msgid ""
 "attempting another export. Please check that all components on the page are "
 "valid and do not display any error messages."
 msgstr ""
+"Ha habido una falla para exportar al XML al menos un componente. Se "
+"recomienda ir a la página de edición y reparar el error antes de intentar "
+"otra exportación. Por favor, verifique que todos los componentes en la "
+"página son validos y no exhiben ninguna mensaje de error.   "
 
 #: cms/static/js/factories/export.js
 msgid "Correct failed component"
-msgstr ""
+msgstr "Corregir componente fallido"
 
 #: cms/static/js/factories/export.js
 msgid "Return to Export"
-msgstr ""
+msgstr "Regresar a exportar"
 
 #: cms/static/js/factories/export.js
 msgid ""
@@ -3402,106 +3286,112 @@ msgid ""
 " component. It is recommended that you inspect your courseware to identify "
 "any components in error and try again."
 msgstr ""
+"Ha habido un error exportando el curso a XML. Infortunadamente, no tenemos "
+"suficiente información específica para asistirte a identificar el componente"
+" que falló. Se recomienda revisar el contenido del cursopara identificar si "
+"algún componente tiene errores e intentar de nuevo."
 
 #: cms/static/js/factories/export.js
 msgid "The raw error message is:"
-msgstr ""
+msgstr "El error crudo es:"
 
 #: cms/static/js/factories/export.js
 msgid "There has been an error with your export."
-msgstr ""
+msgstr "Ha habido un error al exportar."
 
 #: cms/static/js/factories/export.js
 msgid "Yes, take me to the main course page"
-msgstr ""
+msgstr "Si, llevame a la página principal"
 
 #: cms/static/js/factories/import.js
 msgid "There was an error during the upload process."
-msgstr ""
+msgstr "Hubo un error durante el proceso de carga."
 
 #: cms/static/js/factories/import.js
 msgid "There was an error while unpacking the file."
-msgstr ""
+msgstr "Ha habido un error desempaquetando el archivo"
 
 #: cms/static/js/factories/import.js
 msgid "There was an error while verifying the file you submitted."
-msgstr ""
+msgstr "Ha habido un error verificando el archivo que usted ha enviado."
 
 #: cms/static/js/factories/import.js
 msgid "There was an error while importing the new course to our database."
-msgstr ""
+msgstr "Ha habido un error importando el nuevo curso a nuestra base de datos."
 
 #: cms/static/js/factories/import.js
 msgid "Your import has failed."
-msgstr ""
+msgstr "Su importación ha fallado."
 
 #: cms/static/js/factories/import.js cms/static/js/factories/import.js
 #: cms/static/js/views/import.js cms/static/js/views/import.js.c
 msgid "Choose new file"
 msgstr "Escoja un nuevo archivo"
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
-msgstr ""
+msgstr "Un email correcto es requerido."
 
 #: cms/static/js/factories/manage_users.js
 msgid "You must enter a valid email address in order to add a new team member"
 msgstr ""
+"Se debe introducir un email valido para adicionar un nuevo miembro en el "
+"equipo. "
 
 #: cms/static/js/factories/manage_users.js
 msgid "Return and add email address"
-msgstr ""
+msgstr "Volver y introduir un correo electrónico. "
 
 #: cms/static/js/factories/manage_users.js
 msgid "Already a course team member"
-msgstr ""
+msgstr "Ya un miembro del equipo del curso."
 
 #: cms/static/js/factories/manage_users.js
 msgid ""
 "{email} is already on the “{course}” team. If you're trying to add a new "
 "member, please double-check the email address you provided."
 msgstr ""
+"{email} ya está en el equipo del \"{course}\". Si intenta adicionar un nuevo"
+" miembro, por favor verifique el email introducido. "
 
 #: cms/static/js/factories/manage_users.js
 msgid "Return to team listing"
-msgstr ""
+msgstr "Volver a la lista del equipo"
 
 #: cms/static/js/factories/manage_users.js
 msgid "Error adding user"
-msgstr ""
+msgstr "Error al añadir el usuario."
 
 #: cms/static/js/factories/manage_users.js
 msgid "Are you sure?"
-msgstr ""
+msgstr "¿Está seguro?"
 
 #: cms/static/js/factories/manage_users.js
 msgid ""
 "Are you sure you want to delete {email} from the course team for “{course}”?"
 msgstr ""
+"Está seguro que quiere suprimir {email} del equipo del curso para "
+"\"{course}\"?"
 
 #: cms/static/js/factories/manage_users.js
 msgid "Error removing user"
-msgstr ""
+msgstr "Error al remover el usuario."
 
 #: cms/static/js/factories/manage_users.js
 msgid "There was an error changing the user's role"
-msgstr ""
+msgstr "Ocurrió un error al cambiar el papel del usuario."
 
 #: cms/static/js/factories/manage_users.js
 msgid "Try Again"
-msgstr ""
+msgstr "Intente de nuevo"
 
 #: cms/static/js/factories/settings_advanced.js
 msgid "Hide Deprecated Settings"
-msgstr ""
+msgstr "Ocultar configuraciones descartadas"
 
 #: cms/static/js/factories/settings_advanced.js
 msgid "Show Deprecated Settings"
-msgstr ""
+msgstr "Mostrar configuraciones descartadas"
 
 #: cms/static/js/factories/textbooks.js
 #: cms/static/js/views/pages/group_configurations.js
@@ -3548,6 +3438,10 @@ msgstr ""
 msgid "or"
 msgstr "o"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "El curso debe tener asignada una fecha de inicio."
@@ -3856,6 +3750,20 @@ msgstr "Configuración"
 msgid "New %(component_type)s"
 msgstr "Nuevo %(component_type)s"
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -3986,7 +3894,7 @@ msgstr ""
 
 #: cms/static/js/views/settings/main.js
 msgid "%(hours)s:%(minutes)s (current UTC time)"
-msgstr ""
+msgstr "%(hours)s:%(minutes)s (hora UTC actual)"
 
 #: cms/static/js/views/settings/main.js
 msgid "Upload your course image."
@@ -4100,133 +4008,145 @@ msgstr "(esta publicación es sobre %(courseware_title_linked)s)"
 
 #: lms/templates/dashboard/donation.underscore
 msgid "Donate"
-msgstr ""
+msgstr "Donar"
 
 #: lms/templates/instructor/instructor_dashboard_2/add-cohort-form.underscore
 msgid "Add a New Cohort Group"
-msgstr ""
+msgstr "Añadir un nuevo grupo de cohorte"
 
 #: lms/templates/instructor/instructor_dashboard_2/add-cohort-form.underscore
 msgid "New Cohort Name"
-msgstr ""
+msgstr "Nuevo grupo de cohorte"
 
 #: lms/templates/instructor/instructor_dashboard_2/add-cohort-form.underscore
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 msgid "(Required Field)"
-msgstr ""
+msgstr "(Campo requerido)"
 
 #: lms/templates/instructor/instructor_dashboard_2/add-cohort-form.underscore
 msgid "Enter Your New Cohort Group's Name"
-msgstr ""
+msgstr "Ingrese el nombre para su nuevo grupo de cohorte"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 msgid "(contains %(student_count)s student)"
 msgid_plural "(contains %(student_count)s students)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(contiene %(student_count)s estudiante)"
+msgstr[1] "(contiene %(student_count)s estudiantes)"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 msgid ""
 "Students are added to this group only when you provide their email addresses"
 " or usernames on this page."
 msgstr ""
+"Los estudiantes son añadidos a este grupo solo cuando ingrese sus nombres de"
+" usuario o correos electrónicos en esta página."
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 msgid "What does this mean?"
-msgstr ""
+msgstr "¿Qué significa esto?"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 msgid "Students are added to this group automatically."
-msgstr ""
+msgstr "Los estudiantes son añadidos a este grupo automáticamente."
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 msgid "Edit settings in Studio"
-msgstr ""
+msgstr "Editar la configuración en Studio"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 msgid "Add students to this cohort group"
-msgstr ""
+msgstr "Añadir estudiantes a este grupo de cohorte"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 msgid ""
 "Note: Students can only be in one cohort group. Adding students to this "
 "group overrides any previous group assignment."
 msgstr ""
+"Nota: Los estudiantes solo pueden hacer parte de un grupo de cohorte. Al "
+"añadir estudiantes a un grupo, se sobreescribe cualquier asignación previa "
+"que tuvieran dichos estudiantes."
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 msgid ""
 "Enter email addresses and/or usernames separated by new lines or commas for "
 "students to add. *"
 msgstr ""
+"Ingrese los correos electrónicos y/o nombres de usuario separados por nuevas"
+" lineas o por comas para añadirlos. *"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 msgid "e.g. johndoe@example.com, JaneDoe, joeydoe@example.com"
-msgstr ""
+msgstr "ej. johndoe@example.com, JaneDoe, joeydoe@example.com"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 msgid ""
 "You will not get notification for emails that bounce, so please double-check"
 " spelling."
 msgstr ""
+"No recibirá notificaciones de los correos con rebotes, por lo tanto, debe "
+"asegurarse de que los correos estén bien escritos."
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
 msgid "Add Students"
-msgstr ""
+msgstr "Añadir estudiantes"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-selector.underscore
 msgid "Select a cohort group"
-msgstr ""
+msgstr "Seleccione un grupo de cohorte"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohort-selector.underscore
 msgid "%(cohort_name)s (%(user_count)s)"
-msgstr ""
+msgstr "%(cohort_name)s (%(user_count)s)"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohorts.underscore
 msgid "Cohort Management"
-msgstr ""
+msgstr "Administración de cohortes"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohorts.underscore
 msgid "Select a cohort group to manage"
-msgstr ""
+msgstr "Seleccione un grupo de cohorte"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohorts.underscore
 msgid "View Cohort Group"
-msgstr ""
+msgstr "Ver grupo de cohorte"
 
 #: lms/templates/instructor/instructor_dashboard_2/cohorts.underscore
 msgid ""
 "To review all student cohort group assignments, download course profile "
 "information on %(link_start)s the Data Download page. %(link_end)s"
 msgstr ""
+"Para revisar todas las asignaciones de estudiantes a los grupos de cohorte, "
+"descargue la información de perfiles del curso en la %(link_start)s página "
+"de descarga de datos.%(link_end)s"
 
 #: lms/templates/student_account/account.underscore
 msgid "New Address"
-msgstr ""
+msgstr "Nueva dirección "
 
 #: lms/templates/student_account/account.underscore
 msgid "Password"
-msgstr ""
+msgstr "Contraseña"
 
 #: lms/templates/student_account/account.underscore
 msgid "Change My Email Address"
-msgstr ""
+msgstr "Cambiar mi dirección de correo electrónico"
 
 #: lms/templates/student_account/account.underscore
 msgid "Reset Password"
-msgstr ""
+msgstr "Restablecer Contraseña"
 
 #: lms/templates/student_profile/profile.underscore
 msgid "Full Name"
-msgstr ""
+msgstr "Nombre Completo"
 
 #: lms/templates/student_profile/profile.underscore
 msgid "Preferred Language"
-msgstr ""
+msgstr "Preferencia de idioma"
 
 #: lms/templates/student_profile/profile.underscore
 msgid "Update Profile"
-msgstr ""
+msgstr "Actualizar perfil"
 
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 msgid "Common Problem Types"
@@ -4843,6 +4763,10 @@ msgstr "Acciones de página"
 msgid "New Group Configuration"
 msgstr "Nueva configuración de grupo"
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr "Eliminar"
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr "Añada URLs para las versiones adicionales"
diff --git a/conf/locale/es_AR/LC_MESSAGES/django.mo b/conf/locale/es_AR/LC_MESSAGES/django.mo
index e478ce81f2..f95b9351ef 100644
Binary files a/conf/locale/es_AR/LC_MESSAGES/django.mo and b/conf/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/es_AR/LC_MESSAGES/django.po b/conf/locale/es_AR/LC_MESSAGES/django.po
index 28dd864735..2a47d32e4c 100644
--- a/conf/locale/es_AR/LC_MESSAGES/django.po
+++ b/conf/locale/es_AR/LC_MESSAGES/django.po
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-08-14 21:21+0000\n"
 "Last-Translator: Aylén <aylen_00@hotmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/edx-platform/language/es_AR/)\n"
@@ -110,14 +110,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -209,6 +201,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2217,6 +2210,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2575,23 +2609,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2953,9 +2970,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4121,6 +4139,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5022,15 +5044,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5038,37 +5072,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5309,17 +5331,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5329,7 +5351,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5343,8 +5365,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6530,15 +6552,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6575,7 +6597,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6993,11 +7015,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7158,6 +7175,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7460,6 +7478,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8468,11 +8491,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8485,6 +8503,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9336,9 +9359,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9426,7 +9446,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11224,18 +11243,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12572,6 +12579,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12627,19 +12677,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12647,15 +12697,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14178,6 +14228,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14190,6 +14249,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14248,10 +14312,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14266,6 +14331,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/es_AR/LC_MESSAGES/djangojs.mo b/conf/locale/es_AR/LC_MESSAGES/djangojs.mo
index 7c1b5cf456..bb70130428 100644
Binary files a/conf/locale/es_AR/LC_MESSAGES/djangojs.mo and b/conf/locale/es_AR/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/es_AR/LC_MESSAGES/djangojs.po b/conf/locale/es_AR/LC_MESSAGES/djangojs.po
index b6ada0f64c..50f3ed3b5e 100644
--- a/conf/locale/es_AR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/es_AR/LC_MESSAGES/djangojs.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/edx-platform/language/es_AR/)\n"
@@ -62,8 +62,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2144,153 +2142,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2949,6 +2800,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3258,10 +3113,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3364,6 +3215,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3648,6 +3503,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4590,6 +4459,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/es_EC/LC_MESSAGES/django.mo b/conf/locale/es_EC/LC_MESSAGES/django.mo
index 92fcc731bc..8bbb4c250a 100644
Binary files a/conf/locale/es_EC/LC_MESSAGES/django.mo and b/conf/locale/es_EC/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/es_EC/LC_MESSAGES/django.po b/conf/locale/es_EC/LC_MESSAGES/django.po
index b1ce9733b6..bcceee34ff 100644
--- a/conf/locale/es_EC/LC_MESSAGES/django.po
+++ b/conf/locale/es_EC/LC_MESSAGES/django.po
@@ -54,7 +54,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-08-25 20:21+0000\n"
 "Last-Translator: x_vela <x_vela@hotmail.com>\n"
 "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/edx-platform/language/es_EC/)\n"
@@ -120,14 +120,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -219,6 +211,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2227,6 +2220,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2585,23 +2619,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2963,9 +2980,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4131,6 +4149,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5032,15 +5054,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5048,37 +5082,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5319,17 +5341,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5339,7 +5361,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5353,8 +5375,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6540,15 +6562,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6585,7 +6607,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7003,11 +7025,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7168,6 +7185,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7470,6 +7488,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8478,11 +8501,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8495,6 +8513,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9346,9 +9369,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9436,7 +9456,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11234,18 +11253,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12582,6 +12589,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12637,19 +12687,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12657,15 +12707,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14188,6 +14238,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14200,6 +14259,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14258,10 +14322,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14276,6 +14341,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/es_EC/LC_MESSAGES/djangojs.mo b/conf/locale/es_EC/LC_MESSAGES/djangojs.mo
index 1cb8f967e6..02e9851b3e 100644
Binary files a/conf/locale/es_EC/LC_MESSAGES/djangojs.mo and b/conf/locale/es_EC/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/es_EC/LC_MESSAGES/djangojs.po b/conf/locale/es_EC/LC_MESSAGES/djangojs.po
index 20ed09550c..7ec69b0549 100644
--- a/conf/locale/es_EC/LC_MESSAGES/djangojs.po
+++ b/conf/locale/es_EC/LC_MESSAGES/djangojs.po
@@ -46,7 +46,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/edx-platform/language/es_EC/)\n"
@@ -79,8 +79,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2161,153 +2159,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2966,6 +2817,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3275,10 +3130,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3381,6 +3232,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3665,6 +3520,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4607,6 +4476,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/es_ES/LC_MESSAGES/django.mo b/conf/locale/es_ES/LC_MESSAGES/django.mo
index 20eed15844..49b15e76ef 100644
Binary files a/conf/locale/es_ES/LC_MESSAGES/django.mo and b/conf/locale/es_ES/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/es_ES/LC_MESSAGES/django.po b/conf/locale/es_ES/LC_MESSAGES/django.po
index 4fd6073536..92aa1083df 100644
--- a/conf/locale/es_ES/LC_MESSAGES/django.po
+++ b/conf/locale/es_ES/LC_MESSAGES/django.po
@@ -32,6 +32,7 @@
 # juditseb <juditseb@hotmail.com>, 2014
 # leosamu <leosamu@gmail.com>, 2014
 # Marta, 2014
+# UC3M <edx@uc3m.es>, 2014
 # valenciaupv <valenciaupv@gmail.com>, 2014
 # #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
 # edX translation file
@@ -61,6 +62,7 @@
 # Natalia, 2013
 # Cristian Salamea <ovnicraft@gmail.com>, 2013
 # Tesaur <pablo15892@hotmail.com>, 2014
+# Raúl Aguilera Ortega <raguiler@db.uc3m.es>, 2014
 # valenciaupv <valenciaupv@gmail.com>, 2014
 # Vanesa Lopez- Roman Perez <vanesalrp@gmail.com>, 2014
 # #-#-#-#-#  mako-studio.po (edx-platform)  #-#-#-#-#
@@ -115,8 +117,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: spentamanyu <i.delamo@gmail.com>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/projects/p/edx-platform/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -175,14 +177,6 @@ msgstr "Unidad"
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "Certificado de Código de Honor"
@@ -273,6 +267,7 @@ msgstr "Educación primaria"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "Nada"
 
@@ -2287,6 +2282,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "Acerca de"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "General"
@@ -2645,18 +2680,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "Error"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -3018,9 +3041,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4187,6 +4211,10 @@ msgstr "Descarga de Datos"
 msgid "Analytics"
 msgstr "Analíticas"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5079,15 +5107,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5095,37 +5135,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5366,17 +5394,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5386,7 +5414,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5400,8 +5428,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6611,16 +6639,16 @@ msgid "Help"
 msgstr "Ayuda"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "Registrarse en {} | Elegir tu ruta"
+msgid "Enroll In {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr "Lo sentimos, ocurrió un error en su proceso de registro"
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -6656,7 +6684,7 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7088,11 +7116,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "Acerca de"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7264,6 +7287,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "Enviar"
 
@@ -7583,6 +7607,11 @@ msgstr "Datos planos:"
 msgid "Accepted"
 msgstr "Aceptado"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "Error"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "Rechazado"
@@ -8627,11 +8656,6 @@ msgstr "Ver contenido del curso"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "El curso está completo"
@@ -8644,6 +8668,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9503,9 +9532,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9593,7 +9619,6 @@ msgstr "Ver Curso Archivado"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "Ver curso"
 
@@ -11403,18 +11428,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12763,6 +12776,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12821,19 +12877,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
-msgstr "Estás re-verificando tu identidad para"
-
-#: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "You are enrolling in {organization}'s {course_name}"
+msgstr ""
+
+#: lms/templates/verify_student/_verification_header.html
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12841,15 +12897,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
-msgstr "Re-verificando tu identidad para:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14372,6 +14428,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14384,6 +14449,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14442,10 +14512,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14460,6 +14531,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/es_ES/LC_MESSAGES/djangojs.mo b/conf/locale/es_ES/LC_MESSAGES/djangojs.mo
index 1ebca2bce8..6f11351761 100644
Binary files a/conf/locale/es_ES/LC_MESSAGES/djangojs.mo and b/conf/locale/es_ES/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/es_ES/LC_MESSAGES/djangojs.po b/conf/locale/es_ES/LC_MESSAGES/djangojs.po
index 2223ab11fa..cf441b738a 100644
--- a/conf/locale/es_ES/LC_MESSAGES/djangojs.po
+++ b/conf/locale/es_ES/LC_MESSAGES/djangojs.po
@@ -45,6 +45,7 @@
 # 
 # Translators:
 # Alicia P. <pericia@gmail.com>, 2014
+# Enrique Centelles <ecentelles2003@yahoo.es>, 2014
 # Steven McArthur <inactive+legallyunemployed@transifex.com>, 2014
 # MiguelSdP <miguelsdp@gmail.com>, 2014
 # #-#-#-#-#  underscore-studio.po (edx-platform)  #-#-#-#-#
@@ -54,6 +55,7 @@
 # 
 # Translators:
 # Alicia P. <pericia@gmail.com>, 2014
+# Enrique Centelles <ecentelles2003@yahoo.es>, 2014
 # johnfelipe <ingenierofelipeurrego@gmail.com>, 2014
 # Miguel Angel Cordova <miguel.angel.cordova.uned@gmail.com>, 2014
 # Óscar Arce Ruiz <oscararceruiz@hotmail.com>, 2014
@@ -61,9 +63,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
-"PO-Revision-Date: 2014-10-08 18:08+0000\n"
-"Last-Translator: Sarina Canelake <sarina@edx.org>\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
+"PO-Revision-Date: 2014-11-02 10:11+0000\n"
+"Last-Translator: Enrique Centelles <ecentelles2003@yahoo.es>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/projects/p/edx-platform/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,8 +95,6 @@ msgstr "De acuerdo"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -2192,167 +2192,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "%s disponible"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Esta es la lista de %s disponibles. Puedes elegir algunos seleccionándolos "
-"en la caja inferior y pulsando a continuación la flecha \"Elegir\" entre las"
-" dos cajas."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "Teclea en este campo para filtrar la lista de %s disponibles."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Filtro"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Elegir todos"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Pulsa para elegir todos los %s de una sola vez."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Elegir"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "Eliminar"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "%s seleccionados"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Esta es la lista de %s seleccionados. Puedes eliminar algunos "
-"seleccionándolos de la caja inferior y pulsando después en la flecha "
-"\"Eliminar\" situada entre las dos cajas."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Eliminar todos"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Pulsa para eliminar todos los %s seleccionados de una sola vez."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(sel)s de %(cnt)s seleccionado"
-msgstr[1] "%(sel)s de %(cnt)s seleccionados"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"Tienes cambios sin guardar en campos editables. Si realizas una acción, se "
-"perderán estos cambios sin guardar."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Ha seleccionado una acción, pero todavía no ha guardado sus cambios en "
-"campos individuales. Por favor, pulse OK para guardar. Necesitará ejecutar "
-"de nuevo la acción."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"Ha seleccionado una acción, y no ha hecho cambios en campos individuales. "
-"Probablemente quiso utilizar el botón Ir en vez de el de Guardar."
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Enero|Febrero|Marzo|Abril|Mayo|Junio|Julio|Agusto|Septiembre|Octubre|Noviembre"
-" |Diciembre"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "D|L|M|X|J|V|S"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Mostrar"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Ocultar"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Domingo|Lunes|Martes|Miércoles|Jueves|Viernes|Sábado"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Ahora"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Reloj"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Elija una hora"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Media noche"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6 a.m."
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Mediodía"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Hoy"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Calendario"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Ayer"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Mañana"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "Abrir Calculadora"
@@ -3061,6 +2900,10 @@ msgstr "Cabecera"
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3374,10 +3217,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3483,6 +3322,10 @@ msgstr ""
 msgid "or"
 msgstr "o"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "El curso debe tener asignada una fecha de inicio."
@@ -3782,6 +3625,20 @@ msgstr "Ajustes"
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4734,6 +4591,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/es_MX/LC_MESSAGES/django.mo b/conf/locale/es_MX/LC_MESSAGES/django.mo
index a81f1f2a6c..17dbccbc2a 100644
Binary files a/conf/locale/es_MX/LC_MESSAGES/django.mo and b/conf/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/es_MX/LC_MESSAGES/django.po b/conf/locale/es_MX/LC_MESSAGES/django.po
index e6320587bb..5d9684d34f 100644
--- a/conf/locale/es_MX/LC_MESSAGES/django.po
+++ b/conf/locale/es_MX/LC_MESSAGES/django.po
@@ -45,13 +45,14 @@
 # Gerardo Milan Ortega <Milann@outlook.es>, 2014
 # Marco Morales, 2014
 # Etna Pretelín Ricárdez, 2014
+# Rene Santos Osorio <rso@shadai.tv>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
-"Last-Translator: Gerardo Milan Ortega <Milann@outlook.es>\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-31 04:40+0000\n"
+"Last-Translator: Rene Santos Osorio <rso@shadai.tv>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/edx-platform/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -115,14 +116,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -214,6 +207,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2222,6 +2216,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2580,23 +2615,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2958,9 +2976,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4126,6 +4145,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5027,15 +5050,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5043,37 +5078,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5314,17 +5337,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5334,7 +5357,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5348,8 +5371,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6535,15 +6558,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6580,7 +6603,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6998,11 +7021,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7163,6 +7181,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7465,6 +7484,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8473,11 +8497,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8490,6 +8509,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9341,9 +9365,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9431,7 +9452,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11229,18 +11249,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12577,6 +12585,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12632,19 +12683,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12652,15 +12703,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14183,6 +14234,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14195,6 +14255,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14253,10 +14318,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14271,6 +14337,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/es_MX/LC_MESSAGES/djangojs.mo b/conf/locale/es_MX/LC_MESSAGES/djangojs.mo
index 51920661bb..84d0ddcd78 100644
Binary files a/conf/locale/es_MX/LC_MESSAGES/djangojs.mo and b/conf/locale/es_MX/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/es_MX/LC_MESSAGES/djangojs.po b/conf/locale/es_MX/LC_MESSAGES/djangojs.po
index 1ea0431646..2fd6eba907 100644
--- a/conf/locale/es_MX/LC_MESSAGES/djangojs.po
+++ b/conf/locale/es_MX/LC_MESSAGES/djangojs.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/edx-platform/language/es_MX/)\n"
@@ -65,8 +65,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2147,153 +2145,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2952,6 +2803,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3261,10 +3116,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3367,6 +3218,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3651,6 +3506,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4593,6 +4462,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/es_PE/LC_MESSAGES/django.mo b/conf/locale/es_PE/LC_MESSAGES/django.mo
index 3a21feb374..a4d85a48b6 100644
Binary files a/conf/locale/es_PE/LC_MESSAGES/django.mo and b/conf/locale/es_PE/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/es_PE/LC_MESSAGES/django.po b/conf/locale/es_PE/LC_MESSAGES/django.po
index 20cc0df596..ed5d2dbf83 100644
--- a/conf/locale/es_PE/LC_MESSAGES/django.po
+++ b/conf/locale/es_PE/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-03-11 21:33+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/edx-platform/language/es_PE/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/es_PE/LC_MESSAGES/djangojs.mo b/conf/locale/es_PE/LC_MESSAGES/djangojs.mo
index 1de73a4e65..e17e68e8f1 100644
Binary files a/conf/locale/es_PE/LC_MESSAGES/djangojs.mo and b/conf/locale/es_PE/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/es_PE/LC_MESSAGES/djangojs.po b/conf/locale/es_PE/LC_MESSAGES/djangojs.po
index 50b7626444..e6c1d31893 100644
--- a/conf/locale/es_PE/LC_MESSAGES/djangojs.po
+++ b/conf/locale/es_PE/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/edx-platform/language/es_PE/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/et_EE/LC_MESSAGES/django.mo b/conf/locale/et_EE/LC_MESSAGES/django.mo
index 9ad9c13d7b..cd6061f18c 100644
Binary files a/conf/locale/et_EE/LC_MESSAGES/django.mo and b/conf/locale/et_EE/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/et_EE/LC_MESSAGES/django.po b/conf/locale/et_EE/LC_MESSAGES/django.po
index 820775ed6a..3465586e28 100644
--- a/conf/locale/et_EE/LC_MESSAGES/django.po
+++ b/conf/locale/et_EE/LC_MESSAGES/django.po
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-09-27 22:20+0000\n"
 "Last-Translator: Triple <nyke@planet.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/edx-platform/language/et_EE/)\n"
@@ -110,14 +110,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -209,6 +201,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2217,6 +2210,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2575,23 +2609,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2953,9 +2970,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4121,6 +4139,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5022,15 +5044,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5038,37 +5072,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5309,17 +5331,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5329,7 +5351,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5343,8 +5365,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6530,15 +6552,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6575,7 +6597,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6993,11 +7015,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7158,6 +7175,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7460,6 +7478,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8468,11 +8491,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8485,6 +8503,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9336,9 +9359,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9426,7 +9446,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11224,18 +11243,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12572,6 +12579,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12627,19 +12677,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12647,15 +12697,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14178,6 +14228,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14190,6 +14249,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14248,10 +14312,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14266,6 +14331,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/et_EE/LC_MESSAGES/djangojs.mo b/conf/locale/et_EE/LC_MESSAGES/djangojs.mo
index 71d21a3cf8..06ef9bc155 100644
Binary files a/conf/locale/et_EE/LC_MESSAGES/djangojs.mo and b/conf/locale/et_EE/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/et_EE/LC_MESSAGES/djangojs.po b/conf/locale/et_EE/LC_MESSAGES/djangojs.po
index b9f7e218b5..e474b45e9d 100644
--- a/conf/locale/et_EE/LC_MESSAGES/djangojs.po
+++ b/conf/locale/et_EE/LC_MESSAGES/djangojs.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/edx-platform/language/et_EE/)\n"
@@ -60,8 +60,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "Katkesta"
 
@@ -2134,153 +2132,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2939,6 +2790,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3248,10 +3103,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3354,6 +3205,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3638,6 +3493,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4580,6 +4449,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/eu_ES/LC_MESSAGES/django.mo b/conf/locale/eu_ES/LC_MESSAGES/django.mo
index 0fb0df13b8..a21f01755b 100644
Binary files a/conf/locale/eu_ES/LC_MESSAGES/django.mo and b/conf/locale/eu_ES/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/eu_ES/LC_MESSAGES/django.po b/conf/locale/eu_ES/LC_MESSAGES/django.po
index 3a0c36839e..b73adf146c 100644
--- a/conf/locale/eu_ES/LC_MESSAGES/django.po
+++ b/conf/locale/eu_ES/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-04-03 12:47+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/edx-platform/language/eu_ES/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/eu_ES/LC_MESSAGES/djangojs.mo b/conf/locale/eu_ES/LC_MESSAGES/djangojs.mo
index 739241cafa..8469578d30 100644
Binary files a/conf/locale/eu_ES/LC_MESSAGES/djangojs.mo and b/conf/locale/eu_ES/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/eu_ES/LC_MESSAGES/djangojs.po b/conf/locale/eu_ES/LC_MESSAGES/djangojs.po
index 6042bb29e6..13b5467903 100644
--- a/conf/locale/eu_ES/LC_MESSAGES/djangojs.po
+++ b/conf/locale/eu_ES/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/edx-platform/language/eu_ES/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/fa/LC_MESSAGES/django.mo b/conf/locale/fa/LC_MESSAGES/django.mo
index 2f882b4d01..34b7735688 100644
Binary files a/conf/locale/fa/LC_MESSAGES/django.mo and b/conf/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/fa/LC_MESSAGES/django.po b/conf/locale/fa/LC_MESSAGES/django.po
index 30ff007ea2..9a471c998d 100644
--- a/conf/locale/fa/LC_MESSAGES/django.po
+++ b/conf/locale/fa/LC_MESSAGES/django.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-06 03:04+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/edx-platform/language/fa/)\n"
@@ -106,14 +106,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -205,6 +197,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5014,15 +5036,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5030,37 +5064,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5301,17 +5323,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5321,7 +5343,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5335,8 +5357,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6522,15 +6544,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6567,7 +6589,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6985,11 +7007,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7150,6 +7167,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7452,6 +7470,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8458,11 +8481,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8475,6 +8493,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9326,9 +9349,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9416,7 +9436,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11212,18 +11231,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12560,6 +12567,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12615,19 +12665,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12635,15 +12685,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14166,6 +14216,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14178,6 +14237,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14236,10 +14300,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14254,6 +14319,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/fa/LC_MESSAGES/djangojs.mo b/conf/locale/fa/LC_MESSAGES/djangojs.mo
index 5cf86d4583..83c3470227 100644
Binary files a/conf/locale/fa/LC_MESSAGES/djangojs.mo and b/conf/locale/fa/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/fa/LC_MESSAGES/djangojs.po b/conf/locale/fa/LC_MESSAGES/djangojs.po
index a708645974..1f33ee3608 100644
--- a/conf/locale/fa/LC_MESSAGES/djangojs.po
+++ b/conf/locale/fa/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/edx-platform/language/fa/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2122,152 +2120,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2926,6 +2778,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3228,10 +3084,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3334,6 +3186,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3616,6 +3472,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4557,6 +4427,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/fa_IR/LC_MESSAGES/django.mo b/conf/locale/fa_IR/LC_MESSAGES/django.mo
index b1e2631560..12de69eb31 100644
Binary files a/conf/locale/fa_IR/LC_MESSAGES/django.mo and b/conf/locale/fa_IR/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/fa_IR/LC_MESSAGES/django.po b/conf/locale/fa_IR/LC_MESSAGES/django.po
index 04bbf2b471..ee9f1e5671 100644
--- a/conf/locale/fa_IR/LC_MESSAGES/django.po
+++ b/conf/locale/fa_IR/LC_MESSAGES/django.po
@@ -29,6 +29,7 @@
 # Translators:
 # arashdehghan <arashdehghan@gmail.com>, 2014
 # frad <faezeh.rad@intersystems.com>, 2014
+# loqman <loqmanhakimi@gmail.com>, 2014
 # Nata A Yarahmadi, 2014
 # Saman Ismael <saman.2791@gmail.com>, 2013
 # Saman Ismael <saman.2791@gmail.com>, 2013
@@ -65,7 +66,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-10-26 13:11+0000\n"
 "Last-Translator: Reza Amini <reza.amini234@gmail.com>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/edx-platform/language/fa_IR/)\n"
@@ -131,14 +132,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -230,6 +223,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2236,6 +2230,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2594,23 +2629,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2972,9 +2990,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4140,6 +4159,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5039,15 +5062,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5055,37 +5090,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5326,17 +5349,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5346,7 +5369,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5360,8 +5383,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6547,15 +6570,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6592,7 +6615,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7010,11 +7033,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7175,6 +7193,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7477,6 +7496,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8483,11 +8507,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8500,6 +8519,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9351,9 +9375,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9441,7 +9462,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11237,18 +11257,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12585,6 +12593,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12640,19 +12691,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12660,15 +12711,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14191,6 +14242,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14203,6 +14263,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14261,10 +14326,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14279,6 +14345,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/fa_IR/LC_MESSAGES/djangojs.mo b/conf/locale/fa_IR/LC_MESSAGES/djangojs.mo
index d93bc20c4a..4fccec96ad 100644
Binary files a/conf/locale/fa_IR/LC_MESSAGES/djangojs.mo and b/conf/locale/fa_IR/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/fa_IR/LC_MESSAGES/djangojs.po b/conf/locale/fa_IR/LC_MESSAGES/djangojs.po
index e0f267e263..5e74dba1ed 100644
--- a/conf/locale/fa_IR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/fa_IR/LC_MESSAGES/djangojs.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/edx-platform/language/fa_IR/)\n"
@@ -72,8 +72,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2135,152 +2133,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2939,6 +2791,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3241,10 +3097,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3347,6 +3199,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3629,6 +3485,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4570,6 +4440,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/fi_FI/LC_MESSAGES/django.mo b/conf/locale/fi_FI/LC_MESSAGES/django.mo
index bb44f049a4..6f88786153 100644
Binary files a/conf/locale/fi_FI/LC_MESSAGES/django.mo and b/conf/locale/fi_FI/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/fi_FI/LC_MESSAGES/django.po b/conf/locale/fi_FI/LC_MESSAGES/django.po
index bf3cee4786..5ab5858d3f 100644
--- a/conf/locale/fi_FI/LC_MESSAGES/django.po
+++ b/conf/locale/fi_FI/LC_MESSAGES/django.po
@@ -47,8 +47,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Henri Juvonen <henri.juvonen@kapsi.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/edx-platform/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -113,14 +113,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -212,6 +204,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2220,6 +2213,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2578,23 +2612,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2956,9 +2973,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4124,6 +4142,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5025,15 +5047,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5041,37 +5075,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5312,17 +5334,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5332,7 +5354,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5346,8 +5368,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6533,15 +6555,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6578,7 +6600,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6996,11 +7018,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7161,6 +7178,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7463,6 +7481,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8471,11 +8494,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8488,6 +8506,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9339,9 +9362,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9429,7 +9449,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11227,18 +11246,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12575,6 +12582,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12630,19 +12680,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12650,15 +12700,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14181,6 +14231,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14193,6 +14252,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14251,10 +14315,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14269,6 +14334,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/fi_FI/LC_MESSAGES/djangojs.mo b/conf/locale/fi_FI/LC_MESSAGES/djangojs.mo
index 9de4f15abd..f48a8de3e5 100644
Binary files a/conf/locale/fi_FI/LC_MESSAGES/djangojs.mo and b/conf/locale/fi_FI/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/fi_FI/LC_MESSAGES/djangojs.po b/conf/locale/fi_FI/LC_MESSAGES/djangojs.po
index 88cc2c5d1d..a3693812a6 100644
--- a/conf/locale/fi_FI/LC_MESSAGES/djangojs.po
+++ b/conf/locale/fi_FI/LC_MESSAGES/djangojs.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/edx-platform/language/fi_FI/)\n"
@@ -64,8 +64,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2146,153 +2144,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2951,6 +2802,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3260,10 +3115,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3366,6 +3217,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3650,6 +3505,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4592,6 +4461,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/fil/LC_MESSAGES/django.mo b/conf/locale/fil/LC_MESSAGES/django.mo
index c70fd9136e..ccf9c44423 100644
Binary files a/conf/locale/fil/LC_MESSAGES/django.mo and b/conf/locale/fil/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/fil/LC_MESSAGES/django.po b/conf/locale/fil/LC_MESSAGES/django.po
index f9d896e83e..b70420adbf 100644
--- a/conf/locale/fil/LC_MESSAGES/django.po
+++ b/conf/locale/fil/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-06 03:04+0000\n"
 "Last-Translator: \n"
 "Language-Team: Filipino (http://www.transifex.com/projects/p/edx-platform/language/fil/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/fil/LC_MESSAGES/djangojs.mo b/conf/locale/fil/LC_MESSAGES/djangojs.mo
index e33213ca9e..a522a74c43 100644
Binary files a/conf/locale/fil/LC_MESSAGES/djangojs.mo and b/conf/locale/fil/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/fil/LC_MESSAGES/djangojs.po b/conf/locale/fil/LC_MESSAGES/djangojs.po
index 8b13e45037..4227c39a27 100644
--- a/conf/locale/fil/LC_MESSAGES/djangojs.po
+++ b/conf/locale/fil/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Filipino (http://www.transifex.com/projects/p/edx-platform/language/fil/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/fr/LC_MESSAGES/django.mo b/conf/locale/fr/LC_MESSAGES/django.mo
index 32f44d9083..53c8a76964 100644
Binary files a/conf/locale/fr/LC_MESSAGES/django.mo and b/conf/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/fr/LC_MESSAGES/django.po b/conf/locale/fr/LC_MESSAGES/django.po
index 4dab6d98d3..6b7a0966a7 100644
--- a/conf/locale/fr/LC_MESSAGES/django.po
+++ b/conf/locale/fr/LC_MESSAGES/django.po
@@ -30,6 +30,7 @@
 # Nikolaos Maris, 2013
 # Olivier Marquez <oliviermarquez@gmail.com>, 2013
 # Olivier Marquez <oliviermarquez@gmail.com>, 2013-2014
+# Pedro Guimarães Martins <pedrogmartins7@gmail.com>, 2014
 # PETIT Yannick <yannick.petit@gmail.com>, 2013
 # Philippe Chiu <philippe.chiu@gmail.com>, 2013-2014
 # qcappart <quentin.c@swing.be>, 2014
@@ -153,8 +154,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Xavier Antoviaque <xavier@antoviaque.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/edx-platform/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -219,14 +220,6 @@ msgstr "Unité"
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr "La page demandée doit être numérique"
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr "La page demandée doit être supérieure à zero"
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "Certificat sur l'honneur"
@@ -320,6 +313,7 @@ msgstr "Enseignement primaire"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "Aucun"
 
@@ -2593,6 +2587,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr "Seulement sur invitation"
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "A propos"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "Général"
@@ -3010,23 +3044,6 @@ msgstr "Entrez la date à laquelle les problèmes doivent être rendus."
 msgid "Group ID {group_id}"
 msgstr "ID du groupe {group_id}"
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr "Attention"
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "Erreur"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr "Non sélectionné"
@@ -3455,9 +3472,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4766,6 +4784,10 @@ msgstr ""
 msgid "Analytics"
 msgstr "Analyses"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5767,82 +5789,54 @@ msgstr ""
 "Le montant facturé par le processus {0} {1} est différent du coût total de "
 "la commande {2} {3}."
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"Désolé! Notre serveur de payement n'a pas accepté votre payement.\n"
-"La décision prise est la suivante <span class=\"decision\">{decision}</span>,\n"
-"et la raison est <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"Votre argent n'a pas été prélevé. Veuillez essayer une autre forme de payement.\n"
-"Contactez-nous pour les questions relatives aux payements à {email}.\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"Désolé! Notre serveur de payement nous a renvoyé une confirmation de payement qui contient des données inconsistantes!\n"
-"Nous nous excusons du fait que nous ne pouvons ni vérifier si votre argent a été transféré ni prendre d'autres actions sur votre commande.\n"
-"Le message d'erreur spécifique est <span class=\"exception_msg\">{msg}</span>.\n"
-"Votre carte de crédit a peut être été prélevée. Contactez-nous pour les questions relatives aux payements à {email}.\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"Désolé! A cause d'une erreur, votre achat a été facturé d'un montant différent du montant commandé!\n"
-"Le code d'erreur spécifique est: <span class=\"exception_msg\">{msg}</span>.\n"
-"Votre carte de crédit a probablement été prélevée. Contactez-nous pour les questions relatives aux payements à {email}.\n"
-"</p>"
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"Désolé ! Notre serveur de payement nous a renvoyé un message corrompu concernant votre facturation, nous sommes donc dans l'impossibilité de valider que le message provient réellement du serveur de payement.\n"
-"Le message d'erreur spécifique est: <span class=\"exception_msg\">{msg}</span>.\n"
-"Nous nous excusons du fait que nous ne puissions ni vérifier si le payement a été prélevé, ni prendre des actions concernant votre commande.\n"
-"Votre carte de crédit a peut-être été chargée. Contactez-nous pour les questions relatives aux payements à {email}.\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6154,29 +6148,19 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
-"Désolé! Notre serveur de paiement nous a renvoyé une confirmation de "
-"paiement qui contenait des données incohérentes! Veuillez nous excuser de ne"
-" pas pouvoir vérifier si le règlement est parvenu et de ne pas pouvoir "
-"traiter plus avant votre commande. Le message d'erreur spécifique est: {msg}"
-" Le montant peut éventuellement avoir été prélevé sur votre carte de crédit."
-" Contactez-nous pour les questions liées au paiement à l'adresse {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
-"Désolé! En raison d'une erreur votre achat a été facturé pour un montant "
-"différent du montant total de la commande! Le message d'erreur spécifique "
-"est: {msg}. Le montant a probablement été prélevé sur votre carte de crédit."
-" Contactez-nous pour les questions liées au paiement à l'adresse {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -6184,17 +6168,9 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
-"Désolé ! Notre processeur de paiement nous a renvoyé un message endommagé au"
-" sujet de votre paiement, nous ne sommes donc pas en mesure de confirmer que"
-" le message provenait effectivement de notre processeur de paiement. Le "
-"message d'erreur spécifique est : {msg}. Veuillez nous excuser de ne pas "
-"pouvoir vérifier si le règlement est parvenu et de ne pas pouvoir traiter "
-"plus avant votre commande. Le montant peut éventuellement avoir été prélevé "
-"sur votre carte de crédit. Contactez-nous pour les questions liées au "
-"paiement à l'adresse {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -6206,11 +6182,9 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
-"Désolé ! Votre paiement n'a pas pu être traité car une erreur inattendue "
-"s'est produite. Veuillez nous contacter à l'adresse {email} pour assistance."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
@@ -7525,16 +7499,16 @@ msgid "Help"
 msgstr "Aide"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
-msgstr "Mettre à niveau votre inscription pour {} | Choisir votre parcours"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "S'inscrire à {} | Choisissez votre direction"
+msgid "Enroll In {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr "Désolé, une erreur s'est produite en tentant de vous inscrire."
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -7578,8 +7552,8 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
-msgstr "Mettre à niveau votre inscription"
+msgid "Upgrade Your Enrollment"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Audit This Course"
@@ -8039,11 +8013,6 @@ msgstr "(Revisé le 16/04/2014)"
 msgid "About & Company Info"
 msgstr "Présentation et informations sur la compagnie"
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "A propos"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr "Nouvelles"
@@ -8226,6 +8195,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -8559,6 +8529,11 @@ msgstr "Données brutes :"
 msgid "Accepted"
 msgstr "Accepté"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "Erreur"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "Rejeté"
@@ -9639,13 +9614,6 @@ msgstr "Voir le Cours"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "Ce cours est dans votre <a href=\"{cart_link}\">panier</a>."
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"Ajouter {course.display_number_with_default} au panier "
-"({currency_symbol}{cost})"
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "Ce cours est complet"
@@ -9658,6 +9626,13 @@ msgstr "L'inscription à ce cours se fait sur invitation seulement"
 msgid "Enrollment is Closed"
 msgstr "Les inscriptions sont fermées"
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"Ajouter {course.display_number_with_default} au panier "
+"({currency_symbol}{cost})"
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "S'inscrire à {course.display_number_with_default}"
@@ -10601,9 +10576,6 @@ msgstr "Inscrit en tant que:"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr "Vérifié"
 
@@ -10699,7 +10671,6 @@ msgstr "Voir le cours"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "Voir le cours"
 
@@ -12690,23 +12661,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr "Envoyez-moi une copie de la facture"
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr "Étudiants actifs"
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-"Le nombre d'étudiants qui ont interagi au moins une fois en accédant à des "
-"pages, en regardant des vidéos, en contribuant aux discussions, en "
-"soumettant des exercices ou en réalisant d'autres activités. La plage de "
-"dates inclut toutes les activités de minuit à la date de départ (inclus) "
-"jusqu'à minuit de la date de fin (exclus)."
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr "Distribution des scores"
@@ -14202,6 +14156,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr "Éditer votre nom"
@@ -14266,36 +14263,36 @@ msgstr ""
 "propos de nos certificats{a_end}."
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
-msgstr "Vous mettez à jour votre enregistrement pour"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
-msgstr "Vous faites une nouvelle vérification pour "
+msgid "You are re-verifying for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
-msgstr "Vous vous inscrivez à"
+msgid "You are enrolling in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
-msgstr "Félicitations ! Vous êtes maintenant inscrit pour auditer le cours"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
 msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
-msgstr "Mise à jour vers :"
+msgid "{span_start}Upgrading to:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
-msgstr "Nouvelle vérification pour : "
+msgid "{span_start}Re-verifying for:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
-msgstr "Inscrit en tant que:"
+msgid "{span_start}Enrolling as:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
 msgid "Technical Requirements"
@@ -16036,6 +16033,15 @@ msgstr ""
 "format GNU Zip) qui contient la structure et le contenu du cours. Vous "
 "pouvez aussi réimporter les cours que vous avez exportés."
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr "Exporter le contenu de mon cours"
@@ -16048,6 +16054,11 @@ msgstr "Exporter le contenu du cours"
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr "Données {em_start}exportées avec{em_end} votre cours :"
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr "Contenu du cours (toutes les sections, sous-sections et unités)"
@@ -16111,16 +16122,12 @@ msgstr "Quelles sont les données exportées ?"
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
-"Seul le contenu du cours et sa structure (en y incluant les sections, les "
-"sous-sections et les unités) sont exportés. Les autres données, comme les "
-"informations sur les étudiants, les informations sur les notes, les données "
-"des discussions des forums, les paramètres du cours, et les informations sur"
-" l'équipe pédagogique, ne seront pas exportées."
 
 #: cms/templates/export.html
 msgid "Opening the downloaded file"
@@ -16137,6 +16144,10 @@ msgstr ""
 " fichier .tar.gz. Les données extraites contiennent le fichier course.xml "
 "ainsi que les sous dossiers qui contiennent le contenu du cours."
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr "Exporter le Cours vers Git"
diff --git a/conf/locale/fr/LC_MESSAGES/djangojs.mo b/conf/locale/fr/LC_MESSAGES/djangojs.mo
index 7a97aaf1df..5a69a5bc4c 100644
Binary files a/conf/locale/fr/LC_MESSAGES/djangojs.mo and b/conf/locale/fr/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/fr/LC_MESSAGES/djangojs.po b/conf/locale/fr/LC_MESSAGES/djangojs.po
index ec0d5a0513..8793602519 100644
--- a/conf/locale/fr/LC_MESSAGES/djangojs.po
+++ b/conf/locale/fr/LC_MESSAGES/djangojs.po
@@ -42,6 +42,7 @@
 # Bertrand Marron <bertrand.marron@gmail.com>, 2014
 # Christopher Castermane <christopher.castermane@student.uclouvain.be>, 2014
 # Encolpe Degoute <inactive+encolpe@transifex.com>, 2013
+# Eric Fortin, 2014
 # Françoise Docq, 2014
 # Gérard Vidal <Gerard.Vidal@ens-lyon.fr>, 2014
 # Dosto92 <hakim.poubelle@gmail.com>, 2014
@@ -66,6 +67,7 @@
 # Eric Fortin, 2014
 # Françoise Docq, 2014
 # Gérard Vidal <Gerard.Vidal@ens-lyon.fr>, 2014
+# Marie-Andrée Coulombe <coulombe.ma@gmail.com>, 2014
 # rafcha <raphael.chay@gmail.com>, 2014
 # Steven BERNARD <steven.bernard@u-paris2.fr>, 2014
 # #-#-#-#-#  underscore-studio.po (edx-platform)  #-#-#-#-#
@@ -82,7 +84,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-24 10:31+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/edx-platform/language/fr/)\n"
@@ -115,8 +117,6 @@ msgstr "OK"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2280,167 +2280,6 @@ msgstr "Répondre"
 msgid "Tags:"
 msgstr "Balises : "
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "%s disponible"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Voici la liste de %s disponibles. Vous pouvez en choisir en les "
-"sélectionnant dans la fenêtre ci-dessous et en cliquant la flèche "
-"\"Choisir\" entre les deux cadres."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "Tapez dans cette case pour filtrer la liste des %s disponibles."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Filtre"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Sélectionner tout"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Cliquer pour sélectionner tous les %s à la fois."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Choisir"
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr "Enlever"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "%s choisi"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Voici la liste de %s sélectionnés. Vous pouvez en enlever en les "
-"sélectionnant dans la fenêtre ci-dessous et en cliquant la flèche "
-"\"Enlever\" entre les deux cadres."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Enlever tout"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Cliquer pour enlever tous les %s à la fois."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(sel)s sur %(cnt)s sélectionné"
-msgstr[1] "%(sel)s sur %(cnt)s sélectionnés"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"Vous n'avez pas enregistré les modifications des champs. Si vous effectuez "
-"quelque chose, vos modifications non enregistrées seront perdues."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Vous avez choisi une action, et pas enregistré les champs que vous avez "
-"modifiés. Cliquez sur \"Oui\" pour enregistrer. Vous devrez ensuite relancer"
-" l'action."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"Vous avez choisi une action, et pas modifié les champs. Vous cherchez "
-"probablement à utiliser le bouton \"Démarrer\" plutôt que \"Enregistrer\"."
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Janvier|Février|Mars|Avril|Mai|Juin|Juillet|Août|Septembre|Octobre|Novembre|Décembre"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "D|L|M|M|J|V|S"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Afficher"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Cacher"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Dimanche|Lundi|Mardi|Mercredi|Jeudi|Vendredi|Samedi"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Maintenant"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Horloge"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Choisissez une date"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Minuit"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6 heures du matin"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Après-midi"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Aujourd'hui"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Calendrier"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Hier"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Demain"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "Afficher la calculatrice"
@@ -3187,6 +3026,10 @@ msgstr "Titre"
 msgid "You have been logged out of your edX account. "
 msgstr "Vous avez été déconnecté de votre compte edX"
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr "Une erreur d'origine inconnue s'est produite."
@@ -3501,10 +3344,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr "Choisir un nouveau fichier"
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3612,6 +3451,10 @@ msgstr ""
 msgid "or"
 msgstr "ou"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "Le Cours doit avoir une date de départ renseignée."
@@ -3933,6 +3776,20 @@ msgstr "Paramètres"
 msgid "New %(component_type)s"
 msgstr "Nouveau %(component_type)s"
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4927,6 +4784,10 @@ msgstr "Actions de la Page"
 msgid "New Group Configuration"
 msgstr "Nouvelle configuration du groupe"
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr "Enlever"
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr "Ajoutez des URL pour des versions supplémentaires"
diff --git a/conf/locale/gl/LC_MESSAGES/django.mo b/conf/locale/gl/LC_MESSAGES/django.mo
index 4b301da941..b231a2173d 100644
Binary files a/conf/locale/gl/LC_MESSAGES/django.mo and b/conf/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/gl/LC_MESSAGES/django.po b/conf/locale/gl/LC_MESSAGES/django.po
index c4cb4df887..fb272f8130 100644
--- a/conf/locale/gl/LC_MESSAGES/django.po
+++ b/conf/locale/gl/LC_MESSAGES/django.po
@@ -46,8 +46,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Luz Varela Armas <luz.armas@udc.es>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/edx-platform/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -112,14 +112,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -211,6 +203,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2219,6 +2212,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2577,23 +2611,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2955,9 +2972,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4123,6 +4141,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5024,15 +5046,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5040,37 +5074,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5311,17 +5333,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5331,7 +5353,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5345,8 +5367,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6532,15 +6554,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6577,7 +6599,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6995,11 +7017,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7160,6 +7177,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7462,6 +7480,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8470,11 +8493,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8487,6 +8505,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9338,9 +9361,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9428,7 +9448,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11226,18 +11245,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12574,6 +12581,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12629,19 +12679,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12649,15 +12699,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14180,6 +14230,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14192,6 +14251,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14250,10 +14314,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14268,6 +14333,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/gl/LC_MESSAGES/djangojs.mo b/conf/locale/gl/LC_MESSAGES/djangojs.mo
index 4d79da7010..1997bf16a3 100644
Binary files a/conf/locale/gl/LC_MESSAGES/djangojs.mo and b/conf/locale/gl/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/gl/LC_MESSAGES/djangojs.po b/conf/locale/gl/LC_MESSAGES/djangojs.po
index a187decb94..93b73c13ee 100644
--- a/conf/locale/gl/LC_MESSAGES/djangojs.po
+++ b/conf/locale/gl/LC_MESSAGES/djangojs.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/edx-platform/language/gl/)\n"
@@ -64,8 +64,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2146,153 +2144,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2951,6 +2802,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3260,10 +3115,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3366,6 +3217,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3650,6 +3505,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4592,6 +4461,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/gu/LC_MESSAGES/django.mo b/conf/locale/gu/LC_MESSAGES/django.mo
index 6fccdfb207..0c62fb75d4 100644
Binary files a/conf/locale/gu/LC_MESSAGES/django.mo and b/conf/locale/gu/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/gu/LC_MESSAGES/django.po b/conf/locale/gu/LC_MESSAGES/django.po
index 0f48314a5c..429b79324c 100644
--- a/conf/locale/gu/LC_MESSAGES/django.po
+++ b/conf/locale/gu/LC_MESSAGES/django.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-05-21 14:09+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Gujarati (http://www.transifex.com/projects/p/edx-platform/language/gu/)\n"
@@ -106,14 +106,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -205,6 +197,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2213,6 +2206,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2571,23 +2605,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2949,9 +2966,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4117,6 +4135,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5018,15 +5040,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5034,37 +5068,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5305,17 +5327,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5325,7 +5347,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5339,8 +5361,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6526,15 +6548,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6571,7 +6593,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6989,11 +7011,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7154,6 +7171,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7456,6 +7474,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8464,11 +8487,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8481,6 +8499,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9332,9 +9355,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9422,7 +9442,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11220,18 +11239,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12568,6 +12575,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12623,19 +12673,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12643,15 +12693,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14174,6 +14224,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14186,6 +14245,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14244,10 +14308,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14262,6 +14327,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/gu/LC_MESSAGES/djangojs.mo b/conf/locale/gu/LC_MESSAGES/djangojs.mo
index 496438bf68..1a9b0713de 100644
Binary files a/conf/locale/gu/LC_MESSAGES/djangojs.mo and b/conf/locale/gu/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/gu/LC_MESSAGES/djangojs.po b/conf/locale/gu/LC_MESSAGES/djangojs.po
index 1b5183cbd5..16deae2386 100644
--- a/conf/locale/gu/LC_MESSAGES/djangojs.po
+++ b/conf/locale/gu/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Gujarati (http://www.transifex.com/projects/p/edx-platform/language/gu/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/he/LC_MESSAGES/django.mo b/conf/locale/he/LC_MESSAGES/django.mo
index 1aa6102788..54e1e9ceac 100644
Binary files a/conf/locale/he/LC_MESSAGES/django.mo and b/conf/locale/he/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/he/LC_MESSAGES/django.po b/conf/locale/he/LC_MESSAGES/django.po
index 189cb0ba70..f7997b7d49 100644
--- a/conf/locale/he/LC_MESSAGES/django.po
+++ b/conf/locale/he/LC_MESSAGES/django.po
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-03-26 18:20+0000\n"
 "Last-Translator: Ido\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/edx-platform/language/he/)\n"
@@ -109,14 +109,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -208,6 +200,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2216,6 +2209,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2574,23 +2608,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2952,9 +2969,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4120,6 +4138,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5021,15 +5043,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5037,37 +5071,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5308,17 +5330,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5328,7 +5350,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5342,8 +5364,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6529,15 +6551,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6574,7 +6596,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6992,11 +7014,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7157,6 +7174,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7459,6 +7477,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8467,11 +8490,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8484,6 +8502,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9335,9 +9358,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9425,7 +9445,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11223,18 +11242,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12571,6 +12578,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12626,19 +12676,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12646,15 +12696,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14177,6 +14227,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14189,6 +14248,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14247,10 +14311,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14265,6 +14330,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/he/LC_MESSAGES/djangojs.mo b/conf/locale/he/LC_MESSAGES/djangojs.mo
index f0e029cc1a..44991e1d2d 100644
Binary files a/conf/locale/he/LC_MESSAGES/djangojs.mo and b/conf/locale/he/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/he/LC_MESSAGES/djangojs.po b/conf/locale/he/LC_MESSAGES/djangojs.po
index 3b773a7beb..c9d41840ff 100644
--- a/conf/locale/he/LC_MESSAGES/djangojs.po
+++ b/conf/locale/he/LC_MESSAGES/djangojs.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/edx-platform/language/he/)\n"
@@ -64,8 +64,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2146,153 +2144,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2951,6 +2802,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3260,10 +3115,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3366,6 +3217,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3650,6 +3505,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4592,6 +4461,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/hi/LC_MESSAGES/django.mo b/conf/locale/hi/LC_MESSAGES/django.mo
index 74cb0f8434..b26b7bd464 100644
Binary files a/conf/locale/hi/LC_MESSAGES/django.mo and b/conf/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/hi/LC_MESSAGES/django.po b/conf/locale/hi/LC_MESSAGES/django.po
index 45ceaa49cf..27fe5849f3 100644
--- a/conf/locale/hi/LC_MESSAGES/django.po
+++ b/conf/locale/hi/LC_MESSAGES/django.po
@@ -39,6 +39,7 @@
 # Goutam Kumar Dey <de_kumargoutam@yahoo.co.in>, 2014
 # gvidushiin <gvidushiin@gmail.com>, 2014
 # TheIllusionistMirage <koushtav@fleptic.eu>, 2014
+# Nitin Madhok <nmadhok@clemson.edu>, 2014
 # Sarina Canelake <sarina@edx.org>, 2014
 # #-#-#-#-#  mako-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file
@@ -71,8 +72,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: ria1234 <contactpayal@yahoo.com.au>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/edx-platform/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -131,14 +132,6 @@ msgstr "यूनिट"
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "ऑनर कोड प्रमाणपत्र"
@@ -231,6 +224,7 @@ msgstr "प्राथमिक / प्राथमिक स्कूल"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 "कोई नहीं\n"
@@ -2270,6 +2264,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "के बारे में"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "सामान्य"
@@ -2628,18 +2662,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "त्रुटि"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -3001,9 +3023,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4211,6 +4234,10 @@ msgstr "डेटा डाउनलोड"
 msgid "Analytics"
 msgstr "एनेलिटिक्स"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
 msgstr "मेट्रिक्स"
@@ -5167,83 +5194,54 @@ msgstr ""
 "प्रोसेसर {0} {1} द्वारा चार्ज की गई राशि कुल लागत {2} {3} की तुलना से अलग "
 "है।"
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"माफ़ कीजिए! हमारे भुगतान प्रोसेसर ने आपके भुगतान को नामंज़ूर कर दिया।\n"
-"उसका फ़ैसला था <span class=\"decision\">{decision}</span>\n"
-"और वजह यह थी <span class=\"reason\">{reason_code}:{reason_msg}</span>।\n"
-"आपको चार्ज नहीं किया गया। कृपया भुगतान का कोई और तरीका अपनाएं।\n"
-"भुगतान-संबंधित सवालों के लिए {email} पर संपर्क करें।\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"माफ़ कीजिए! हमारे भुगतान प्रोसेसर ने हमें एक ऐसी भुगतान पुष्टि भेजी जिसका डाटा ठीक नहीं था!\n"
-"हम शर्मिंदा हैं कि हम यह नहीं जानते कि आपका भुगतान सफ़ल हुआ कि नहीं और न ही हम आपके ऑर्डर को आगे बढ़ा सकते हैं।\n"
-"जो त्रुटि संदेश आया वह यह था: <span class=\"exception_msg\">{msg}</span>।\n"
-"आपके क्रेडिट कार्ड को शायद चार्ज कर लिया गया हो। भुगतान-संबंधित सवालों के लिए {email} पर संपर्क करें।\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"माफ़ कीजिए! एक त्रुटि के कारण आपको आपके कुल ऑर्डर से अलग रकम के लिए चार्ज कर लिया गया!\n"
-"जो त्रुटि संदेश आया वह यह था: <span class=\"exception_msg\">{msg}</span>।\n"
-"आपके क्रेडिट कार्ड को शायद चार्ज कर लिया गया हो। भुगतान-संबंधित सवालों के लिए {email} पर संपर्क करें।\n"
-"</p>"
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-" माफ़ कीजिए! हमारे भुगतान प्रोसेसर ने हमें आपके भुगतान के बारे में ऐसा संदेश भेजा जो कि ठीक नहीं था, तो हम\n"
-"यह वैरिफ़ाई नहीं कर सकते कि यह संदेश वाकई भुगतान प्रोसेसर से आया।\n"
-"जो त्रुटि संदेश आया वह यह था: <span class=\"exception_msg\">{msg}</span>।\n"
-"हम शर्मिंदा हैं कि हम यह नहीं जानते कि आपका भुगतान सफ़ल हुआ कि नहीं और न ही हम आपके ऑर्डर को आगे बढ़ा सकते हैं।\n"
-"आपके क्रेडिट कार्ड को शायद चार्ज कर लिया गया हो। भुगतान-संबंधित सवालों के लिए {email} पर संपर्क करें।\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -5540,17 +5538,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5560,7 +5558,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5574,8 +5572,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6831,16 +6829,16 @@ msgid "Help"
 msgstr "सहायता"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
-msgstr " {} | के लिए अपना रजिस्ट्रेशन अपग्रेड करें। अपना ट्रैक चुनें।"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "{} के लिए पंजीकरण करें| अपना ट्रैक चुनें"
+msgid "Enroll In {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr "क्षमा करें, आपको रजिस्टर करते वक्त कोई त्रुटि हुई"
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -6876,8 +6874,8 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
-msgstr "अपने रजिस्ट्रेशन को अपग्रेड करें"
+msgid "Upgrade Your Enrollment"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Audit This Course"
@@ -7308,11 +7306,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "के बारे में"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7489,6 +7482,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "सबमिट"
 
@@ -7813,6 +7807,11 @@ msgstr "रौ डेटा:"
 msgid "Accepted"
 msgstr "स्वीकार किया गया"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "त्रुटि"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "अस्वीकृत"
@@ -8871,13 +8870,6 @@ msgstr "पाठ्यक्रम देखें"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "यह पाठ्यक्रम आपके  <a href=\"{cart_link}\">cart</a> में है।"
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"कार्ट({currency_symbol}{cost}) में {course.display_number_with_default} "
-"जोड़ें "
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "पाठ्यक्रम पूरा है"
@@ -8890,6 +8882,13 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"कार्ट({currency_symbol}{cost}) में {course.display_number_with_default} "
+"जोड़ें "
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "{course.display_number_with_default} के लिए रजिस्टर करें"
@@ -9809,9 +9808,6 @@ msgstr ": के रूप में नामांकन"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9903,7 +9899,6 @@ msgstr "संग्रहित कोर्स देखें "
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "पाठयक्रम देखें"
 
@@ -11743,18 +11738,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -13207,6 +13190,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr "अपना नाम बदलें"
@@ -13269,19 +13295,19 @@ msgstr ""
 "अक़्सर पूछे गए सवाल{a_end} देखें।"
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
-msgstr "आप अपने रजिस्ट्रेशन को अपग्रेड कर रहे हैं"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
-msgstr "आप फिर से वैरिफ़ाई कर रहें हैः"
+msgid "You are re-verifying for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
-msgstr "आप इस के लिए पंजीकृत हो रहे हैं:"
+msgid "You are enrolling in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -13289,16 +13315,16 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
-msgstr "इसके लिए अपग्रेड कर रहे हैं:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
-msgstr "इसके लिए फिर से वैरिफ़ाई कर रहें हैः"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
-msgstr "इसके रूप में पंजीकृत:"
+msgid "{span_start}Enrolling as:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
 msgid "Technical Requirements"
@@ -14922,6 +14948,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14934,6 +14969,11 @@ msgstr " पाठ्यक्रम विषय वस्तु निर्
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14992,10 +15032,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -15010,6 +15051,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/hi/LC_MESSAGES/djangojs.mo b/conf/locale/hi/LC_MESSAGES/djangojs.mo
index c3779cc963..499a85993e 100644
Binary files a/conf/locale/hi/LC_MESSAGES/djangojs.mo and b/conf/locale/hi/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/hi/LC_MESSAGES/djangojs.po b/conf/locale/hi/LC_MESSAGES/djangojs.po
index 3f753b5e0a..2fc2f8e0ae 100644
--- a/conf/locale/hi/LC_MESSAGES/djangojs.po
+++ b/conf/locale/hi/LC_MESSAGES/djangojs.po
@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/edx-platform/language/hi/)\n"
@@ -73,8 +73,6 @@ msgstr "ठीक"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "रद्द करें"
 
@@ -2163,169 +2161,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "%s जो कि तैयार हैं"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"यह उन %s की सूची है जो कि तैयार हैं। आप इन पर क्लिक कर के इनमें से कुछ नीचे "
-"दिये गये डिब्बे में चुन सकते हैं। इसके लिये चयन करने के बाद दोनों डिब्बों के"
-" बीच में जो \"चुनें\" का तीर है उसे क्लिक करें। "
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-"उन %s की सूची जो कि तैयार हैं को फ़िल्टर करने के लिये इस डिब्बे में टाइप "
-"करें।"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "फ़िल्टर"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "सभी का चुनें"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "सभी %s को एक साथ चुनने के लिए क्लिक करें।"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "चुनें"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "हटाएं"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "चुनी हुई %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"यह चुने हुये %s की सूची है। आप इन में से कुछ को हटा सकते हैं। इसके लिये पहले"
-" नीचे दिये गये डिब्बे में उनको चुनें ओर फिर दोनों डिब्बों के बीच में जो "
-"\"हटाएँ\" का तीर है उसे क्लिक करें। "
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "सब हटायें"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "सभी %s को एक साथ हटाने करने के लिए क्लिक करें।"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(cnt)s में से %(sel)s चुना हुआ है"
-msgstr[1] "%(cnt)s में से %(sel)s चुनें हुए हैं "
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"अलग-अलग बदले जाने वाले क्षेत्रों में आपके द्वारा किये गये परिवर्तन अभी सेव "
-"नहीं हुये हैं। अगर आप इससे आगे कोई क्रिया करते हैं तो ये परिवर्तन रद्द हो "
-"जायेंगे।"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"आपने एक क्रिया को चुना है लेकिन आपने अलग-अलग क्षेत्रों में किये हुये अपने "
-"परिवर्तनों को अभी तक सेव नहीं किया है। इन्हें सेव करने के लिये कृपया \"ओके\""
-" क्लिक करें। आपको यह क्रिया दोबारा करनी पड़ेगी।"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"आपने एक क्रिया को चुना है, और आपने अलग-अलग क्षेत्रों में कोई परिवर्तन नहीं "
-"किये हैं। आप शायद सेव बटन की जगह \"गो\" बटन ढूँढ रहे हैं।"
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"जनवरी|फ़रवरी|मार्च|अप्रैल|मई|जून|जुलाई|अगस्त|सितम्बर|अक्टूबर|नवम्बर|दिसम्बर"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "र|सो|मं|बु|गु|शु|श"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "दिखाएं"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "छिपाएं"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "रविवार|सोमवार|मंगलवार|बुधवार|गुरुवार|शुक्रवार|शनिवार"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "अभी"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "घड़ी"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "समय का चयन करें"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "मध्यरात्रि"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "प्रातः ६ बजे"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "दोपहर"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "आज"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "कैलेंडर"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "कल"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "कल"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "कैलक्यूलेटर खोलें"
@@ -3012,6 +2847,10 @@ msgstr "शीर्षक"
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3323,10 +3162,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3431,6 +3266,10 @@ msgstr ""
 msgid "or"
 msgstr "या"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "इस पाठ्यक्रम के प्रारंभ होने की तिथि होनी चाहिए."
@@ -3730,6 +3569,20 @@ msgstr "सेटिंग्स"
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4678,6 +4531,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/hr/LC_MESSAGES/django.mo b/conf/locale/hr/LC_MESSAGES/django.mo
index 5c1095a156..609169f554 100644
Binary files a/conf/locale/hr/LC_MESSAGES/django.mo and b/conf/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/hr/LC_MESSAGES/django.po b/conf/locale/hr/LC_MESSAGES/django.po
index 7c7461340f..387c213dca 100644
--- a/conf/locale/hr/LC_MESSAGES/django.po
+++ b/conf/locale/hr/LC_MESSAGES/django.po
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-10-11 01:50+0000\n"
 "Last-Translator: Dee Tokmadzic\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/edx-platform/language/hr/)\n"
@@ -109,14 +109,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -208,6 +200,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2218,6 +2211,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2576,23 +2610,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2954,9 +2971,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4122,6 +4140,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5025,15 +5047,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5041,37 +5075,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5312,17 +5334,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5332,7 +5354,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5346,8 +5368,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6533,15 +6555,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6578,7 +6600,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6996,11 +7018,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7161,6 +7178,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7463,6 +7481,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8473,11 +8496,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8490,6 +8508,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9341,9 +9364,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9431,7 +9451,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11231,18 +11250,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12579,6 +12586,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12634,19 +12684,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12654,15 +12704,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14185,6 +14235,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14197,6 +14256,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14255,10 +14319,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14273,6 +14338,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/hr/LC_MESSAGES/djangojs.mo b/conf/locale/hr/LC_MESSAGES/djangojs.mo
index 8d51ac1135..3949fe8c3f 100644
Binary files a/conf/locale/hr/LC_MESSAGES/djangojs.mo and b/conf/locale/hr/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/hr/LC_MESSAGES/djangojs.po b/conf/locale/hr/LC_MESSAGES/djangojs.po
index a9b8f41c9d..1a4a20c478 100644
--- a/conf/locale/hr/LC_MESSAGES/djangojs.po
+++ b/conf/locale/hr/LC_MESSAGES/djangojs.po
@@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-25 14:30+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/edx-platform/language/hr/)\n"
@@ -63,8 +63,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2164,154 +2162,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2970,6 +2820,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3286,10 +3140,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3392,6 +3242,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3678,6 +3532,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4621,6 +4489,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/hu/LC_MESSAGES/django.mo b/conf/locale/hu/LC_MESSAGES/django.mo
index d85b026d88..e34c183eb5 100644
Binary files a/conf/locale/hu/LC_MESSAGES/django.mo and b/conf/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/hu/LC_MESSAGES/django.po b/conf/locale/hu/LC_MESSAGES/django.po
index d8c06ef169..1e0c5a9a1e 100644
--- a/conf/locale/hu/LC_MESSAGES/django.po
+++ b/conf/locale/hu/LC_MESSAGES/django.po
@@ -54,8 +54,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-10-27 06:50+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 18:31+0000\n"
 "Last-Translator: Keleti László <lkeleti@wininvestor.hu>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/edx-platform/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -120,14 +120,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -219,6 +211,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2227,6 +2220,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2585,23 +2619,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2963,9 +2980,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4131,6 +4149,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5032,15 +5054,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5048,37 +5082,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5319,17 +5341,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5339,7 +5361,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5353,8 +5375,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6540,15 +6562,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6585,7 +6607,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7003,11 +7025,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7168,6 +7185,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7470,6 +7488,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8478,11 +8501,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8495,6 +8513,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9346,9 +9369,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9436,7 +9456,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11234,18 +11253,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12582,6 +12589,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12637,19 +12687,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12657,15 +12707,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14188,6 +14238,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14200,6 +14259,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14258,10 +14322,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14276,6 +14341,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/hu/LC_MESSAGES/djangojs.mo b/conf/locale/hu/LC_MESSAGES/djangojs.mo
index 8c9e7e3327..5d54fb0951 100644
Binary files a/conf/locale/hu/LC_MESSAGES/djangojs.mo and b/conf/locale/hu/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/hu/LC_MESSAGES/djangojs.po b/conf/locale/hu/LC_MESSAGES/djangojs.po
index 089ec5c39c..8a4d98b15c 100644
--- a/conf/locale/hu/LC_MESSAGES/djangojs.po
+++ b/conf/locale/hu/LC_MESSAGES/djangojs.po
@@ -31,8 +31,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
-"PO-Revision-Date: 2014-10-26 17:42+0000\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
+"PO-Revision-Date: 2014-10-28 11:31+0000\n"
 "Last-Translator: Keleti László <lkeleti@wininvestor.hu>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/edx-platform/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -64,8 +64,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2146,153 +2144,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2951,6 +2802,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3260,10 +3115,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3366,6 +3217,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3650,6 +3505,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4592,6 +4461,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/hy_AM/LC_MESSAGES/django.mo b/conf/locale/hy_AM/LC_MESSAGES/django.mo
index ef65bf310e..a75af9d264 100644
Binary files a/conf/locale/hy_AM/LC_MESSAGES/django.mo and b/conf/locale/hy_AM/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/hy_AM/LC_MESSAGES/django.po b/conf/locale/hy_AM/LC_MESSAGES/django.po
index ac1915619c..60b0943618 100644
--- a/conf/locale/hy_AM/LC_MESSAGES/django.po
+++ b/conf/locale/hy_AM/LC_MESSAGES/django.po
@@ -61,8 +61,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: emma_saroyan <Emma_Saroyan@aybschool.am>\n"
 "Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/edx-platform/language/hy_AM/)\n"
 "MIME-Version: 1.0\n"
@@ -123,14 +123,6 @@ msgstr "Միավոր"
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "Պատվո կոդի հավաստագիր:"
@@ -224,6 +216,7 @@ msgstr "տարրական դպրոց"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "Ոչ մեկը"
 
@@ -2271,6 +2264,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "Մասին"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "Ընդհանուր"
@@ -2629,23 +2662,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr "Զգուշացում"
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "Սխալ"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr "Ընտրված չէ"
@@ -3016,9 +3032,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4225,6 +4242,10 @@ msgstr "Տվյալների ներբեռնում"
 msgid "Analytics"
 msgstr "Հաշվարկներ"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5172,62 +5193,53 @@ msgstr ""
 "Մշակման {0} {1} -ի կողմից գանձված գումարը տարբեր է պատվեր {2} {3}-ի "
 "ամբողջական արժեքից:"
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
+
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Ներողություն։ Մեր վճարման համակարգը չի ընդունել Ձեր վճարումը։\n"
-"            Համակարգի վերադարձրած որոշումը հետևյալն է` <span class=\"decision\">{decision}</span>,\n"
-"            իսկ պատճառը` <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            Ձեզանից գումար չի գանձվել։ Խնդրում ենք փորձել վճարման այլ եղանակ։\n"
-"            Վճարման հետ կապված հարցերով կապվեք մեզ հետ {email} հասցեով։\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5509,17 +5521,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5529,7 +5541,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5543,8 +5555,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6832,16 +6844,16 @@ msgid "Help"
 msgstr "Օգնություն"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
-msgstr "Բարելավե՛ք Ձեր գրանցումը {}-ի համար: Ընտրե՛ք Ձեր ուղին"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "Գրանցվե՛ք {}-ի համար | Ընտրեք Ձեր ուղին"
+msgid "Enroll In {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr "Ներողություն ենք խնդրում, Ձեր գրանցման ընթացքում սխալ է տեղի ունեցել"
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -6877,8 +6889,8 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
-msgstr "Թարմացնել Ձեր գրանցումը"
+msgid "Upgrade Your Enrollment"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Audit This Course"
@@ -7323,11 +7335,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "Մասին"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7508,6 +7515,7 @@ msgstr "Ներառե՛ք սխալների հաղորդագրություններ
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "Հանձնել"
 
@@ -7839,6 +7847,11 @@ msgstr "Չմշակված տվյալներ`"
 msgid "Accepted"
 msgstr "ընդունված"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "Սխալ"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "մերժված"
@@ -8884,11 +8897,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "Դասընթացը լի է"
@@ -8901,6 +8909,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9779,9 +9792,6 @@ msgstr "Ընդգրկված է որպես`"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9869,7 +9879,6 @@ msgstr "Դիտել արխիվացված դասընթացը"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "Նայել դասընթացը"
 
@@ -11715,18 +11724,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr "Ակտիվ ուսանողներ"
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr "Գնահատականների բաշխումը"
@@ -13069,6 +13066,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr "Խմբագրել Ձեր անունը"
@@ -13126,19 +13166,19 @@ msgstr ""
 "տրվող հարցերը տեսնելու համար{a_end}:"
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
-msgstr "Դուք գրանցվում եք .. համար"
+msgid "You are enrolling in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -13146,16 +13186,16 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
-msgstr "Գրանցվել որպես`"
+msgid "{span_start}Enrolling as:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
 msgid "Technical Requirements"
@@ -14677,6 +14717,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14689,6 +14738,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14747,10 +14801,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14765,6 +14820,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/hy_AM/LC_MESSAGES/djangojs.mo b/conf/locale/hy_AM/LC_MESSAGES/djangojs.mo
index c7e6d1fed4..26d5f2ae25 100644
Binary files a/conf/locale/hy_AM/LC_MESSAGES/djangojs.mo and b/conf/locale/hy_AM/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/hy_AM/LC_MESSAGES/djangojs.po b/conf/locale/hy_AM/LC_MESSAGES/djangojs.po
index d5d6740657..6bdf5efa03 100644
--- a/conf/locale/hy_AM/LC_MESSAGES/djangojs.po
+++ b/conf/locale/hy_AM/LC_MESSAGES/djangojs.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/edx-platform/language/hy_AM/)\n"
@@ -67,8 +67,6 @@ msgstr "լավ"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "չեղարկել"
 
@@ -2114,165 +2112,6 @@ msgstr "Պատասխան"
 msgid "Tags:"
 msgstr "Պիտակներ`"
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "Հասանելի %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Սա հասանելի %s-երի ցուցակն է: Դուք կարող եք ընտրել որոշները ստորև արկղից և "
-"հետո սեղմել երկու արկղերի միջև գտնվող \"Choose\" սլաքը:"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "Գրե՛ք այս դաշտում հասանելի %s-երի ցուցակը զտելու համար։"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "ֆիլտր"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Ընտրել բոլորը"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Սեղմե՛լ` ընտրելու համար բոլոր %s-երը միանգամից"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "ընտրել"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "հեռացնել"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "ընտրված %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Սա ընտրված %s-երի ցուցակն է: Դուք կարող ես հեռացնել որոշները, ընտրելով նրանց"
-" վրա ստորև արկղում և հետո սեղմելով երկու արկղերի միջև գտնվող \"Remove\" "
-"սլաքը:"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "հեռացնել բոլորը"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Սեղմե՛լ՝ հեռացնելու համար բոլորը %s-երը միանգամից"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(cnt)s-ից %(sel)s-ը ընտրված է"
-msgstr[1] "%(cnt)s-ից %(sel)s-ը ընտրված են"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"Դուք ունեք չպահպանված փոփոխություններ Ձեր անհատական խմբագրման ենթակա դաշտի "
-"վրա: Եթե որևէ գործողություն անեք, Ձեր չպահպանված փոփոխությունները կկորչեն:"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Դուք ընտրել եք գործողություն, բայց դեռ չեք պահպանել քո կատարած "
-"փոփոխություններն անհատական դաշտի վրա: Խնդրում ենք սեղմել OK պահպանելու "
-"համար: Դուք պետք է կրկին աշխատեցնեք գործողությունը: "
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"Դուք ընտրել եք գործողությունը և չեք արել որևէ փոփոխություն անհատական դաշտի "
-"վրա: Դուք հավանաբար փնտրում եք Go կոճակը, այլ ոչ թե՝ Save կոճակը:"
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Հունվար/Փետրվար/Մարտ/Ապրիլ/Մայիս/Հունիս/Հուլիս/Օգոստոս/Սեպտեմբեր/Հոկտեմբեր/Նոյեմբեր/Դեկտեմբեր"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "S|M|T|W|T|F|S"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "ցուցադրել"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "թաքցնել"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Կիրակի|Երկուշաբթի|Երեքշաբթի|Չորեքշաբթի|Հինգշաբթի|Ուրբաթ|Շաբաթ"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "հիմա"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "ժամացույց"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "ընտրել ժամանակը"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "կեսգիշեր"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6:00"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "կեսօր"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "այսօր"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "օրացույց"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "երեկ"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "վաղը"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "Բացել հաշվիչը"
@@ -2969,6 +2808,10 @@ msgstr "վերնագիր"
 msgid "You have been logged out of your edX account. "
 msgstr "Դուք դուրս եք եկել Ձեր edX-ի էջից"
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr "Անհայտ սխալ է տեղի ունեցել:"
@@ -3278,10 +3121,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3384,6 +3223,10 @@ msgstr ""
 msgid "or"
 msgstr "կամ"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3667,6 +3510,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4609,6 +4466,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/id/LC_MESSAGES/django.mo b/conf/locale/id/LC_MESSAGES/django.mo
index d9aa9d1366..efe395bf9a 100644
Binary files a/conf/locale/id/LC_MESSAGES/django.mo and b/conf/locale/id/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/id/LC_MESSAGES/django.po b/conf/locale/id/LC_MESSAGES/django.po
index 1b26333d6c..7ab34b68a0 100644
--- a/conf/locale/id/LC_MESSAGES/django.po
+++ b/conf/locale/id/LC_MESSAGES/django.po
@@ -65,7 +65,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-08-25 20:21+0000\n"
 "Last-Translator: lusiana <lusiana.rumintang@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/edx-platform/language/id/)\n"
@@ -131,14 +131,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -230,6 +222,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2236,6 +2229,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2594,23 +2628,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2972,9 +2989,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4140,6 +4158,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5039,15 +5061,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5055,37 +5089,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5326,17 +5348,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5346,7 +5368,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5360,8 +5382,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6547,15 +6569,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6592,7 +6614,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7010,11 +7032,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7175,6 +7192,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7477,6 +7495,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8483,11 +8506,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8500,6 +8518,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9351,9 +9374,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9441,7 +9461,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11237,18 +11256,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12585,6 +12592,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12640,19 +12690,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12660,15 +12710,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14191,6 +14241,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14203,6 +14262,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14261,10 +14325,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14279,6 +14344,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/id/LC_MESSAGES/djangojs.mo b/conf/locale/id/LC_MESSAGES/djangojs.mo
index 333df51caf..db7b650e02 100644
Binary files a/conf/locale/id/LC_MESSAGES/djangojs.mo and b/conf/locale/id/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/id/LC_MESSAGES/djangojs.po b/conf/locale/id/LC_MESSAGES/djangojs.po
index 77b43923cb..a04ce08efa 100644
--- a/conf/locale/id/LC_MESSAGES/djangojs.po
+++ b/conf/locale/id/LC_MESSAGES/djangojs.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/edx-platform/language/id/)\n"
@@ -71,8 +71,6 @@ msgstr "OK"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "Batal"
 
@@ -2142,162 +2140,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "Tersedia %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Ini adalah daftar %s yang tersedia. Anda bisa tentukan beberapa dengan "
-"memilih mereka pada kotak di bawah dan lalu klik panah \"Pilih\" di antara "
-"dua kotak. "
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "Ketik pada kotak ini untuk menyaring daftar %s yang tersedia."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Saring"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Pilih semua"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Klik untuk memilih semua %s sekaligus."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Pilih"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "Hapus"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "%s terpilih"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Ini adalah daftar %s yang dipilih. Anda bisa menghapus beberapa dengan "
-"memilih pada kotak di bawah lalu klik panah \"Hapus\" di antara dua kotak."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Hapus semua"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Klik untuk menghapus semua pilihan %s sekaligus."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"Pembaruan Anda pada isian individual belum disimpan.  Jika Anda melanjutkan "
-"aksi ini, pembaruan  yang belum disimpan akan hilang."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Anda telah memilih suatu aksi, tapi belum menyimpan perubahan Anda atas "
-"isian individual. Harap klik OK untuk menyimpan. Anda perlu menjalankan "
-"ulang aksinya."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Januari|Februari|Maret|April|Mei|Juni|Juli|Agustus|September|Oktober|November|Desember"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "M|S|S|R|K|J|S"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Tampilkan"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Sembunyikan"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Minggu|Senin|Selasa|Rabu|Kamis|Jum'at|Sabtu"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Sekarang"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Jam"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Pilih waktu"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Tengah malam"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6 pagi"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Siang"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Hari ini"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Kalender"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Kemarin"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Esok"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "Buka Kalkulator"
@@ -2958,6 +2800,10 @@ msgstr "Heading"
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3262,10 +3108,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3370,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr "atau"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "Kursus harus memiliki tanggal mulai."
@@ -3661,6 +3507,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4609,6 +4469,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/it_IT/LC_MESSAGES/django.mo b/conf/locale/it_IT/LC_MESSAGES/django.mo
index a8c96379d8..bc41d4cf07 100644
Binary files a/conf/locale/it_IT/LC_MESSAGES/django.mo and b/conf/locale/it_IT/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/it_IT/LC_MESSAGES/django.po b/conf/locale/it_IT/LC_MESSAGES/django.po
index 7f43c92389..4781783c12 100644
--- a/conf/locale/it_IT/LC_MESSAGES/django.po
+++ b/conf/locale/it_IT/LC_MESSAGES/django.po
@@ -8,11 +8,13 @@
 # AleksandraS. <a_serafimovska@hotmail.com>, 2014
 # gianmarco <gianmarco.bonavolonta@tlc.uniroma3.it>, 2014
 # gianmarco <gianmarco.bonavolonta@tlc.uniroma3.it>, 2014
+# Giorgio Att <attorresi.giorgio@gmail.com>, 2014
 # Giulio Gratta, 2014
 # mZakk <ingmazk@gmail.com>, 2014
 # maurimonti <maurimonti@msn.com>, 2014
 # Monica Maria Crapanzano <m.crapanzano@estartup.it>, 2013
 # Monica Maria Crapanzano <m.crapanzano@estartup.it>, 2013
+# Pietro Lombardo <pietrolombardo1979@gmail.com>, 2014
 # #-#-#-#-#  django-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file.
 # Copyright (C) 2014 EdX
@@ -36,6 +38,7 @@
 # LILLITH, 2014
 # gianmarco <gianmarco.bonavolonta@tlc.uniroma3.it>, 2014
 # gianmarco <gianmarco.bonavolonta@tlc.uniroma3.it>, 2014
+# Giorgio Att <attorresi.giorgio@gmail.com>, 2014
 # Giulio Gratta, 2014
 # GT <gt@2gtrad.com>, 2014
 # Ivo Forni <ivoforni@gmail.com>, 2014
@@ -84,8 +87,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Giulio Gratta\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/edx-platform/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -150,14 +153,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -249,6 +244,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2252,6 +2248,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "Chi siamo"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2610,23 +2646,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2988,9 +3007,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4154,6 +4174,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5043,15 +5067,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5059,37 +5095,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5330,17 +5354,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5350,7 +5374,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5364,8 +5388,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6562,15 +6586,15 @@ msgid "Help"
 msgstr "Aiuto"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6607,7 +6631,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7025,11 +7049,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "Chi siamo"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7190,6 +7209,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7492,6 +7512,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8500,11 +8525,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8517,6 +8537,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9368,9 +9393,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9458,7 +9480,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11254,18 +11275,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12602,6 +12611,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12657,19 +12709,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12677,15 +12729,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14209,6 +14261,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14221,6 +14282,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14279,10 +14345,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14297,6 +14364,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/it_IT/LC_MESSAGES/djangojs.mo b/conf/locale/it_IT/LC_MESSAGES/djangojs.mo
index 92308fc5ee..b3bdcaf137 100644
Binary files a/conf/locale/it_IT/LC_MESSAGES/djangojs.mo and b/conf/locale/it_IT/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/it_IT/LC_MESSAGES/djangojs.po b/conf/locale/it_IT/LC_MESSAGES/djangojs.po
index f4ca144361..7956ab9048 100644
--- a/conf/locale/it_IT/LC_MESSAGES/djangojs.po
+++ b/conf/locale/it_IT/LC_MESSAGES/djangojs.po
@@ -13,14 +13,18 @@
 # gianlorenzo <gianlo86@gmail.com>, 2013
 # gianmarco <gianmarco.bonavolonta@tlc.uniroma3.it>, 2014
 # gianmarco <gianmarco.bonavolonta@tlc.uniroma3.it>, 2014
+# Giorgio Att <attorresi.giorgio@gmail.com>, 2014
 # Giulio Gratta, 2014
 # GT <gt@2gtrad.com>, 2014
 # LILLITH, 2014
+# Marco Ermini <marco.ermini@gmail.com>, 2014
 # marcore <mrc.re@tiscali.it>, 2014
 # Monica Maria Crapanzano <m.crapanzano@estartup.it>, 2013
 # Monica Maria Crapanzano <m.crapanzano@estartup.it>, 2013
 # marcore <mrc.re@tiscali.it>, 2014
 # Nicola Moretto <nmoretto-transifex@yahoo.it>, 2014
+# Pietro Lombardo <pietrolombardo1979@gmail.com>, 2014
+# Sarina Canelake <sarina@edx.org>, 2014
 # #-#-#-#-#  djangojs-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file.
 # Copyright (C) 2014 EdX
@@ -34,16 +38,19 @@
 # gianmarco <gianmarco.bonavolonta@tlc.uniroma3.it>, 2014
 # Giulio Gratta, 2014
 # Giulio Gratta, 2014
+# Marco Ermini <marco.ermini@gmail.com>, 2014
 # marcore <mrc.re@tiscali.it>, 2014
 # marziotta <marzia.neri@gmail.com>, 2014
 # Monica Maria Crapanzano <m.crapanzano@estartup.it>, 2013
 # marcore <mrc.re@tiscali.it>, 2014
+# Pietro Lombardo <pietrolombardo1979@gmail.com>, 2014
 # #-#-#-#-#  underscore.po (edx-platform)  #-#-#-#-#
 # edX translation file
 # Copyright (C) 2014 edX
 # This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
 # 
 # Translators:
+# Pietro Lombardo <pietrolombardo1979@gmail.com>, 2014
 # #-#-#-#-#  underscore-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file
 # Copyright (C) 2014 edX
@@ -51,13 +58,14 @@
 # 
 # Translators:
 # anna.ghetti <anna.ghetti@student.unife.it>, 2014
+# Pietro Lombardo <pietrolombardo1979@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
-"PO-Revision-Date: 2014-10-08 18:08+0000\n"
-"Last-Translator: Sarina Canelake <sarina@edx.org>\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
+"PO-Revision-Date: 2014-10-30 09:54+0000\n"
+"Last-Translator: Pietro Lombardo <pietrolombardo1979@gmail.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/edx-platform/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,8 +96,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2170,154 +2176,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Gennaio|Febbraio|Marzo|Aprile|Maggio|Giugno|Luglio|Agosto|Settembre|Ottobre|Novembre|Dicembre"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "D|L|M|M|G|V|S"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Domenica|Lunedì|Martedì|Mercoledì|Giovedì|Venerdì|Sabato"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2976,6 +2834,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3285,10 +3147,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3393,6 +3251,10 @@ msgstr ""
 msgid "or"
 msgstr "o"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "Deve essere assegnata una data di inizio per il corso"
@@ -3693,6 +3555,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4640,6 +4516,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/ja_JP/LC_MESSAGES/django.mo b/conf/locale/ja_JP/LC_MESSAGES/django.mo
index 61ab7c57e0..2481afa14b 100644
Binary files a/conf/locale/ja_JP/LC_MESSAGES/django.mo and b/conf/locale/ja_JP/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ja_JP/LC_MESSAGES/django.po b/conf/locale/ja_JP/LC_MESSAGES/django.po
index 2f413629c4..0e810f754b 100644
--- a/conf/locale/ja_JP/LC_MESSAGES/django.po
+++ b/conf/locale/ja_JP/LC_MESSAGES/django.po
@@ -80,8 +80,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: h_yoshida <h_yoshida@matsumo-sys.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/edx-platform/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -146,14 +146,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -245,6 +237,7 @@ msgstr "小学校卒"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "なし"
 
@@ -2251,6 +2244,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2609,23 +2643,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2987,9 +3004,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4153,6 +4171,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5052,15 +5074,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5068,37 +5102,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5339,17 +5361,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5359,7 +5381,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5373,8 +5395,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6562,15 +6584,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6607,7 +6629,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7025,11 +7047,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7191,6 +7208,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7493,6 +7511,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8500,11 +8523,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8517,6 +8535,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9368,9 +9391,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9458,7 +9478,6 @@ msgstr "講座画面へ（修了証発行済）"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11255,18 +11274,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12603,6 +12610,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12658,19 +12708,19 @@ msgid ""
 msgstr "{a_start}修了証についてのよくある質問{a_end} をご一読ください。"
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12678,15 +12728,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14209,6 +14259,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14221,6 +14280,11 @@ msgstr "コースのコンテンツをエクスポートする"
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14279,10 +14343,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14297,6 +14362,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/ja_JP/LC_MESSAGES/djangojs.mo b/conf/locale/ja_JP/LC_MESSAGES/djangojs.mo
index a407a064a7..e389092064 100644
Binary files a/conf/locale/ja_JP/LC_MESSAGES/djangojs.mo and b/conf/locale/ja_JP/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ja_JP/LC_MESSAGES/djangojs.po b/conf/locale/ja_JP/LC_MESSAGES/djangojs.po
index 0a4ae3ad8c..2024549aeb 100644
--- a/conf/locale/ja_JP/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ja_JP/LC_MESSAGES/djangojs.po
@@ -42,7 +42,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/edx-platform/language/ja_JP/)\n"
@@ -75,8 +75,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2138,152 +2136,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "フィルタ"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2942,6 +2794,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3244,10 +3100,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3350,6 +3202,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3632,6 +3488,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4573,6 +4443,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/kk_KZ/LC_MESSAGES/django.mo b/conf/locale/kk_KZ/LC_MESSAGES/django.mo
index d10069ce48..ea265aef24 100644
Binary files a/conf/locale/kk_KZ/LC_MESSAGES/django.mo and b/conf/locale/kk_KZ/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/kk_KZ/LC_MESSAGES/django.po b/conf/locale/kk_KZ/LC_MESSAGES/django.po
index ea65b97785..063f0381fd 100644
--- a/conf/locale/kk_KZ/LC_MESSAGES/django.po
+++ b/conf/locale/kk_KZ/LC_MESSAGES/django.po
@@ -51,8 +51,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Ablai <a.zhastalapov@ecc.kz>\n"
 "Language-Team: Kazakh (Kazakhstan) (http://www.transifex.com/projects/p/edx-platform/language/kk_KZ/)\n"
 "MIME-Version: 1.0\n"
@@ -117,14 +117,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -216,6 +208,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2222,6 +2215,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2580,23 +2614,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2958,9 +2975,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4126,6 +4144,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5025,15 +5047,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5041,37 +5075,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5312,17 +5334,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5332,7 +5354,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5346,8 +5368,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6533,15 +6555,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6578,7 +6600,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6996,11 +7018,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7161,6 +7178,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7463,6 +7481,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8469,11 +8492,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8486,6 +8504,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9337,9 +9360,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9427,7 +9447,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11223,18 +11242,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12571,6 +12578,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12626,19 +12676,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12646,15 +12696,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14177,6 +14227,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14189,6 +14248,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14247,10 +14311,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14265,6 +14330,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/kk_KZ/LC_MESSAGES/djangojs.mo b/conf/locale/kk_KZ/LC_MESSAGES/djangojs.mo
index e3a9e20f28..0ee745b5b5 100644
Binary files a/conf/locale/kk_KZ/LC_MESSAGES/djangojs.mo and b/conf/locale/kk_KZ/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/kk_KZ/LC_MESSAGES/djangojs.po b/conf/locale/kk_KZ/LC_MESSAGES/djangojs.po
index 0db2088896..d1c7bb3b7d 100644
--- a/conf/locale/kk_KZ/LC_MESSAGES/djangojs.po
+++ b/conf/locale/kk_KZ/LC_MESSAGES/djangojs.po
@@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Kazakh (Kazakhstan) (http://www.transifex.com/projects/p/edx-platform/language/kk_KZ/)\n"
@@ -63,8 +63,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2126,152 +2124,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2930,6 +2782,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3232,10 +3088,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3338,6 +3190,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3620,6 +3476,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4561,6 +4431,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/km_KH/LC_MESSAGES/django.mo b/conf/locale/km_KH/LC_MESSAGES/django.mo
index 59ddfdce28..d1a257d54e 100644
Binary files a/conf/locale/km_KH/LC_MESSAGES/django.mo and b/conf/locale/km_KH/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/km_KH/LC_MESSAGES/django.po b/conf/locale/km_KH/LC_MESSAGES/django.po
index 2e09fa9193..0bf67cd853 100644
--- a/conf/locale/km_KH/LC_MESSAGES/django.po
+++ b/conf/locale/km_KH/LC_MESSAGES/django.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-07-22 14:02+0000\n"
 "Last-Translator: vireax\n"
 "Language-Team: Khmer (Cambodia) (http://www.transifex.com/projects/p/edx-platform/language/km_KH/)\n"
@@ -106,14 +106,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -205,6 +197,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5014,15 +5036,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5030,37 +5064,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5301,17 +5323,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5321,7 +5343,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5335,8 +5357,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6522,15 +6544,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6567,7 +6589,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6985,11 +7007,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7150,6 +7167,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7452,6 +7470,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8458,11 +8481,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8475,6 +8493,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9326,9 +9349,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9416,7 +9436,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11212,18 +11231,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12560,6 +12567,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12615,19 +12665,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12635,15 +12685,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14166,6 +14216,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14178,6 +14237,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14236,10 +14300,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14254,6 +14319,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/km_KH/LC_MESSAGES/djangojs.mo b/conf/locale/km_KH/LC_MESSAGES/djangojs.mo
index efde808dbb..0b65b07a9b 100644
Binary files a/conf/locale/km_KH/LC_MESSAGES/djangojs.mo and b/conf/locale/km_KH/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/km_KH/LC_MESSAGES/djangojs.po b/conf/locale/km_KH/LC_MESSAGES/djangojs.po
index 38f79974b0..4cbe5d8ff3 100644
--- a/conf/locale/km_KH/LC_MESSAGES/djangojs.po
+++ b/conf/locale/km_KH/LC_MESSAGES/djangojs.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Khmer (Cambodia) (http://www.transifex.com/projects/p/edx-platform/language/km_KH/)\n"
@@ -60,8 +60,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2123,152 +2121,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2927,6 +2779,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3229,10 +3085,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3335,6 +3187,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3617,6 +3473,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4558,6 +4428,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/kn/LC_MESSAGES/django.mo b/conf/locale/kn/LC_MESSAGES/django.mo
index e1a25cd48e..3204ec5020 100644
Binary files a/conf/locale/kn/LC_MESSAGES/django.mo and b/conf/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/kn/LC_MESSAGES/django.po b/conf/locale/kn/LC_MESSAGES/django.po
index dada6aaafa..f7d3848181 100644
--- a/conf/locale/kn/LC_MESSAGES/django.po
+++ b/conf/locale/kn/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-05-05 13:09+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/edx-platform/language/kn/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2209,6 +2202,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2567,23 +2601,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2945,9 +2962,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4113,6 +4131,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5012,15 +5034,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5028,37 +5062,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5299,17 +5321,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5319,7 +5341,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5333,8 +5355,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6520,15 +6542,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6565,7 +6587,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6983,11 +7005,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7148,6 +7165,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7450,6 +7468,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8456,11 +8479,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8473,6 +8491,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9324,9 +9347,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9414,7 +9434,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11210,18 +11229,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12558,6 +12565,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12613,19 +12663,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12633,15 +12683,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14164,6 +14214,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14176,6 +14235,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14234,10 +14298,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14252,6 +14317,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/kn/LC_MESSAGES/djangojs.mo b/conf/locale/kn/LC_MESSAGES/djangojs.mo
index 2baed454d6..e4bc16274a 100644
Binary files a/conf/locale/kn/LC_MESSAGES/djangojs.mo and b/conf/locale/kn/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/kn/LC_MESSAGES/djangojs.po b/conf/locale/kn/LC_MESSAGES/djangojs.po
index d121fadb00..81091d8f48 100644
--- a/conf/locale/kn/LC_MESSAGES/djangojs.po
+++ b/conf/locale/kn/LC_MESSAGES/djangojs.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/edx-platform/language/kn/)\n"
@@ -61,8 +61,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2124,153 +2122,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "%sಲಭ್ಯವಿರುವ"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"ಈ ಲಭ್ಯವಿರುವ %s ಪಟ್ಟಿ. ನೀವು ಕೆಳಗೆ ಬಾಕ್ಸ್ ಅವರನ್ನು ಆಯ್ಕೆ ತದನಂತರ ಎರಡು "
-"ಪೆಟ್ಟಿಗೆಗಳು ನಡುವೆ \"ಆಯ್ಕೆ\" ಬಾಣದ ಕ್ಲಿಕ್ಕಿಸಿ ಕೆಲವು ಆಯ್ಕೆ ಮಾಡಬಹುದು."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "ಲಭ್ಯವಿರುವ %s ಪಟ್ಟಿಯನ್ನು ಕೆಳಗೆ ಫಿಲ್ಟರ್ ಈ ಬಾಕ್ಸ್ನಲ್ಲಿ ಟೈಪ್."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "ಶೋಧಕ"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "ಎಲ್ಲಾ ಆರಿಸಿ"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "ಏಕಕಾಲದಲ್ಲಿ ಆಯ್ಕೆ %s ಕ್ಲಿಕ್ ಮಾಡಿ."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "ಆಯ್ಕೆ"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "ತೆಗೆದುಹಾಕುವುದು"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2929,6 +2780,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3231,10 +3086,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3337,6 +3188,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3619,6 +3474,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4560,6 +4429,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/ko_KR/LC_MESSAGES/django.mo b/conf/locale/ko_KR/LC_MESSAGES/django.mo
index 0c7a5cfe44..d3dbc9c3d6 100644
Binary files a/conf/locale/ko_KR/LC_MESSAGES/django.mo and b/conf/locale/ko_KR/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ko_KR/LC_MESSAGES/django.po b/conf/locale/ko_KR/LC_MESSAGES/django.po
index d99278af63..75f9509f1d 100644
--- a/conf/locale/ko_KR/LC_MESSAGES/django.po
+++ b/conf/locale/ko_KR/LC_MESSAGES/django.po
@@ -6,6 +6,7 @@
 # Translators:
 # bossnm11 <bossnm11@gmail.com>, 2014
 # Jong-Dae Park <jdpark7@gmail.com>, 2013
+# jeon <bluerespect@nate.com>, 2014
 # Jong-Dae Park <jdpark7@gmail.com>, 2013
 # #-#-#-#-#  django-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file.
@@ -16,6 +17,7 @@
 # bossnm11 <bossnm11@gmail.com>, 2014
 # mariana1201 <gogo3135@naver.com>, 2014
 # Jong-Dae Park <jdpark7@gmail.com>, 2013
+# jeon <bluerespect@nate.com>, 2014
 # #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
 # edX translation file
 # Copyright (C) 2014 edX
@@ -25,6 +27,7 @@
 # bossnm11 <bossnm11@gmail.com>, 2014
 # mariana1201 <gogo3135@naver.com>, 2014
 # Jong-Dae Park <jdpark7@gmail.com>, 2013
+# jeon <bluerespect@nate.com>, 2014
 # Jong-Dae Park <jdpark7@gmail.com>, 2013
 # Sarina Canelake <sarina@edx.org>, 2014
 # Sunah Lim <whitetree70@snu.ac.kr>, 2013
@@ -39,6 +42,7 @@
 # bossnm11 <bossnm11@gmail.com>, 2014
 # choemh <choemh@nate.com>, 2014
 # Jong-Dae Park <jdpark7@gmail.com>, 2013
+# jeon <bluerespect@nate.com>, 2014
 # chans <kcsgoodboy@gmail.com>, 2014
 # JiyeonLee <leejiyeon00@gmail.com>, 2014
 # Sunah Lim <whitetree70@snu.ac.kr>, 2013
@@ -65,8 +69,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-10-25 16:10+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Gil <gedwarp@gmail.com>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/edx-platform/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
@@ -129,14 +133,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -228,6 +224,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2227,6 +2224,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "소개"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2585,18 +2622,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "오류"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2944,9 +2969,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4100,6 +4126,10 @@ msgstr "데이터 다운로드"
 msgid "Analytics"
 msgstr "분석"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -4995,15 +5025,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5011,37 +5053,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5282,17 +5312,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5302,7 +5332,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5316,8 +5346,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6499,16 +6529,16 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "{}에 등록 | 트랙을 선택하십시요"
+msgid "Enroll In {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr "죄송합니다. 등록 시도하는데 오류가 있었습니다."
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -6544,7 +6574,7 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6966,11 +6996,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "소개"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7136,6 +7161,7 @@ msgstr "오류메세지, 문제 발생으로 가는 단계 등을 포함하세
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "제출"
 
@@ -7450,6 +7476,11 @@ msgstr "가공되지 않은 데이터:"
 msgid "Accepted"
 msgstr "승인됨"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "오류"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "거절됨"
@@ -8470,12 +8501,6 @@ msgstr "강좌물 보기"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "이 강좌가 <a href=\"{cart_link}\">장바구니</a>에 담겼습니다."
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"장바구니 ({currency_symbol}{cost})에 {course.display_number_with_default} 추가 "
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8488,6 +8513,12 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"장바구니 ({currency_symbol}{cost})에 {course.display_number_with_default} 추가 "
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "{course.display_number_with_default} 에 등록"
@@ -9348,9 +9379,6 @@ msgstr "등록된 역할:"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9438,7 +9466,6 @@ msgstr "저장된 강좌 보기"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "강좌 보기"
 
@@ -11239,18 +11266,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12601,6 +12616,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr "이름 편집"
@@ -12656,19 +12714,19 @@ msgid ""
 msgstr "인증서 {a_end}에 대해 자주 묻는 질문 코멘트를 보기 위해서는 {a_start} FAQ를 읽어 보시기 바랍니다."
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
-msgstr "를 위한 등록"
+msgid "You are enrolling in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12676,16 +12734,16 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
-msgstr "로 등록 :"
+msgid "{span_start}Enrolling as:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
 msgid "Technical Requirements"
@@ -14212,6 +14270,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14224,6 +14291,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14282,10 +14354,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14300,6 +14373,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo b/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo
index 114eee4def..9e6380befa 100644
Binary files a/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo and b/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ko_KR/LC_MESSAGES/djangojs.po b/conf/locale/ko_KR/LC_MESSAGES/djangojs.po
index d420c3b42e..a3d0568a46 100644
--- a/conf/locale/ko_KR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ko_KR/LC_MESSAGES/djangojs.po
@@ -6,6 +6,7 @@
 # Translators:
 # bossnm11 <bossnm11@gmail.com>, 2014
 # Jong-Dae Park <jdpark7@gmail.com>, 2013
+# jeon <bluerespect@nate.com>, 2014
 # Jong-Dae Park <jdpark7@gmail.com>, 2013
 # #-#-#-#-#  djangojs-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file.
@@ -16,6 +17,7 @@
 # SEUNGWON <baeksw0620@gmail.com>, 2014
 # bossnm11 <bossnm11@gmail.com>, 2014
 # Jong-Dae Park <jdpark7@gmail.com>, 2013
+# jeon <bluerespect@nate.com>, 2014
 # chans <kcsgoodboy@gmail.com>, 2014
 # seungil <luck8778@gmail.com>, 2014
 # #-#-#-#-#  underscore.po (edx-platform)  #-#-#-#-#
@@ -25,20 +27,23 @@
 # 
 # Translators:
 # bossnm11 <bossnm11@gmail.com>, 2014
+# jeon <bluerespect@nate.com>, 2014
+# LEE SI HYEONG <super2451894@gmail.com>, 2014
 # #-#-#-#-#  underscore-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file
 # Copyright (C) 2014 edX
 # This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
 # 
 # Translators:
+# jeon <bluerespect@nate.com>, 2014
 # Sam Ryoo <samryoo@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
-"PO-Revision-Date: 2014-10-08 18:08+0000\n"
-"Last-Translator: Sarina Canelake <sarina@edx.org>\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
+"PO-Revision-Date: 2014-11-10 13:46+0000\n"
+"Last-Translator: jeon <bluerespect@nate.com>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/edx-platform/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,8 +74,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2132,152 +2135,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2936,6 +2793,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3238,10 +3099,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3344,6 +3201,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3626,6 +3487,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4567,6 +4442,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/lt_LT/LC_MESSAGES/django.mo b/conf/locale/lt_LT/LC_MESSAGES/django.mo
index 8cb2f0eaa3..444d9d1616 100644
Binary files a/conf/locale/lt_LT/LC_MESSAGES/django.mo and b/conf/locale/lt_LT/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/lt_LT/LC_MESSAGES/django.po b/conf/locale/lt_LT/LC_MESSAGES/django.po
index c22709c7dc..38e56fe65c 100644
--- a/conf/locale/lt_LT/LC_MESSAGES/django.po
+++ b/conf/locale/lt_LT/LC_MESSAGES/django.po
@@ -49,6 +49,7 @@
 # 
 # Translators:
 # Edukometrija <jolitad@mruni.eu>, 2014
+# Gediminas Trakas <gediminas.trakas@gmail.com>, 2014
 # Žygimantas Medelis <zzygis@gmail.com>, 2013
 # Žygimantas Medelis <zzygis@gmail.com>, 2013
 # #-#-#-#-#  wiki.po (edx-platform)  #-#-#-#-#
@@ -59,13 +60,14 @@
 # Translators:
 # Riina <ciairdabar@yahoo.com>, 2014
 # Edukometrija <jolitad@mruni.eu>, 2014
+# Gediminas Trakas <gediminas.trakas@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
-"Last-Translator: Riina <ciairdabar@yahoo.com>\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-30 23:38+0000\n"
+"Last-Translator: Edukometrija <jolitad@mruni.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/edx-platform/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +82,7 @@ msgstr ""
 #. needs to grade
 #: cms/djangoapps/contentstore/utils.py common/lib/xmodule/xmodule/tabs.py
 msgid "Open Ended Panel"
-msgstr ""
+msgstr "Atvirojo atsakymo užduočių skydelis"
 
 #. Translators: "Discussion" is the title of the course forum page
 #. Translators: 'Discussion' refers to the tab in the courseware that leads to
@@ -92,16 +94,13 @@ msgstr "Diskusija"
 
 #: cms/djangoapps/contentstore/views/component.py
 #: lms/djangoapps/class_dashboard/dashboard_data.py
-#: lms/templates/courseware/instructor_dashboard.html
-#: lms/templates/courseware/instructor_dashboard.html
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Problem"
-msgstr ""
+msgstr "Užduotis"
 
 #: cms/djangoapps/contentstore/views/component.py
 #: common/lib/xmodule/xmodule/video_module/video_module.py
 msgid "Advanced"
-msgstr ""
+msgstr "Sudėtingesnis"
 
 #: cms/djangoapps/contentstore/views/helpers.py
 #: lms/djangoapps/class_dashboard/dashboard_data.py
@@ -109,29 +108,21 @@ msgstr ""
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 msgid "Section"
-msgstr ""
+msgstr "Tema"
 
 #: cms/djangoapps/contentstore/views/helpers.py
 #: lms/djangoapps/class_dashboard/dashboard_data.py
 msgid "Subsection"
-msgstr ""
+msgstr "Potemė"
 
 #: cms/djangoapps/contentstore/views/helpers.py
 #: lms/djangoapps/instructor/views/tools.py
 msgid "Unit"
-msgstr ""
+msgstr "Skyrius"
 
 #: common/djangoapps/course_groups/cohorts.py
 msgid "You cannot create two cohorts with the same name"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
+msgstr "Negalite sukurti dviejų pogrupių tuo pačiu pavadinimu"
 
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
@@ -155,15 +146,16 @@ msgstr "Kaina nepasirinkta arba kaina yra per žema."
 
 #: common/djangoapps/django_comment_common/models.py
 msgid "Administrator"
-msgstr ""
+msgstr "Administratorius"
 
 #: common/djangoapps/django_comment_common/models.py
 msgid "Moderator"
-msgstr ""
+msgstr "Moderatorius"
 
 #: common/djangoapps/django_comment_common/models.py
+#: lms/templates/discussion/_underscore_templates.html
 msgid "Community TA"
-msgstr "Techninė pagalba"
+msgstr "Mokymosi asistentai"
 
 #: common/djangoapps/django_comment_common/models.py
 msgid "Student"
@@ -174,57 +166,60 @@ msgid ""
 "Your account has been disabled. If you believe this was done in error, "
 "please contact us at {link_start}{support_email}{link_end}"
 msgstr ""
+"Jūsų sąskaita buvo užblokuota. Jeigu manote, kad tai klaida, prašome "
+"susisiekti su mumis adresu: {link_start}{support_email}{link_end}"
 
 #: common/djangoapps/student/middleware.py
 msgid "Disabled Account"
-msgstr ""
+msgstr "Sąskaita užblokuota"
 
 #: common/djangoapps/student/models.py
 msgid "Male"
-msgstr ""
+msgstr "Vyras"
 
 #: common/djangoapps/student/models.py
 msgid "Female"
-msgstr ""
+msgstr "Moteris"
 
 #. Translators: 'Other' refers to the student's gender
 #. Translators: 'Other' refers to the student's level of education
 #: common/djangoapps/student/models.py common/djangoapps/student/models.py
 msgid "Other"
-msgstr ""
+msgstr "Kita"
 
 #: common/djangoapps/student/models.py
 msgid "Doctorate"
-msgstr ""
+msgstr "Daktaro laipsnis"
 
 #: common/djangoapps/student/models.py
 msgid "Master's or professional degree"
-msgstr ""
+msgstr "Magistro arba profesionalo laipsnis"
 
 #: common/djangoapps/student/models.py
 msgid "Bachelor's degree"
-msgstr ""
+msgstr "Bakalauro laipsnis"
 
 #: common/djangoapps/student/models.py
 msgid "Associate's degree"
-msgstr ""
+msgstr "Aukštesnysis išsilavinimas"
 
 #: common/djangoapps/student/models.py
 msgid "Secondary/high school"
-msgstr ""
+msgstr "Vidurinė mokykla"
 
 #: common/djangoapps/student/models.py
 msgid "Junior secondary/junior high/middle school"
-msgstr ""
+msgstr "Pagrindinė mokykla"
 
 #: common/djangoapps/student/models.py
 msgid "Elementary/primary school"
-msgstr ""
+msgstr "Pradinė mokykla"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
-msgstr ""
+msgstr "Neturiu jokio išsilavinimo"
 
 #: common/djangoapps/student/views.py
 msgid "Course id not specified"
@@ -232,15 +227,15 @@ msgstr "Nenurodytas kurso identifikatorius"
 
 #: common/djangoapps/student/views.py lms/djangoapps/dashboard/support.py
 msgid "Invalid course id"
-msgstr ""
+msgstr "Neteisingas kurso identifikacijos numeris"
 
 #: common/djangoapps/student/views.py
 msgid "Course id is invalid"
-msgstr "Kurso identifikatorius neteisingas"
+msgstr "Kurso identifikacijos numeris neteisingas"
 
 #: common/djangoapps/student/views.py
 msgid "Could not enroll"
-msgstr ""
+msgstr "Nepavyko užregistuoti"
 
 #: common/djangoapps/student/views.py
 msgid "You are not enrolled in this course"
@@ -255,6 +250,8 @@ msgid ""
 "You've successfully logged into your {provider_name} account, but this "
 "account isn't linked with an {platform_name} account yet."
 msgstr ""
+"Jūs sėkmingai prisijungėte prie savo {provider_name} paskyros, bet ši "
+"paskyra dar nėra susieta su {platform_name} paskyra."
 
 #: common/djangoapps/student/views.py
 msgid ""
@@ -262,12 +259,17 @@ msgid ""
 "below, and then link your {platform_name} account with {provider_name} from "
 "your dashboard."
 msgstr ""
+"Naudodamiesi savo {platform_name} naudotojo vardu ir slaptažodžiu "
+"prisijunkite prie {platform_name} ir tada savo informaciniame puslapyje savo"
+" {platform_name} paskyrą susiekite su {provider_name}."
 
 #: common/djangoapps/student/views.py
 msgid ""
 "If you don't have an {platform_name} account yet, click <strong>Register "
 "Now</strong> at the top of the page."
 msgstr ""
+"Jeigu dar neturite {platform_name} paskyros, paspauskite "
+"<strong>Prisiregistruoti dabar</strong> puslapio viršuje."
 
 #: common/djangoapps/student/views.py
 msgid "There was an error receiving your login information. Please email us."
@@ -280,6 +282,8 @@ msgid ""
 "This account has been temporarily locked due to excessive login failures. "
 "Try again later."
 msgstr ""
+"Daug kartų nepavykus prisijungti ši paskyra laikinai užrakinta. Pabandykite "
+"vėliau."
 
 #: common/djangoapps/student/views.py
 msgid ""
@@ -287,6 +291,10 @@ msgid ""
 "reset your password before you can log in again. Please click the \"Forgot "
 "Password\" link on this page to reset your password before logging in again."
 msgstr ""
+"Dėl šios paskyros slaptažodžių politikos jūsų slaptažodis nebegalioja. "
+"Turite iš naujo nustatyti slaptažodį ir tada galėsite vėl prisijungti. Prieš"
+" prisijungdami iš naujo, norėdami nustatyti naują slaptažodį spragtelėkite "
+"\"Pamiršau slaptažodį\" nuorodą šiame puslapyje."
 
 #: common/djangoapps/student/views.py
 msgid "Too many failed login attempts. Try again later."
@@ -307,23 +315,23 @@ msgstr ""
 
 #: common/djangoapps/student/views.py
 msgid "Please enter a username"
-msgstr ""
+msgstr "Prašome įvesti naudotojo vardą"
 
 #: common/djangoapps/student/views.py
 msgid "Please choose an option"
-msgstr ""
+msgstr "Prašome pasirinkti variantą"
 
 #: common/djangoapps/student/views.py
 msgid "User with username {} does not exist"
-msgstr ""
+msgstr "Naudotojas šiuo vardu {} neegzistuoja."
 
 #: common/djangoapps/student/views.py
 msgid "Successfully disabled {}'s account"
-msgstr ""
+msgstr "Sąskaita {}'s sėkmingai išjungta"
 
 #: common/djangoapps/student/views.py
 msgid "Successfully reenabled {}'s account"
-msgstr ""
+msgstr "Sąskaita {}'s sėkmingai įjungta"
 
 #: common/djangoapps/student/views.py
 msgid "Unexpected account status"
@@ -351,67 +359,67 @@ msgstr "Jūs turite sutikti su paslaugos teikimo sąlygomis."
 
 #: common/djangoapps/student/views.py
 msgid "Username must be minimum of two characters long"
-msgstr ""
+msgstr "Naudotojo vardą turi sudaryti mažiausiai du simboliai"
 
 #: common/djangoapps/student/views.py
 msgid "A properly formatted e-mail is required"
-msgstr ""
+msgstr "Būtinas tinkamas el. pašto formatas"
 
 #: common/djangoapps/student/views.py
 msgid "Your legal name must be a minimum of two characters long"
-msgstr ""
+msgstr "Jūsų oficialų vardą turi sudaryti mažiausiai du simboliai"
 
 #: common/djangoapps/student/views.py
 msgid "A valid password is required"
-msgstr ""
+msgstr "Būtinas tinkamas slaptažodis"
 
 #: common/djangoapps/student/views.py
 msgid "Accepting Terms of Service is required"
-msgstr ""
+msgstr "Būtina sutikti su paslaugų teikimo sąlygomis"
 
 #: common/djangoapps/student/views.py
 msgid "Agreeing to the Honor Code is required"
-msgstr ""
+msgstr "Būtina pritarti Sąžiningumo deklaracijai"
 
 #: common/djangoapps/student/views.py
 msgid "A level of education is required"
-msgstr ""
+msgstr "Būtina nurodyti išsilavinimo lygį"
 
 #: common/djangoapps/student/views.py
 msgid "Your gender is required"
-msgstr ""
+msgstr "Būtina nurodyti lytį"
 
 #: common/djangoapps/student/views.py
 msgid "Your year of birth is required"
-msgstr ""
+msgstr "Būtina nurodyti gimimo metus"
 
 #: common/djangoapps/student/views.py
 msgid "Your mailing address is required"
-msgstr ""
+msgstr "Būtina nurodyti pašto adresą"
 
 #: common/djangoapps/student/views.py
 msgid "A description of your goals is required"
-msgstr ""
+msgstr "Būtinas jūsų tikslų aprašymas"
 
 #: common/djangoapps/student/views.py
 msgid "A city is required"
-msgstr ""
+msgstr "Būtina nurodyti miestą"
 
 #: common/djangoapps/student/views.py
 msgid "A country is required"
-msgstr ""
+msgstr "Būtina nurodyti šalį"
 
 #: common/djangoapps/student/views.py
 msgid "You are missing one or more required fields"
-msgstr ""
+msgstr "Praleidote vieną ar daugiau privalomų laukų"
 
 #: common/djangoapps/student/views.py
 msgid "Username cannot be more than {num} characters long"
-msgstr ""
+msgstr "Naudotojo vardas negali būti ilgesnis nei {num} simbolių"
 
 #: common/djangoapps/student/views.py
 msgid "Email cannot be more than {num} characters long"
-msgstr ""
+msgstr "El. pašto adresas negali būti ilgesnis nei {num} simbolių"
 
 #: common/djangoapps/student/views.py
 msgid "Valid e-mail is required."
@@ -425,11 +433,11 @@ msgstr ""
 
 #: common/djangoapps/student/views.py common/djangoapps/student/views.py
 msgid "Password: "
-msgstr ""
+msgstr "Slaptažodis:"
 
 #: common/djangoapps/student/views.py
 msgid "Username and password fields cannot match"
-msgstr ""
+msgstr "Naudotojo vardo ir slaptažodžio laukai negali sutapti"
 
 #: common/djangoapps/student/views.py
 msgid "Could not send activation e-mail."
@@ -449,8 +457,14 @@ msgid_plural ""
 "You are re-using a password that you have used recently. You must have {num}"
 " distinct passwords before reusing a previous password."
 msgstr[0] ""
+"Šį slaptažodį neseniai naudojote. Kol galėsite vėl jį naudoti, privalote "
+"turėti {num} kitokį slaptažodį."
 msgstr[1] ""
+"Šį slaptažodį neseniai naudojote. Kol galėsite vėl jį naudoti, privalote "
+"turėti {num} skirtingus slaptažodžius."
 msgstr[2] ""
+"Šį slaptažodį neseniai naudojote. Kol galėsite vėl jį naudoti, privalote "
+"turėti {num} skirtingus slaptažodžių."
 
 #: common/djangoapps/student/views.py
 msgid ""
@@ -460,12 +474,18 @@ msgid_plural ""
 "You are resetting passwords too frequently. Due to security policies, {num} "
 "days must elapse between password resets."
 msgstr[0] ""
+"Per dažnai keičiate slaptažodžius. Vadovaujantis saugos politika, tarp "
+"slaptažodžių keitimo turi praeiti {num} diena. "
 msgstr[1] ""
+"Per dažnai keičiate slaptažodžius. Vadovaujantis saugos politika, tarp "
+"slaptažodžių keitimo turi praeiti {num} dienos. "
 msgstr[2] ""
+"Per dažnai keičiate slaptažodžius. Vadovaujantis saugos politika, tarp "
+"slaptažodžių keitimo turi praeiti {num} dienų. "
 
 #: common/djangoapps/student/views.py
 msgid "Password reset unsuccessful"
-msgstr ""
+msgstr "Nepavyko atnaujinti slaptažodžio"
 
 #: common/djangoapps/student/views.py
 msgid "No inactive user with this e-mail exists"
@@ -494,6 +514,7 @@ msgstr "Senasis el. pašto adresas yra toks pat, kaip ir naujasis."
 #: common/djangoapps/student/views.py
 msgid "Unable to send email activation link. Please try again later."
 msgstr ""
+"Neįmanoma išsiųsti el. laiško su aktyvavimo nuoroda. Prašome bandyti vėliau."
 
 #: common/djangoapps/student/views.py
 msgid "Name required"
@@ -501,7 +522,7 @@ msgstr "Būtinas vardas"
 
 #: common/djangoapps/student/views.py common/djangoapps/student/views.py
 msgid "Invalid ID"
-msgstr "Neteisingas identifikatorius"
+msgstr "Neteisingas identifikacijos numeris"
 
 #. Translators: the translation for "LONG_DATE_FORMAT" must be a format
 #. string for formatting dates in a long form.  For example, the
@@ -509,7 +530,7 @@ msgstr "Neteisingas identifikatorius"
 #. See http://strftime.org for details.
 #: common/djangoapps/util/date_utils.py
 msgid "LONG_DATE_FORMAT"
-msgstr ""
+msgstr " %Y %m. %A %B %d."
 
 #. Translators: the translation for "DATE_TIME_FORMAT" must be a format
 #. string for formatting dates with times.  For example, the American
@@ -517,7 +538,7 @@ msgstr ""
 #. See http://strftime.org for details.
 #: common/djangoapps/util/date_utils.py
 msgid "DATE_TIME_FORMAT"
-msgstr ""
+msgstr "%Y %m. %A %B %d., %H.%M %val."
 
 #. Translators: the translation for "SHORT_DATE_FORMAT" must be a
 #. format string for formatting dates in a brief form.  For example,
@@ -525,14 +546,14 @@ msgstr ""
 #. See http://strftime.org for details.
 #: common/djangoapps/util/date_utils.py
 msgid "SHORT_DATE_FORMAT"
-msgstr ""
+msgstr " %Y %b %d"
 
 #. Translators: the translation for "TIME_FORMAT" must be a format
 #. string for formatting times.  For example, the American English
 #. form is "%H:%M:%S". See http://strftime.org for details.
 #: common/djangoapps/util/date_utils.py
 msgid "TIME_FORMAT"
-msgstr ""
+msgstr "%H.%M.%S"
 
 #. Translators: This is an AM/PM indicator for displaying times.  It is
 #. used for the %p directive in date-time formats. See http://strftime.org
@@ -540,7 +561,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "am/pm indicator"
 msgid "AM"
-msgstr ""
+msgstr " ."
 
 #. Translators: This is an AM/PM indicator for displaying times.  It is
 #. used for the %p directive in date-time formats. See http://strftime.org
@@ -548,7 +569,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "am/pm indicator"
 msgid "PM"
-msgstr ""
+msgstr "."
 
 #. Translators: this is a weekday name that will be used when displaying
 #. dates, as in "Monday Februrary 10, 2014". It is used for the %A
@@ -556,7 +577,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "weekday name"
 msgid "Monday"
-msgstr ""
+msgstr "Pirmadienis"
 
 #. Translators: this is a weekday name that will be used when displaying
 #. dates, as in "Tuesday Februrary 11, 2014". It is used for the %A
@@ -564,7 +585,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "weekday name"
 msgid "Tuesday"
-msgstr ""
+msgstr "Antradienis"
 
 #. Translators: this is a weekday name that will be used when displaying
 #. dates, as in "Wednesday Februrary 12, 2014". It is used for the %A
@@ -572,7 +593,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "weekday name"
 msgid "Wednesday"
-msgstr ""
+msgstr "Trečiadienis"
 
 #. Translators: this is a weekday name that will be used when displaying
 #. dates, as in "Thursday Februrary 13, 2014". It is used for the %A
@@ -580,7 +601,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "weekday name"
 msgid "Thursday"
-msgstr ""
+msgstr "Ketvirtadienis"
 
 #. Translators: this is a weekday name that will be used when displaying
 #. dates, as in "Friday Februrary 14, 2014". It is used for the %A
@@ -588,7 +609,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "weekday name"
 msgid "Friday"
-msgstr ""
+msgstr "Penktadienis"
 
 #. Translators: this is a weekday name that will be used when displaying
 #. dates, as in "Saturday Februrary 15, 2014". It is used for the %A
@@ -596,7 +617,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "weekday name"
 msgid "Saturday"
-msgstr ""
+msgstr "Šeštadienis"
 
 #. Translators: this is a weekday name that will be used when displaying
 #. dates, as in "Sunday Februrary 16, 2014". It is used for the %A
@@ -604,7 +625,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "weekday name"
 msgid "Sunday"
-msgstr ""
+msgstr "Sekmadienis"
 
 #. Translators: this is an abbreviated weekday name that will be used when
 #. displaying dates, as in "Mon Feb 10, 2014". It is used for the %a
@@ -612,7 +633,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated weekday name"
 msgid "Mon"
-msgstr ""
+msgstr "P"
 
 #. Translators: this is an abbreviated weekday name that will be used when
 #. displaying dates, as in "Tue Feb 11, 2014". It is used for the %a
@@ -620,7 +641,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated weekday name"
 msgid "Tue"
-msgstr ""
+msgstr "A"
 
 #. Translators: this is an abbreviated weekday name that will be used when
 #. displaying dates, as in "Wed Feb 12, 2014". It is used for the %a
@@ -628,7 +649,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated weekday name"
 msgid "Wed"
-msgstr ""
+msgstr "T"
 
 #. Translators: this is an abbreviated weekday name that will be used when
 #. displaying dates, as in "Thu Feb 13, 2014". It is used for the %a
@@ -636,7 +657,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated weekday name"
 msgid "Thu"
-msgstr ""
+msgstr "K"
 
 #. Translators: this is an abbreviated weekday name that will be used when
 #. displaying dates, as in "Fri Feb 14, 2014". It is used for the %a
@@ -644,7 +665,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated weekday name"
 msgid "Fri"
-msgstr ""
+msgstr "Pn"
 
 #. Translators: this is an abbreviated weekday name that will be used when
 #. displaying dates, as in "Sat Feb 15, 2014". It is used for the %a
@@ -652,7 +673,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated weekday name"
 msgid "Sat"
-msgstr ""
+msgstr "Š"
 
 #. Translators: this is an abbreviated weekday name that will be used when
 #. displaying dates, as in "Sun Feb 16, 2014". It is used for the %a
@@ -660,7 +681,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated weekday name"
 msgid "Sun"
-msgstr ""
+msgstr "S"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Jan 10, 2014". It is used for the %b
@@ -668,7 +689,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Jan"
-msgstr ""
+msgstr "sausio"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Feb 10, 2014". It is used for the %b
@@ -676,7 +697,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Feb"
-msgstr ""
+msgstr "vasario"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Mar 10, 2014". It is used for the %b
@@ -684,7 +705,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Mar"
-msgstr ""
+msgstr "kovo"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Apr 10, 2014". It is used for the %b
@@ -692,7 +713,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Apr"
-msgstr ""
+msgstr "balandžio"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "May 10, 2014". It is used for the %b
@@ -700,7 +721,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "May"
-msgstr ""
+msgstr "gegužės"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Jun 10, 2014". It is used for the %b
@@ -708,7 +729,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Jun"
-msgstr ""
+msgstr "birželio"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Jul 10, 2014". It is used for the %b
@@ -716,7 +737,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Jul"
-msgstr ""
+msgstr "liepos"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Aug 10, 2014". It is used for the %b
@@ -724,7 +745,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Aug"
-msgstr ""
+msgstr "rugpjūčio"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Sep 10, 2014". It is used for the %b
@@ -732,7 +753,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Sep"
-msgstr ""
+msgstr "rugsėjo"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Oct 10, 2014". It is used for the %b
@@ -740,7 +761,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Oct"
-msgstr ""
+msgstr "spalio"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Nov 10, 2014". It is used for the %b
@@ -748,7 +769,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Nov"
-msgstr ""
+msgstr "lapkričio"
 
 #. Translators: this is an abbreviated month name that will be used when
 #. displaying dates, as in "Dec 10, 2014". It is used for the %b
@@ -756,7 +777,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "abbreviated month name"
 msgid "Dec"
-msgstr ""
+msgstr "gruodžio"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "January 10, 2014". It is used for the %B directive in
@@ -764,7 +785,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "month name"
 msgid "January"
-msgstr ""
+msgstr "sausio"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "February 10, 2014". It is used for the %B directive in
@@ -772,7 +793,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "month name"
 msgid "February"
-msgstr ""
+msgstr "vasario"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "March 10, 2014". It is used for the %B directive in
@@ -780,7 +801,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "month name"
 msgid "March"
-msgstr ""
+msgstr "kovo"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "April 10, 2014". It is used for the %B directive in
@@ -788,7 +809,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "month name"
 msgid "April"
-msgstr ""
+msgstr "balandžio"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "May 10, 2014". It is used for the %B directive in
@@ -796,7 +817,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "month name"
 msgid "May"
-msgstr ""
+msgstr "gegužės"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "June 10, 2014". It is used for the %B directive in
@@ -804,7 +825,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "month name"
 msgid "June"
-msgstr ""
+msgstr "birželio"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "July 10, 2014". It is used for the %B directive in
@@ -812,7 +833,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "month name"
 msgid "July"
-msgstr ""
+msgstr "liepos"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "August 10, 2014". It is used for the %B directive in
@@ -820,7 +841,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "month name"
 msgid "August"
-msgstr ""
+msgstr "rugpjūčio"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "September 10, 2014". It is used for the %B directive in
@@ -828,7 +849,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "month name"
 msgid "September"
-msgstr ""
+msgstr "rugsėjo"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "October 10, 2014". It is used for the %B directive in
@@ -836,7 +857,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "month name"
 msgid "October"
-msgstr ""
+msgstr "spalio"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "November 10, 2014". It is used for the %B directive in
@@ -844,7 +865,7 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "month name"
 msgid "November"
-msgstr ""
+msgstr "lapkričio"
 
 #. Translators: this is a month name that will be used when displaying
 #. dates, as in "December 10, 2014". It is used for the %B directive in
@@ -852,186 +873,194 @@ msgstr ""
 #: common/djangoapps/util/date_utils.py
 msgctxt "month name"
 msgid "December"
-msgstr ""
+msgstr "gruodžio"
 
 #: common/djangoapps/util/password_policy_validators.py
 msgid "Invalid Length ({0})"
-msgstr ""
+msgstr "Neteisingas ilgis ({0})"
 
 #: common/djangoapps/util/password_policy_validators.py
 msgid "must be {0} characters or more"
-msgstr ""
+msgstr "turi būti {0} arba daugiau simbolių"
 
 #: common/djangoapps/util/password_policy_validators.py
 msgid "must be {0} characters or less"
-msgstr ""
+msgstr "turi būti {0} arba mažiau simbolių"
 
 #: common/djangoapps/util/password_policy_validators.py
 msgid "Must be more complex ({0})"
-msgstr ""
+msgstr "Turi būti sudėtingesnis ({0})"
 
 #: common/djangoapps/util/password_policy_validators.py
 msgid "must contain {0} or more uppercase characters"
-msgstr ""
+msgstr "turi būti {0} arba daugiau didžiųjų raidžių"
 
 #: common/djangoapps/util/password_policy_validators.py
 msgid "must contain {0} or more lowercase characters"
-msgstr ""
+msgstr "turi būti {0} arba daugiau mažųjų raidžių"
 
 #: common/djangoapps/util/password_policy_validators.py
 msgid "must contain {0} or more digits"
-msgstr ""
+msgstr "turi būti {0} arba daugiau skaitmenų"
 
 #: common/djangoapps/util/password_policy_validators.py
 msgid "must contain {0} or more punctuation characters"
-msgstr ""
+msgstr "turi būti {0} arba daugiau skyrybos ženklų"
 
 #: common/djangoapps/util/password_policy_validators.py
 msgid "must contain {0} or more non ascii characters"
-msgstr ""
+msgstr "turi būti {0} arba daugiau ne ASCII simbolių"
 
 #: common/djangoapps/util/password_policy_validators.py
 msgid "must contain {0} or more unique words"
-msgstr ""
+msgstr "turi būti {0} arba daugiau unikalių žodžių"
 
 #: common/djangoapps/util/password_policy_validators.py
 msgid "Too similar to a restricted dictionary word."
-msgstr ""
+msgstr "Per daug panašu į riboto žodyno žodį."
 
 #: common/lib/capa/capa/capa_problem.py
 msgid "Cannot rescore problems with possible file submissions"
 msgstr ""
+"Neįmanoma iš naujo įvertinti užduočių, kuriose reikėjo pateikti failus"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "correct"
-msgstr ""
+msgstr "teisingas"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "incorrect"
-msgstr ""
+msgstr "neteisingas"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "incomplete"
-msgstr ""
+msgstr "nebaigta"
 
 #: common/lib/capa/capa/inputtypes.py common/lib/capa/capa/inputtypes.py
 msgid "unanswered"
-msgstr ""
+msgstr "neatsakyta"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "processing"
-msgstr ""
+msgstr "vykdoma"
 
 #. Translators: 'ChoiceGroup' is an input type and should not be translated.
 #: common/lib/capa/capa/inputtypes.py
 msgid "ChoiceGroup: unexpected tag {tag_name}"
-msgstr ""
+msgstr "ChoiceGroup: netikėta žyma {tag_name}"
 
 #: common/lib/capa/capa/inputtypes.py common/lib/capa/capa/inputtypes.py
 msgid "Answer received."
-msgstr ""
+msgstr "Atsakymas priimtas."
 
 #. Translators: '<choice>' is a tag name and should not be translated.
 #: common/lib/capa/capa/inputtypes.py
 msgid "Expected a <choice> tag; got {given_tag} instead"
-msgstr ""
+msgstr "Tikėtasi <choice> žymos; vietoj to gauta {given_tag} "
 
 #: common/lib/capa/capa/inputtypes.py
 msgid ""
 "Your files have been submitted. As soon as your submission is graded, this "
 "message will be replaced with the grader's feedback."
 msgstr ""
+"Jūsų failai pateikti. Kai jūsų pateiktis bus įvertinta, šis pranešimas bus "
+"pakeistas vertintojo atsiliepimu."
 
 #: common/lib/capa/capa/inputtypes.py
 msgid ""
 "Your answer has been submitted. As soon as your submission is graded, this "
 "message will be replaced with the grader's feedback."
 msgstr ""
+"Jūsų atsakymas pateiktas. Kai jis bus įvertintas, šis pranešimas bus "
+"pakeistas vertintojo atsiliepimu."
 
 #: common/lib/capa/capa/inputtypes.py
 msgid ""
 "Submitted. As soon as a response is returned, this message will be replaced "
 "by that feedback."
 msgstr ""
+"Pateikta. Kai bus gautas atsiliepimas, šis pranešimas bus juo pakeistas. "
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "No response from Xqueue within {xqueue_timeout} seconds. Aborted."
 msgstr ""
+" Per {xqueue_timeout} sekundžių negauta atsakymo iš Xqueue. Nutraukta."
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "Error running code."
-msgstr ""
+msgstr "Kodo klaida"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "Cannot connect to the queue"
-msgstr ""
+msgstr "Nepavyksta prisijungti prie eilės"
 
 #: common/lib/capa/capa/inputtypes.py common/lib/capa/capa/inputtypes.py
 msgid "No formula specified."
-msgstr ""
+msgstr "Nenurodyta formulė."
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "Couldn't parse formula: {error_msg}"
-msgstr ""
+msgstr "Nepavyko išanalizuoti formulės: {error_msg}"
 
 #: common/lib/capa/capa/inputtypes.py common/lib/capa/capa/inputtypes.py
 msgid "Error while rendering preview"
-msgstr ""
+msgstr "Klaida pateikiant peržiūrą"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "Sorry, couldn't parse formula"
-msgstr ""
+msgstr "Atsiprašome, nepavyko išanalizuoti formulės"
 
 #: common/lib/capa/capa/inputtypes.py
 msgid "{input_type}: unexpected tag {tag_name}"
-msgstr ""
+msgstr "{input_type}: netikėta žyma {tag_name}"
 
 #. Translators: a "tag" is an XML element, such as "<b>" in HTML
 #: common/lib/capa/capa/inputtypes.py
 msgid "Expected a {expected_tag} tag; got {given_tag} instead"
-msgstr ""
+msgstr "Tikėtasi {expected_tag} žymos; vietoj to gauta {given_tag} "
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Error {err} in evaluating hint function {hintfn}."
-msgstr ""
+msgstr "Klaida {err} vertinant patarimo funkciją {hintfn}."
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "(Source code line unavailable)"
-msgstr ""
+msgstr "(Pirminio kodo eilutė negalima)"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "See XML source line {sourcenum}."
-msgstr ""
+msgstr "Žiūrėkite XML šaltinio eilutę {sourcenum}."
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Execution of unsafe Javascript code is not allowed."
-msgstr ""
+msgstr "Neleidžiama vykdyti nesaugaus \"Javascript\" kodo."
 
 #. Translators: 'unmask_name' is a method name and should not be translated.
 #: common/lib/capa/capa/responsetypes.py
 msgid "unmask_name called on response that is not masked"
-msgstr ""
+msgstr "unmask_name kreipėsi į atsakymą, kuris nėra paslėptas"
 
 #. Translators: 'shuffle' and 'answer-pool' are attribute names and should not
 #. be translated.
 #: common/lib/capa/capa/responsetypes.py
 msgid "Do not use shuffle and answer-pool at the same time"
-msgstr ""
+msgstr "shuffle ir answer-pool nenaudokite tuo pačiu metu"
 
 #. Translators: 'answer-pool' is an attribute name and should not be
 #. translated.
 #: common/lib/capa/capa/responsetypes.py
 msgid "answer-pool value should be an integer"
-msgstr ""
+msgstr "answer-pool reikšmė turi būti sveikasis skaičius"
 
 #. Translators: 'Choicegroup' is an input type and should not be translated.
 #: common/lib/capa/capa/responsetypes.py
 msgid "Choicegroup must include at least 1 correct and 1 incorrect choice"
 msgstr ""
+"Choicegroup turi sudaryti bent 1 teisingas ir 1 neteisingas pasirinkimas"
 
 #: common/lib/capa/capa/responsetypes.py common/lib/capa/capa/responsetypes.py
 msgid "There was a problem with the staff answer to this problem."
-msgstr ""
+msgstr "Klaida."
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Could not interpret '{student_answer}' as a number."
@@ -1040,10 +1069,12 @@ msgstr "Neįmanoma {student_answer} suprasti kaip skaičiaus."
 #: common/lib/capa/capa/responsetypes.py
 msgid "You may not use variables ({bad_variables}) in numerical problems."
 msgstr ""
+"Skaitiniuose uždaviniuose negalima vartoti kintamųjų ({bad_variables})."
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "factorial function evaluated outside its domain:'{student_answer}'"
 msgstr ""
+"faktorialo funkcijos įvertinimas nepatenka į jos sritį: {student_answer} "
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Invalid math syntax: '{student_answer}'"
@@ -1051,7 +1082,7 @@ msgstr "Neteisinga matematinė sintaksė: {student_answer}"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "You may not use complex numbers in range tolerance problems"
-msgstr ""
+msgstr "Ranginės skalės užduotyse negalima vartoti kompleksinių skaičių."
 
 #. Translators: This is an error message for a math problem. If the instructor
 #. provided a boundary
@@ -1060,7 +1091,7 @@ msgstr ""
 #: common/lib/capa/capa/responsetypes.py
 msgid ""
 "There was a problem with the staff answer to this problem: complex boundary."
-msgstr ""
+msgstr "Klaida: kompleksinio skaičiaus riba."
 
 #. Translators: This is an error message for a math problem. If the instructor
 #. did not provide
@@ -1068,24 +1099,17 @@ msgstr ""
 #: common/lib/capa/capa/responsetypes.py
 msgid ""
 "There was a problem with the staff answer to this problem: empty boundary."
-msgstr ""
+msgstr "Klaida: nenurodyta intervalo riba."
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "error"
-msgstr ""
+msgstr "klaida"
 
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: Separator used in StringResponse to display multiple answers.
 #. Example: "Answer: Answer_1 or Answer_2 or Answer_3".
-#. #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
-#. Translators: this is the last choice of a number of choices of how to log
-#. in
-#. to the site.
 #: common/lib/capa/capa/responsetypes.py
-#: common/templates/course_modes/choose.html lms/templates/login.html
-#: lms/templates/register.html
 msgid "or"
-msgstr ""
+msgstr "arba"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "error getting student answer from {student_answers}"
@@ -1093,7 +1117,7 @@ msgstr "klaida gaunant kurso dalyvio atsakymą iš {student_answers}"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "No answer entered!"
-msgstr ""
+msgstr "Neįvestas joks atsakymas!"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "CustomResponse: check function returned an invalid dictionary!"
@@ -1103,21 +1127,23 @@ msgstr ""
 #. translated.
 #: common/lib/capa/capa/responsetypes.py
 msgid "An error occurred with SymbolicResponse. The error was: {error_msg}"
-msgstr ""
+msgstr "Įvyko klaida dėl SymbolicResponse. Klaida: {error_msg}"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "No answer provided."
-msgstr ""
+msgstr "Nepateiktas joks atsakymas."
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Error: No grader has been set up for this problem."
-msgstr ""
+msgstr "Klaida: nenustatytas joks šios užduoties vertintojas."
 
 #: common/lib/capa/capa/responsetypes.py
 msgid ""
 "Unable to deliver your submission to grader (Reason: {error_msg}). Please "
 "try again later."
 msgstr ""
+"Neįmanoma jūsų atsakymo pateikti vertintojui (Priežastis: {error_msg}). "
+"Prašome bandyti vėliau."
 
 #. Translators: 'grader' refers to the edX automatic code grader.
 #. Translators: the `grader` refers to the grading service open response
@@ -1128,58 +1154,63 @@ msgstr ""
 #: common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
 msgid "Invalid grader reply. Please contact the course staff."
 msgstr ""
+"Neteisingas vertintojo atsakymas. Prašome susisiekti su kurso personalu."
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Invalid input: {bad_input} not permitted in answer."
-msgstr ""
+msgstr "Neteisinga įvestis: {bad_input} atsakyme negali būti."
 
 #: common/lib/capa/capa/responsetypes.py
 msgid ""
 "factorial function not permitted in answer for this problem. Provided answer"
 " was: {bad_input}"
 msgstr ""
+"faktorialo funkcijos šios užduoties atsakyme negali būti. Buvo pateiktas "
+"atsakymas: {bad_input}"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Invalid input: Could not parse '{bad_input}' as a formula."
-msgstr ""
+msgstr "Neteisinga įvestis: {bad_input} neįmanoma išanalizuoti kaip formulės"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Invalid input: Could not parse '{bad_input}' as a formula"
-msgstr ""
+msgstr "Neteisinga įvestis: {bad_input} neįmanoma išanalizuoti kaip formulės"
 
 #. Translators: 'SchematicResponse' is a problem type and should not be
 #. translated.
 #: common/lib/capa/capa/responsetypes.py
 msgid "Error in evaluating SchematicResponse. The error was: {error_msg}"
-msgstr ""
+msgstr "Klaida vertinant SchematicResponse. Klaida: {error_msg}"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "error grading {image_input_id} (input={user_input})"
-msgstr ""
+msgstr "vertinimo klaida {image_input_id} (input={user_input})"
 
 #. Translators: {sr_coords} are the coordinates of a rectangle
 #: common/lib/capa/capa/responsetypes.py
 msgid "Error in problem specification! Cannot parse rectangle in {sr_coords}"
 msgstr ""
+"Klaida užduoties sąlygoje! Negalima išanalizuoti stačiakampio koordinatėse "
+"{sr_coords}. "
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Answer not provided for {input_type}"
-msgstr ""
+msgstr " {input_type} atsakymas nepateiktas"
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "The Staff answer could not be interpreted as a number."
-msgstr ""
+msgstr "Personalo atsakymo neįmanoma suprasti kaip skaičiaus."
 
 #: common/lib/capa/capa/responsetypes.py
 msgid "Could not interpret '{given_answer}' as a number."
-msgstr ""
+msgstr "Neįmanoma {given_answer} suprasti kaip skaičiaus."
 
 #: common/lib/xmodule/xmodule/annotatable_module.py
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 msgid "XML data for the annotation"
-msgstr ""
+msgstr "XML duomenys komentarui"
 
 #: common/lib/xmodule/xmodule/annotatable_module.py
 #: common/lib/xmodule/xmodule/capa_base.py
@@ -1194,9 +1225,8 @@ msgstr ""
 #: common/lib/xmodule/xmodule/textannotation_module.py
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 #: common/lib/xmodule/xmodule/word_cloud_module.py
-#: cms/templates/container.html
 msgid "Display Name"
-msgstr ""
+msgstr "Rodyti pavadinimą"
 
 #: common/lib/xmodule/xmodule/annotatable_module.py
 #: common/lib/xmodule/xmodule/discussion_module.py
@@ -1207,11 +1237,11 @@ msgstr ""
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 #: common/lib/xmodule/xmodule/word_cloud_module.py
 msgid "Display name for this module"
-msgstr ""
+msgstr "Rodyti šio modulio pavadinimą"
 
 #: common/lib/xmodule/xmodule/annotatable_module.py
 msgid "Annotation"
-msgstr ""
+msgstr "Komentaras"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -1219,30 +1249,31 @@ msgstr ""
 #: common/lib/xmodule/xmodule/html_module.py
 msgid "This name appears in the horizontal navigation at the top of the page."
 msgstr ""
+"Šis pavadinimas matomas horizontalioje naršymo juostoje puslapio viršuje."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Number of attempts taken by the student on this problem"
-msgstr "Kurso dalyvis šį uždavinį bandė išspręsti tiek kartų"
+msgstr "Kurso dalyvis šią užduotį bandė išspręsti tiek kartų"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid "Maximum Attempts"
-msgstr ""
+msgstr "Maksimalus bandymų skaičius"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
 "Defines the number of times a student can try to answer this problem. If the"
 " value is not set, infinite attempts are allowed."
 msgstr ""
-"Apibrėžia, kiek kartų kurso dalyvis gali bandyti atsakyti į šį uždavinį. "
+"Apibrėžia, kiek kartų kurso dalyvis gali bandyti atsakyti į šią užduotį. "
 "Jeigu dydis nenustatytas, bandymų skaičius neribojamas."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Date that this problem is due by"
-msgstr ""
+msgstr "Data, kai reikia pateikti šios užduoties atsakymą"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -1252,79 +1283,83 @@ msgid ""
 "by an instructor, and will override the global due date if it is set to a "
 "date that is later than the global due date."
 msgstr ""
-"Data, kai konkretus kurso dalyvis turi pateikti šio uždavinio atsakymą. Ją "
+"Data, kai konkretus kurso dalyvis turi pateikti šios užduoties atsakymą. Ją "
 "gali nustatyti lektorius ir ji panaikina visuotinę pateikimo datą, jeigu ji "
 "yra vėlesnė už visuotinę pateikimo datą."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Amount of time after the due date that submissions will be accepted"
-msgstr ""
+msgstr "Kiek laiko po nustatytos pateikimo datos bus priimamos pateiktys"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
-#: lms/templates/problem.html
 msgid "Show Answer"
-msgstr ""
+msgstr "Rodyti atsakymą"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
 "Defines when to show the answer to the problem. A default value can be set "
 "in Advanced Settings."
 msgstr ""
+"Apibrėžia, kada rodyti užduoties atsakymą. Numatytąją vertę galima nustatyti"
+" papildomose nuostatose."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Always"
-msgstr ""
+msgstr "Visada"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Answered"
-msgstr ""
+msgstr "Atsakyta"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Attempted"
-msgstr ""
+msgstr "Bandyta"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Closed"
-msgstr ""
+msgstr "Uždaryta"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Finished"
-msgstr ""
+msgstr "Baigta"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Correct or Past Due"
-msgstr ""
+msgstr "Teisinga arba praėjusi pateikimo data"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Past Due"
-msgstr ""
+msgstr "Pradelsta"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Never"
-msgstr ""
+msgstr "Niekada"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Whether to force the save button to appear on the page"
-msgstr ""
+msgstr "Ar mygtukas \"Išsaugoti\" turėtų priverstinai atsirasti puslapyje"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Show Reset Button"
-msgstr ""
+msgstr "Rodyti mygtuką \"Atkurti\""
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
 "Determines whether a 'Reset' button is shown so the user may reset their "
 "answer. A default value can be set in Advanced Settings."
 msgstr ""
+"Apibrėžia, ar rodyti mygtuką \"Atkurti\", kad naudotojai galėtų iš naujo "
+"nustatyti atsakymą. Numatytoji vertė gali būti nustatyta papildomose "
+"nuostatose."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid "Randomization"
-msgstr ""
+msgstr "Atsitiktinė atranka"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
@@ -1333,13 +1368,13 @@ msgid ""
 "numeric values. A default value can be set in Advanced Settings."
 msgstr ""
 "Apibrėžia, kaip dažnai įvestys atsitiktinai atrenkamos kurso dalyviui "
-"parsisiunčiant uždavinį. Ši nuostata taikoma tik tiems uždaviniams, kuriuose"
-" gali būti atsitiktinai generuojamų skaitinių reikšmių. Numatytąją vertę "
-"galima nustatyti papildomose nuostatose."
+"parsisiunčiant užduotį. Ši nuostata taikoma tik toms užduotims, kuriose gali"
+" būti atsitiktinai generuojamų skaitinių reikšmių. Numatytąją vertę galima "
+"nustatyti papildomose nuostatose."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "On Reset"
-msgstr ""
+msgstr "Nustatoma iš naujo"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Per Student"
@@ -1349,7 +1384,7 @@ msgstr "Kiekvienam kurso dalyviui"
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 #: common/lib/xmodule/xmodule/discussion_module.py
 msgid "XML data for the problem"
-msgstr ""
+msgstr "XML duomenys užduočiai"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Dictionary with the correctness of current student answers"
@@ -1357,7 +1392,7 @@ msgstr "Kurso dalyvių dabartinių atsakymų teisingumo žinynas"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Dictionary for maintaining the state of inputtypes"
-msgstr ""
+msgstr "Įvesties tipų būsenos palaikymo žinynas"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Dictionary with the current student responses"
@@ -1365,19 +1400,19 @@ msgstr "Kurso dalyvių dabartinių atsakymų žinynas"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Whether the student has answered the problem"
-msgstr "Ar kurso dalyvis atsakė į uždavinį"
+msgstr "Ar kurso dalyvis išsprendė užduotį"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Random seed for this student"
-msgstr ""
+msgstr "Atsitiktinė pradžia šiam kurso dalyviui"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Last submission time"
-msgstr ""
+msgstr "Paskutinis pateikties laikas"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Timer Between Attempts"
-msgstr ""
+msgstr "Laikmatis tarp bandymų"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
@@ -1385,38 +1420,42 @@ msgid ""
 "attempts."
 msgstr ""
 "Kiek sekundžių kurso dalyvis turi palaukti prieš pakartotinai pateikdamas "
-"uždavinio, kurį spręsti galima daug kartų, sprendimą."
+"užduoties, kurią spręsti galima daug kartų, sprendimą."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 #: common/lib/xmodule/xmodule/peer_grading_module.py
 msgid "Problem Weight"
-msgstr ""
+msgstr "Užduoties sunkumas"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
 "Defines the number of points each problem is worth. If the value is not set,"
 " each response field in the problem is worth one point."
 msgstr ""
+"Apibrėžia, kiek taškų yra verta kiekviena užduotis. Jeigu reikšmė "
+"nenustatyta, kiekvienas užduoties atsakymo laukas vertas vieno taško."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Markdown source of this module"
-msgstr ""
+msgstr "Šio modulio Markdown šaltinis"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
 "Source code for LaTeX and Word problems. This feature is not well-supported."
 msgstr ""
+"Šaltinio kodas užduotims \"LaTeX\" ir \"Word\" formate. Ši funkcija nėra "
+"gerai palaikoma."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "String customization substitutions for particular locations"
-msgstr ""
+msgstr "Eilučių tinkinimo pakaitalai tam tikrose vietose"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/html_module.py
 msgid "Enable LaTeX templates?"
-msgstr ""
+msgstr "Leisti \"LaTeXo\" šablonus?"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Check"
@@ -1428,11 +1467,11 @@ msgstr "Galutinis patikrinimas"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Checking..."
-msgstr ""
+msgstr "Tikrinama..."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Warning: The problem has been reset to its initial state!"
-msgstr ""
+msgstr "Įspėjimas: užduotis grąžinta į pradinę būseną!"
 
 #. Translators: Following this message, there will be a bulleted list of
 #. items.
@@ -1440,11 +1479,11 @@ msgstr ""
 msgid ""
 "The problem's state was corrupted by an invalid submission. The submission "
 "consisted of:"
-msgstr ""
+msgstr "Užduoties būseną iškreipė neteisinga pateiktis. Buvo pateikta:"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "If this error persists, please contact the course staff."
-msgstr ""
+msgstr "Jei ši klaida kartojasi, prašome susisiekti su kurso personalu."
 
 #. Translators: 'closed' means the problem's due date has passed. You may no
 #. longer attempt to solve the problem.
@@ -1452,83 +1491,93 @@ msgstr ""
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Problem is closed."
-msgstr ""
+msgstr "Užduočiai skirtas laikas baigėsi."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Problem must be reset before it can be checked again."
-msgstr ""
+msgstr "Prieš iš naujo tikrinant užduotį reikia ją atnaujinti."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "You must wait at least {wait} seconds between submissions."
-msgstr ""
+msgstr "Tarp pateikčių turi praeiti bent {wait} sekundžių."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
 "You must wait at least {wait_secs} between submissions. {remaining_secs} "
 "remaining."
 msgstr ""
+"Tarp pateikčių turi praeiti bent {wait_secs} sekundžių. Liko "
+"{remaining_secs} "
 
 #. Translators: {msg} will be replaced with a problem's error message.
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Error: {msg}"
-msgstr ""
+msgstr "Klaida: {msg}"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "{num_hour} hour"
-msgstr ""
+msgstr "{num_hour} valandos"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "{num_minute} minute"
-msgstr ""
+msgstr "{num_minute} minutės"
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "{num_second} second"
-msgstr ""
+msgstr "{num_second} sekundės"
 
 #. Translators: 'rescoring' refers to the act of re-submitting a student's
 #. solution so it can get a new score.
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Problem's definition does not support rescoring."
 msgstr ""
+"Užduoties apibrėžimas nepalaiko pakartotinio pateikimo įvertinimui "
+"perskaičiuoti."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Problem must be answered before it can be graded again."
-msgstr ""
+msgstr "Užduotis turi būti atsakyta prieš ją vėl įvertinant."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Problem needs to be reset prior to save."
-msgstr ""
+msgstr "Prieš išsaugant užduotį reikia ją atnaujinti."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Your answers have been saved."
-msgstr ""
+msgstr "Jūsų atsakymai yra išsaugoti."
 
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid ""
 "Your answers have been saved but not graded. Click 'Check' to grade them."
 msgstr ""
+"Jūsų atsakymai yra išsaugoti, bet neįvertinti. Norėdami juos įvertinti "
+"spragtelėkite \"Tikrinti\"."
 
 #. Translators: A student must "make an attempt" to solve the problem on the
 #. page before they can reset it.
 #: common/lib/xmodule/xmodule/capa_base.py
 msgid "Refresh the page and make an attempt before resetting."
-msgstr ""
+msgstr "Prieš paleisdami iš naujo atnaujinkite puslapį ir vėl pabandykite. "
 
 #: common/lib/xmodule/xmodule/capa_module.py
 msgid ""
 "We're sorry, there was an error with processing your request. Please try "
 "reloading your page and trying again."
 msgstr ""
+"Atsiprašome, kilo problema vykdant jūsų užklausą. Prašome perkrauti puslapį "
+"ir pabandyti dar kartą."
 
 #: common/lib/xmodule/xmodule/capa_module.py
 msgid ""
 "The state of this problem has changed since you loaded this page. Please "
 "refresh your page."
 msgstr ""
+"Šios užduoties būsena pasikeitė nuo to laiko, kai įkėlėte šį puslapį. "
+"Prašome puslapį atnaujinti."
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Open Response Assessment"
-msgstr ""
+msgstr "Atvirojo atsakymo vertinimas"
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Current task that the student is on."
@@ -1541,10 +1590,16 @@ msgid ""
 "module is created and students have attempted it (for example, if a self "
 "assessed problem is changed to self and peer assessed)."
 msgstr ""
+"Išsaugotų kurso dalyvių būsenų žinynų sąrašų sąrašas. Šis laukas yra "
+"užpildytas tik tada, jeigu sukūrus modulį ir kurso dalyviams bandžius jį "
+"spręsti lektorius pakeičia užduotis (pavyzdžiui, užduotis, kai savo "
+"atsakymus vertina pats kurso dalyvis, pakeičiama užduotimi, kai savo "
+"atsakymus vertina pats kurso dalyvis ir jo atsakymus vertina bendrakursiai)."
+" "
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "List of state dictionaries of each task within this module."
-msgstr ""
+msgstr "Šio modulio kiekvienos užduoties būsenų žinynų sąrašas."
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Which step within the current task that the student is on."
@@ -1552,29 +1607,28 @@ msgstr "Kokį šios užduoties žingsnį dabar atlieka kurso dalyvis."
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 #: common/lib/xmodule/xmodule/peer_grading_module.py
-#: lms/templates/peer_grading/peer_grading.html
 msgid "Graded"
-msgstr ""
+msgstr "Įvertinta"
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid ""
 "Defines whether the student gets credit for this problem. Credit is based on"
 " peer grades of this problem."
 msgstr ""
-"Apibrėžia, ar įskaitomas šis kurso dalyvio uždavinys. Įskaita priklauso nuo "
-"to, kaip šį uždavinį įvertino bendrakursiai."
+"Apibrėžia, ar įskaitoma ši kurso dalyvio užduotis. Įskaita priklauso nuo to,"
+" kaip šią užduotį įvertino bendrakursiai."
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "If the problem is ready to be reset or not."
-msgstr ""
+msgstr "Ar užduotis yra ar nėra paruošta nustatyti iš naujo."
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "The number of times the student can try to answer this problem."
-msgstr "Kiek kartų kurso dalyvis gali bandyti atsakyti į šį uždavinį. "
+msgstr "Kiek kartų kurso dalyvis gali bandyti atsakyti į šią užduotį. "
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Allow File Uploads"
-msgstr ""
+msgstr "Leisti įkelti failus"
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Whether or not the student can submit files as a response."
@@ -1582,17 +1636,20 @@ msgstr "Ar kurso dalyvis gali atsakydamas pateikti failus."
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Disable Quality Filter"
-msgstr ""
+msgstr "Išjungti kokybės filtrą"
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid ""
 "If False, the Quality Filter is enabled and submissions with poor spelling, "
 "short length, or poor grammar will not be peer reviewed."
 msgstr ""
+"Jeigu \"Klaidinga\", kokybės filtras yra įjungtas ir bendrakursiai "
+"neperžiūrės pateikčių, kuriose yra daug rašybos ar gramatikos klaidų arba "
+"kurios yra trumpos."
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Current version number"
-msgstr ""
+msgstr "Šios versijos numeris"
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 #: common/lib/xmodule/xmodule/peer_grading_module.py
@@ -1600,41 +1657,43 @@ msgid ""
 "Defines the number of points each problem is worth. If the value is not set,"
 " each problem is worth one point."
 msgstr ""
+"Apibrėžia, kiek taškų yra verta kiekviena užduotis. Jeigu reikšmė "
+"nenustatyta, kiekviena užduotis verta vieno taško."
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Minimum Peer Grading Calibrations"
-msgstr ""
+msgstr "Minimalus kiekis darbų bendrakursių vertinimui"
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid ""
 "The minimum number of calibration essays each student will need to complete "
 "for peer grading."
 msgstr ""
-"Kiek mažiausiai bendraklasių darbų kiekvienas kurso dalyvis turi patikrinti."
+"Kiek mažiausiai bendrakursių darbų kiekvienas kurso dalyvis turi patikrinti."
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Maximum Peer Grading Calibrations"
-msgstr ""
+msgstr "Maksimalus  kiekis darbų bendrakursių vertinimui"
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid ""
 "The maximum number of calibration essays each student will need to complete "
 "for peer grading."
 msgstr ""
-"Kiek daugiausiai bendraklasių darbų kiekvienas kurso dalyvis turi "
+"Kiek daugiausiai bendrakursių darbų kiekvienas kurso dalyvis turi "
 "patikrinti."
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Peer Graders per Response"
-msgstr ""
+msgstr "Kiekvieną atsakymą turi įvertinti tiek bendrakursių"
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "The number of peers who will grade each submission."
-msgstr ""
+msgstr "Kiek bendrakursių vertins kiekvieną pateiktį."
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Required Peer Grading"
-msgstr ""
+msgstr "Privalomas bendrakursių vertinimas"
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid ""
@@ -1646,7 +1705,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Allow \"overgrading\" of peer submissions"
-msgstr ""
+msgstr "Leisti daugiau kartų vertinti bendrakursių pateiktis"
 
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid ""
@@ -1663,17 +1722,19 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "LTI Passports"
-msgstr ""
+msgstr "LTI pasai"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter the passports for course LTI tools in the following format: "
 "\"id:client_key:client_secret\"."
 msgstr ""
+"Įveskite kurso LTI priemonių pasus šiuo formatu: "
+"\"id:client_key:client_secret\"."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Advertised Start Date"
-msgstr ""
+msgstr "Kurso reklamos pradžios data"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -1681,59 +1742,68 @@ msgid ""
 "is different from the set start date. To advertise the set start date, enter"
 " null."
 msgstr ""
+"Įveskite datą, kurią norite paskelbti kaip kurso pradžios datą, jeigu ši "
+"data skiriasi nuo nustatytosios pradžios datos. Norėdami reklamuoti nuo "
+"nustatytosios pradžios datos, nieko nerašykite."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Show Calculator"
-msgstr ""
+msgstr "Rodyti skaičiuoklę"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter true or false. When true, students can see the calculator in the "
 "course."
 msgstr ""
+"Įveskite \"taip\" arba \"ne\". Jei įvesta \"taip\", kurso dalyviai matys "
+"skaičiuoklę."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter the name of the course as it should appear in the edX.org course list."
-msgstr ""
+msgstr "Įveskite kurso pavadinimą, kuris bus rodomas edX.org kursų sąraše."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Display Name"
-msgstr ""
+msgstr "Kurso rodomas pavadinimas"
 
 #: common/lib/xmodule/xmodule/course_module.py
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid "Course Editor"
-msgstr ""
+msgstr "Kurso rengyklė"
 
 #: common/lib/xmodule/xmodule/course_module.py
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid "Enter the method by which this course is edited (\"XML\" or \"Studio\")."
-msgstr ""
+msgstr "Įveskite, kokiu būdu šis kursas yra redaguojamas (\"XML\" ar \"Studio\")."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Show Chat Widget"
-msgstr ""
+msgstr "Rodyti pokalbių valdiklį"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter true or false. When true, students can see the chat widget in the "
 "course."
 msgstr ""
+"Įveskite \"taip\" arba \"ne\". Jei įvesta \"taip\", kurso dalyviai matys "
+"pokalbių valdiklį."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Survey URL"
-msgstr ""
+msgstr "Kurso apklausos URL nuoroda"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter the URL for the end-of-course survey. If your course does not have a "
 "survey, enter null."
 msgstr ""
+"Įveskite kurso pabaigos apklausos URL nuorodą. Jeigu jūsų kurse apklausos "
+"nėra, nieko nerašykite."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Discussion Blackout Dates"
-msgstr ""
+msgstr "Diskusijų visiško atjungimo datos"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -1745,10 +1815,17 @@ msgid ""
 "like this: [[\"2014-09-15\", \"2014-09-21\"], [\"2014-10-01\", "
 "\"2014-10-08\"]]"
 msgstr ""
+"Įveskite datų poras, kada kurso dalyviai negali rašyti į diskusijų forumus. "
+"Kiekviena pora turi būti šio formato:  [\"MMMM-MM-DD\", \"MMMM-MM-DD\"]. "
+"Jeigu šalia datų norite nurodyti ir laiką, įveskite šiuo formatu:  [\"MMMM-"
+"MM-DDTVV:MM\", \"MMMM-MM-DDTVV:MM\"] (tarp datos ir laiko būtina įterpti "
+"\"T\").  Įrašas, apibrėžiantis daugiau negu vieną informacijos pateikimo "
+"sustabdymo laikotarpį, gali atrodyti taip:  [[\"2014-09-15\", "
+"\"2014-09-21\"], [\"2014-10-01\", \"2014-10-08\"]]"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Discussion Topic Mapping"
-msgstr ""
+msgstr "Diskusijų temų atvaizdavimas"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -1757,28 +1834,35 @@ msgid ""
 "example, one discussion category may be \"Lydian Mode\": {\"id\": \"i4x-"
 "UniversityX-MUS101-course-2014_T1\"}."
 msgstr ""
+"Įveskite diskusijų kategorijas šiuo formatu: \"Kategorijos pavadinimas\": "
+"{\"id\": \"i4x-InstitutionName-CourseNumber-course-CourseRun\"}. Pavyzdžiui,"
+" viena diskusijų kategorija gali būti \"Lydinė dermė\": {\"id\": \"i4x-"
+"UniversityX-MUS101-course-2014_T1\"}."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Discussion Sorting Alphabetical"
-msgstr ""
+msgstr "Diskusijų rūšiavimas abėcėlės tvarka"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter true or false. If true, discussion categories and subcategories are "
 "sorted alphabetically. If false, they are sorted chronologically."
 msgstr ""
+"Įveskite \"taip\" arba \"ne\". Jeigu įvesite \"taip\", diskusijų kategorijos"
+" ir pakategorės bus rūšiuojamos abėcėlės tvarka. Jeigu įvesite \"ne\", jos "
+"bus rūšiuojamos chronologiškai."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Announcement Date"
-msgstr ""
+msgstr "Kurso paskelbimo data"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Enter the date to announce your course."
-msgstr ""
+msgstr "Įveskite savo kurso paskelbimo datą."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Cohort Configuration"
-msgstr ""
+msgstr "Pogrupio konfigūracija"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -1786,54 +1870,64 @@ msgid ""
 "student assignment to groups, or identify any course-wide discussion topics "
 "as private to cohort members."
 msgstr ""
+"Įveskite tvarkos raktus ir vertes, kad būtų galima įjungti pogrupio "
+"funkciją, nustatyti automatinį kurso dalyvių priskyrimą grupėms arba kurią "
+"nors kurso diskusijos temą skirti tik pogrupio nariams."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Is New"
-msgstr ""
+msgstr "Kursas yra naujas"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter true or false. If true, the course appears in the list of new courses "
 "on edx.org, and a New! badge temporarily appears next to the course image."
 msgstr ""
+"Įveskite \"taip\" arba \"ne\". Jeigu įvesite \"taip\", kursas bus rodomas "
+"naujų kursų sąraše edx.org ir ženklelis \"Naujas!\" laikinai bus matomas "
+"šalia kurso paveikslėlio. "
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Mobile Course Available"
-msgstr ""
+msgstr "Galimas mobilusis kursas"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter true or false. If true, the course will be available to mobile "
 "devices."
 msgstr ""
+"Įveskite \"taip\" arba \"ne\". Jeigu įvesite \"taip\", kursas bus prieinamas"
+" mobiliuosiuose prietaisuose."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Not Graded"
-msgstr ""
+msgstr "Kursas nevertinamas"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Enter true or false. If true, the course will not be graded."
-msgstr ""
+msgstr "Įveskite \"taip\" arba \"ne\". Jeigu įvesite \"taip\", kursas nebus vertinamas."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Disable Progress Graph"
-msgstr ""
+msgstr "Išjungti pažangos grafą"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Enter true or false. If true, students cannot view the progress graph."
 msgstr ""
+"Įveskite \"taip\" arba \"ne\". Jeigu įvesite \"taip\", kurso dalyviai "
+"nematys pažangos grafos."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "PDF Textbooks"
-msgstr ""
+msgstr "PDF vadovėliai"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "List of dictionaries containing pdf_textbook configuration"
-msgstr ""
+msgstr "Sąrašas žodynų su pdf vadovėlių konfigūracija"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "HTML Textbooks"
-msgstr ""
+msgstr "HTML vadovėliai"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -1841,30 +1935,37 @@ msgid ""
 " name of the tab (usually the name of the book) as well as the URLs and "
 "titles of all the chapters in the book."
 msgstr ""
+"Įveskite HTML vadovėlių, kurie kurso medžiagoje yra matomi atskirose "
+"kortelėse, kortelių pavadinimus (paprastai tai yra knygos pavadinimas) , "
+"taip pat visų knygos skyrių URL nuorodas ir pavadinimus."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Remote Gradebook"
-msgstr ""
+msgstr "Nuotolinė pažymių knygelė"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter the remote gradebook mapping. Only use this setting when "
 "REMOTE_GRADEBOOK_URL has been specified."
 msgstr ""
+"Įveskite nuotolinės pažymių knygelės atvaizdavimą. Šią nuostatą naudokite "
+"tik tada, kai yra nurodyta NUOTOLINĖS_PAŽYMIŲ_KNYGELĖS_URL."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Allow Anonymous Discussion Posts"
-msgstr ""
+msgstr "Leisti anoniminius diskusijų pranešimus"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter true or false. If true, students can create discussion posts that are "
 "anonymous to all users."
 msgstr ""
+"Įveskite \"taip\" arba \"ne\". Jeigu įvesite \"taip\", kurso dalyviai galės "
+"rašyti pranešimus, kurie visiems naudotojams bus anoniminiai. "
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Allow Anonymous Discussion Posts to Peers"
-msgstr ""
+msgstr "Leisti bendrakursiams anoniminius diskusijų pranešimus"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -1872,36 +1973,42 @@ msgid ""
 "anonymous to other students. This setting does not make posts anonymous to "
 "course staff."
 msgstr ""
+"Įveskite \"taip\" arba \"ne\". Jeigu įvesite \"taip\", kurso dalyviai galės "
+"kurti diskusijų pranešimus, kurie bus anonimiški kitiems kurso dalyviams. "
+"Esant šiai nuostatai pranešimai nebus anonimiški kurso personalui. "
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Advanced Module List"
-msgstr ""
+msgstr "Papildomų modulių sąrašas"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Enter the names of the advanced components to use in your course."
 msgstr ""
+"Įveskite papildomų komponentų, kurie bus naudojami kurse, pavadinimus."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Getting Started With Studio"
-msgstr ""
+msgstr "Pradėti naudotis \"Studio\""
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Add Course Team Members"
-msgstr ""
+msgstr "Pridėti kurso komandos narius"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Grant your collaborators permission to edit your course so you can work "
 "together."
 msgstr ""
+"Suteikite savo bendradarbiams teisę redaguoti jūsų kursą, kad galėtumėte "
+"dirbti kartu."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Edit Course Team"
-msgstr ""
+msgstr "Redaguoti kurso komandą"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Set Important Dates for Your Course"
-msgstr ""
+msgstr "Nustatykite jūsų kursui svarbias datas"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -1913,43 +2020,47 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Edit Course Details &amp; Schedule"
-msgstr ""
+msgstr "Redaguoti kurso informacijos &amp; tvarkaraštį"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Draft Your Course's Grading Policy"
-msgstr ""
+msgstr "Parenkite savo kurso vertinimo tvarką"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Set up your assignment types and grading policy even if you haven't created "
 "all your assignments."
 msgstr ""
+"Nustatykite atsiskaitymo užduočių tipus ir vertinimo tvarką net jeigu "
+"nesukūrėte visų atsiskaitymo užduočių."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Edit Grading Settings"
-msgstr ""
+msgstr "Redaguoti vertinimo nuostatas"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Explore the Other Studio Checklists"
-msgstr ""
+msgstr "Išnagrinėti kitus \"Studio\" veiksmų sąrašus"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Discover other available course authoring tools, and find help when you need"
 " it."
 msgstr ""
+"Atraskite kitas esamas kurso kūrimo priemones ir gaukite pagalbos, kai jums "
+"jos reikia."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Draft a Rough Course Outline"
-msgstr ""
+msgstr "Sudaryti apytikrį kurso planą"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Create Your First Section and Subsection"
-msgstr ""
+msgstr "Sukurkite savo pirmąją temą ir potemę"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Use your course outline to build your first Section and Subsection."
-msgstr ""
+msgstr "Naudodamiesi savo kurso planu sukurkite pirmąją temą ir potemę."
 
 #: common/lib/xmodule/xmodule/course_module.py
 #: common/lib/xmodule/xmodule/course_module.py
@@ -1959,11 +2070,11 @@ msgstr ""
 #: common/lib/xmodule/xmodule/course_module.py
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Edit Course Outline"
-msgstr ""
+msgstr "Redaguoti kurso planą"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Set Section Release Dates"
-msgstr ""
+msgstr "Nustatyti temų paskelbimo datas"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -1975,43 +2086,48 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Designate a Subsection as Graded"
-msgstr ""
+msgstr "Pažymėti potemę kaip įvertintą"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Set a Subsection to be graded as a specific assignment type. Assignments "
 "within graded Subsections count toward a student's final grade."
 msgstr ""
+"Nustatykite, kad potemė būtų vertinama kaip konkretus užduoties tipas. "
+"Vertinamų potemių užduotys priskaičiuojamos prie galutinio kurso dalyvio "
+"įvertinimo."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Reordering Course Content"
-msgstr ""
+msgstr "Pertvarkomas kurso turinys"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Use drag and drop to reorder the content in your course."
-msgstr ""
+msgstr "Nutempdami į reikiamą vietą pertvarkykite kurso turinį."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Renaming Sections"
-msgstr ""
+msgstr "Pervadinamos temos"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Rename Sections by clicking the Section name from the Course Outline."
-msgstr ""
+msgstr "Pervadinkite temas spragtelėdami temos pavadinimą kurso plane."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Deleting Course Content"
-msgstr ""
+msgstr "Šalinamas kurso turinys"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Delete Sections, Subsections, or Units you don't need anymore. Be careful, "
 "as there is no Undo function."
 msgstr ""
+"Pašalinkite temas, potemes arba skyrius, kurių jums nebereikia. Būkite "
+"atidūs, nes šių veiksmų negalėsite atšaukti."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Add an Instructor-Only Section to Your Outline"
-msgstr ""
+msgstr "Pridėkite tik lektoriams skirtą temą prie savo plano"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2019,56 +2135,61 @@ msgid ""
 "useful. To do this, create a section and set the release date to the distant"
 " future."
 msgstr ""
+"Kai kuriems kurso autoriams naudinga nesutvarkytą, nebaigtą darbą "
+"suskirstyti temomis. Norėdami tai padaryti, sukurkite temą ir nustatykite "
+"jos paskelbimo datą tolimoje ateityje."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Explore edX's Support Tools"
-msgstr ""
+msgstr "Išnagrinėti edX priežiūros priemones"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Explore the Studio Help Forum"
-msgstr ""
+msgstr "Išnagrinėti \"Studio\" pagalbos forumą"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Access the Studio Help forum from the menu that appears when you click your "
 "user name in the top right corner of Studio."
 msgstr ""
+"Įeikite į \"Studio\" pagalbos forumą per meniu, kuris atsiranda paspaudus "
+"savo naudotojo vardą viršutiniame dešiniajame \"Studio\" kampe. "
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Visit Studio Help"
-msgstr ""
+msgstr "Aplankyti \"Studio\" pagalbą"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Enroll in edX 101"
-msgstr ""
+msgstr "Užsirašyti į \"edX 101\""
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Register for edX 101, edX's primer for course creation."
-msgstr ""
+msgstr "Užsiregistruoti į \"edX 101\", edX kursų kūrimo pradžiamokslį."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Register for edX 101"
-msgstr ""
+msgstr "Registruotis į \"edX 101\""
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Download the Studio Documentation"
-msgstr ""
+msgstr "Atsiųsti \"Studio\" dokumentus"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Download the searchable Studio reference documentation in PDF form."
-msgstr ""
+msgstr "Atsiųsti \"Studio\" paieškos informacinius dokumentus PDF formatu."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Download Documentation"
-msgstr ""
+msgstr "Atsiųsti dokumentus"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Draft Your Course About Page"
-msgstr ""
+msgstr "Parenkite puslapį apie savo kursą"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Draft a Course Description"
-msgstr ""
+msgstr "Sukurkite kurso aprašą"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2085,11 +2206,11 @@ msgstr ""
 #: common/lib/xmodule/xmodule/course_module.py
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Edit Course Schedule &amp; Details"
-msgstr ""
+msgstr "Redaguoti kurso tvarkaraščio &amp; informaciją"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Add Staff Bios"
-msgstr ""
+msgstr "Pridėti personalo biografijas"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2101,15 +2222,15 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Add Course FAQs"
-msgstr ""
+msgstr "Pridėti DUK apie kursą"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Include a short list of frequently asked questions about your course."
-msgstr ""
+msgstr "Įtraukite trumpą sąrašą dažnai užduodamų klausimų apie jūsų kursą."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Add Course Prerequisites"
-msgstr ""
+msgstr "Pridėti kurso reikalavimus"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2121,7 +2242,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Info Sidebar Name"
-msgstr ""
+msgstr "Kurso pavadinimas informacinio puslapio šoninėje juostoje"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2129,38 +2250,47 @@ msgid ""
 "on the Course Info page. Your course handouts appear in the right panel of "
 "the page."
 msgstr ""
+"Įveskite antraštę, kurią norite, kad kurso dalyviai matytų jūsų kurso "
+"dalijamosios medžiagos viršuje informaciniame kurso puslapyje. Jūsų kurso "
+"dalijamoji medžiaga yra matoma dešiniajame puslapio skydelyje."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Due Date Display Format"
-msgstr ""
+msgstr "Pateikimo datos rodymo formatas"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter the format due dates are displayed in. Due dates must be in MM-DD-"
 "YYYY, DD-MM-YYYY, YYYY-MM-DD, or YYYY-DD-MM format."
 msgstr ""
+"Įveskite, kokiu formatu rodomos pateikimo datos. Pateikimo datos turi būti "
+"MM-DD-MMMM, DD-MM-MMMM, MMMM-MM-DD arba MMMM-DD-MM formato."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "External Login Domain"
-msgstr ""
+msgstr "Išorinio prisijungimo sritis"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Enter the external login method students can use for the course."
 msgstr ""
+"Įveskite, kokiu išorinio prisijungimo būdu kurso dalyviai gali naudotis."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Certificates Downloadable Before End"
-msgstr ""
+msgstr "Galima atsisiųsti sertifikatus kursui nesibaigus"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter true or false. If true, students can download certificates before the "
 "course ends, if they've met certificate requirements."
 msgstr ""
+"Įveskite \"taip\" arba \"ne\". Jeigu įvesite \"taip\", kurso dalyviai galės "
+"atsisiųsti sertifikatus kursui dar nesibaigus, jeigu jie atitinka "
+"sertifikatui gauti keliamus reikalavimus."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Certificates Display Behavior"
-msgstr ""
+msgstr "Sertifikatų rodymo veiksena"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2170,10 +2300,15 @@ msgid ""
 " a course has ended. 'early_no_info' will hide all certificate information "
 "unless a student has earned a certificate."
 msgstr ""
+"Trys galimos būsenos: \"pabaigos\", \"išankstinė su info\", \"išankstinė be "
+"info\". \"Pabaigos\" yra numatytoji veiksena, kai sertifikatai rodomi tik "
+"pasibaigus kursui. \"Išankstinė su info\" parodys visą sertifikato "
+"informaciją kursui nesibaigus. \"Išankstinė be info\" paslėps visą "
+"sertifikato informaciją, jeigu kurso dalyvis sertifikato nenusipelnė."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course About Page Image"
-msgstr ""
+msgstr "Puslapio \"Apie kursą\" paveikslas"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2181,56 +2316,65 @@ msgid ""
 "Files & Uploads page. You can also set the course image on the Settings & "
 "Details page."
 msgstr ""
+"Redaguokite kurso paveikslėlio failo pavadinimą. Turite įkelti šį failą į "
+"failų ir siuntų puslapį. Taip pat galite nustatyti kurso paveikslėlį "
+"nuostatų ir informacijos puslapyje."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Between quotation marks, enter the short name of the course to use on the "
 "certificate that students receive when they complete the course."
 msgstr ""
+"Kabutėse įrašykite trumpą kurso pavadinimą, nurodomą sertifikatuose, kuriuos"
+" kurso dalyviai gaus baigę kursą. "
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Certificate Name (Short)"
-msgstr ""
+msgstr "Sertifikato pavadinimas (trumpas)"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Between quotation marks, enter the long name of the course to use on the "
 "certificate that students receive when they complete the course."
 msgstr ""
+"Kabutėse įrašykite ilgą kurso pavadinimą, nurodomą sertifikatuose, kuriuos "
+"kurso dalyviai gaus baigę kursą. "
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Certificate Name (Long)"
-msgstr ""
+msgstr "Sertifikato pavadinimas (ilgas)"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "CSS Class for Course Reruns"
-msgstr ""
+msgstr "Kurso pakartojimų CSS klasė"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Allows courses to share the same css class across runs even if they have "
 "different numbers."
 msgstr ""
+"Leidžia visiems kurso pakartojimams priklausyti tai pačiai CSS klasei, net "
+"jeigu jų numeriai skirtingi."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Discussion Forum External Link"
-msgstr ""
+msgstr "Išorinė diskusijos forumo nuoroda"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Allows specification of an external link to replace discussion forums."
-msgstr ""
+msgstr "Leidžia išorinės nuorodos specifikacijai pakeisti diskusijos forumus."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Hide Progress Tab"
-msgstr ""
+msgstr "Slėpti pažangos kortelę"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Allows hiding of the progress tab."
-msgstr ""
+msgstr "Leidžia paslėpti pažangos kortelę."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Organization Display String"
-msgstr ""
+msgstr "Kurso struktūros monitoriaus eilutė"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2239,10 +2383,13 @@ msgid ""
 "the course. To use the organization that you entered when you created the "
 "course, enter null."
 msgstr ""
+"Įveskite, kaip norite struktūruoti kurso medžiagą. Ši nuostata panaikina "
+"kuriant kursą sudarytą struktūrą. Jeigu norite palikti tą struktūrą, kurią "
+"sudarėte kurdami kursą, nieko nerašykite."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Number Display String"
-msgstr ""
+msgstr "Kurso numerio monitoriaus eilutė"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
@@ -2251,75 +2398,134 @@ msgid ""
 "course. To use the course number that you entered when you created the "
 "course, enter null."
 msgstr ""
+"Įveskite kurso numerį, kuris bus matomas kurso medžiagoje. Ši nuostata "
+"panaikina kurso numerį, kurį įvedėte kurdami kursą. Jeigu norite palikti "
+"kurso numerį, kurį įvedėte kurdami kursą, nieko nerašykite."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Course Maximum Student Enrollment"
-msgstr ""
+msgstr "Maksimalus kurso dalyvių skaičius"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter the maximum number of students that can enroll in the course. To allow"
 " an unlimited number of students, enter null."
 msgstr ""
+"Įveskite maksimalų kurso dalyvių skaičių. Jeigu leidžiate neribotą dalyvių "
+"skaičių, nieko nerašykite. "
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Allow Public Wiki Access"
-msgstr ""
+msgstr "Leisti viešą vikio prieigą"
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "Enter true or false. If true, edX users can view the course wiki even if "
 "they're not enrolled in the course."
 msgstr ""
+"Įveskite \"taip\" arba \"ne\". Jeigu įvesite \"taip\", \"edX\" naudotojai "
+"galės matyti kurso vikį net jeigu jie nėra kurso dalyviai."
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "Invitation Only"
+msgstr "Tik pakviestiesiems"
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr "Prieš kursą pateikiamos apklausos pavadinimas"
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+"Apklausos formos, kuri naudotojui pateikiama neprasidėjus kursui, "
+"pavadinimas"
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr "Reikalinga apklausa prieš kursą"
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+"Nurodykite, ar kurso dalyviai privalo atsakyti į apklausą prieš peržiūrėdami"
+" jūsų kurso turinį. Jeigu nustatysite \"Taip\", turėsite nurodyti apklausos "
+"pavadinimą aukščiau esančiame parametre \"Kurso apklausos pavadinimas\". "
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
 msgstr ""
 
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
-msgstr ""
+msgstr "Bendras"
 
 #. Translators: TBD stands for 'To Be Determined' and is used when a course
 #. does not yet have an announced start date.
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "TBD"
-msgstr ""
+msgstr "Bus nustatyta"
 
 #: common/lib/xmodule/xmodule/discussion_module.py
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #: common/lib/xmodule/xmodule/discussion_module.py
 msgid ""
 "A category name for the discussion. This name appears in the left pane of "
 "the discussion forum for the course."
 msgstr ""
+"Diskusijos kategorijos pavadinimas. Šis pavadinimas matomas kairiajame kurso"
+" diskusijos forumo polangyje."
 
 #: common/lib/xmodule/xmodule/discussion_module.py
 msgid "Subcategory"
-msgstr ""
+msgstr "Subkategorija"
 
 #: common/lib/xmodule/xmodule/discussion_module.py
 msgid ""
 "A subcategory name for the discussion. This name appears in the left pane of"
 " the discussion forum for the course."
 msgstr ""
+"Diskusijos subkategorijos pavadinimas. Šis pavadinimas matomas kairiajame "
+"kurso diskusijos forumo polangyje."
 
 #: common/lib/xmodule/xmodule/html_module.py
 msgid "Text"
-msgstr ""
+msgstr "Tekstas"
 
 #: common/lib/xmodule/xmodule/html_module.py
 #: common/lib/xmodule/xmodule/html_module.py
 #: common/lib/xmodule/xmodule/html_module.py
 #: common/lib/xmodule/xmodule/peer_grading_module.py
 msgid "Html contents to display for this module"
-msgstr ""
+msgstr "Skirtas rodyti šio modulio HTML turinys"
 
 #: common/lib/xmodule/xmodule/html_module.py
 msgid "Source code for LaTeX documents. This feature is not well-supported."
 msgstr ""
+"Šaltinio kodas dokumentams \"LaTeX\" formate. Ši funkcija nėra gerai "
+"palaikoma."
 
 #: common/lib/xmodule/xmodule/html_module.py
 msgid ""
@@ -2327,35 +2533,39 @@ msgid ""
 "HTML. Select Raw to edit HTML directly. If you change this setting, you must"
 " save the component and then re-open it for editing."
 msgstr ""
+"Norėdami įvesti turinį pasirinkite \"Vaizdinis\" ir rengyklė automatiškai "
+"sukurs HTML. Norėdami redaguoti tiesiai HTML pasirinkite \"Neapdorotas\". "
+"Jeigu keisite šią nuostatą, turite išsaugoti komponentą ir tada iš naujo jį "
+"atidaryti redagavimui."
 
 #: common/lib/xmodule/xmodule/html_module.py
 msgid "Editor"
-msgstr ""
+msgstr "Redaktorius"
 
 #: common/lib/xmodule/xmodule/html_module.py
 msgid "Visual"
-msgstr ""
+msgstr "Vaizdinis"
 
 #: common/lib/xmodule/xmodule/html_module.py
 msgid "Raw"
-msgstr ""
+msgstr "Neapdorotas"
 
 #: common/lib/xmodule/xmodule/html_module.py
 msgid "HTML for the additional pages"
-msgstr ""
+msgstr "Papildomų puslapių HTML"
 
 #: common/lib/xmodule/xmodule/html_module.py
 msgid "List of course update items"
-msgstr ""
+msgstr "Atnaujinamų kurso objektų sąrašas"
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 msgid "Image Annotation"
-msgstr ""
+msgstr "Paveikslo komentaras"
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
 msgid "Tags for Assignments"
-msgstr ""
+msgstr "Atsiskaitymo užduočių žymos"
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
@@ -2363,37 +2573,39 @@ msgid ""
 "Add tags that automatically highlight in a certain color using the comma-"
 "separated form, i.e. imagery:red,parallelism:blue"
 msgstr ""
+"Pridėti žymas, kurios automatiškai pažymi tam tikra spalva, atskiriant "
+"kableliu, pvz., imagery:red,parallelism:blue"
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 msgid "Location of Annotation backend"
-msgstr ""
+msgstr "Komentaro sąsajos adresas "
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 msgid "Url for Annotation Storage"
-msgstr ""
+msgstr "Komentaro saugyklos URL nuoroda"
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 msgid "Secret string for annotation storage"
-msgstr ""
+msgstr "Slapta komentaro saugyklos eilutė"
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid "Secret Token String for Annotation"
-msgstr ""
+msgstr "Slapta komentaro prieigos rakto eilutė"
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 msgid "Default Annotations Tab"
-msgstr ""
+msgstr "Numatytoji komentarų kortelė"
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
@@ -2402,12 +2614,14 @@ msgid ""
 "Select which tab will be the default in the annotations table: myNotes, "
 "Instructor, or Public."
 msgstr ""
+"Pasirinkite, kuri kortelė bus numatytoji komentarų lentelėje: \"Mano "
+"pastabos\", \"Lektorius\" ar \"Viešoji\"."
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 msgid "Email for 'Instructor' Annotations"
-msgstr ""
+msgstr "El. laiškas kortelės \"Lektorius\" komentarams"
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
@@ -2416,25 +2630,27 @@ msgid ""
 "Email of the user that will be attached to all annotations that will be "
 "found in 'Instructor' tab."
 msgstr ""
+"Naudotojo el. laiškas, kuris bus prikabintas prie visų komentarų, kurie bus "
+"kortelėje \"Lektorius\"."
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 msgid "Mode for Annotation Tool"
-msgstr ""
+msgstr "Komentarų priemonės veiksena"
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 msgid ""
 "Type in number corresponding to following modes:  'instructor' or 'everyone'"
-msgstr ""
+msgstr "Įrašykite skaičių, atitinkantį šias veiksenas: \"Lektorius\" arba \"Visi\""
 
 #: common/lib/xmodule/xmodule/imageannotation_module.py
 #: common/lib/xmodule/xmodule/textannotation_module.py
 #: common/lib/xmodule/xmodule/videoannotation_module.py
 msgid "No email address found."
-msgstr ""
+msgstr "Nerastas el. pašto adresas."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
@@ -2447,7 +2663,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "LTI ID"
-msgstr ""
+msgstr "LTI identifikacijos numeris"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
@@ -2455,30 +2671,39 @@ msgid ""
 " LTI ID that you entered in the LTI Passports setting on the Advanced "
 "Settings page.<br />See "
 msgstr ""
+"Įveskite išorinio tiekėjo LTI identifikacijos numerį. Tai turi būti tas pats"
+" LTI identifikacijos numeris, kurį įvedėte LTI pasų nuostatose papildomų "
+"nuostatų puslapyje. <br />Žr."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "LTI URL"
-msgstr ""
+msgstr "LTI URL nuoroda"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
 "Enter the URL of the external tool that this component launches. This "
 "setting is only used when Hide External Tool is set to False.<br />See "
 msgstr ""
+"Įveskite išorinės priemonės, kurią paleidžia šis komponentas, URL nuorodą. "
+"Šis parametras naudojamas tik tada, kai \"Slėpti išorinę priemonę\" "
+"nustatyta \"Ne\". <br />Žr."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "Custom Parameters"
-msgstr ""
+msgstr "Numatytieji parametrai"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
 "Add the key/value pair for any custom parameters, such as the page your "
 "e-book should open to or the background color for this component.<br />See "
 msgstr ""
+"Pridėkite raktų arba reikšmių porą bet kuriems individualizuotiems "
+"parametrams, pavyzdžiui, puslapiui, kuriame turi atsidaryti jūsų elektroninė"
+" knyga, arba šio komponento fono spalvai. <br /> Žr."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "Open in New Page"
-msgstr ""
+msgstr "Atidaryti naujame puslapyje"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
@@ -2487,40 +2712,51 @@ msgid ""
 "in the current page. This setting is only used when Hide External Tool is "
 "set to False.  "
 msgstr ""
+"Pasirinkite \"Taip\", jeigu norite, kad kurso dalyviai paspaustų nuorodą, "
+"kuri atidaro LTI priemonę naujame lange. Pasirinkite \"Ne\", jeigu norite, "
+"kad LTI turinys atsidarytų polangyje esamame puslapyje. Ši nuostata "
+"naudojama tik tada, kai \"Slėpti išorinę priemonę\" yra nustatyta \"Ne\"."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "Scored"
-msgstr ""
+msgstr "Įvertinta"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
 "Select True if this component will receive a numerical score from the "
 "external LTI system."
 msgstr ""
+"Pasirinkite \"Taip\", jeigu šis komponentas gaus skaitinį įvertinimą iš "
+"išorinės LTI sistemos. "
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "Weight"
-msgstr ""
+msgstr "Sunkumas"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
 "Enter the number of points possible for this component.  The default value "
 "is 1.0.  This setting is only used when Scored is set to True."
 msgstr ""
+"Įveskite, kiek taškų galima gauti už šį komponentą. Numatytoji vertė yra "
+"1,0. Ši nuostata naudojama tik tada, kai \"Įvertinta\" yra nustatyta "
+"\"Taip\"."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
 "The score kept in the xblock KVS -- duplicate of the published score in "
 "django DB"
 msgstr ""
+"Įvertinimas saugomas x bloke KVS - paskelbto įvertinimo kopija \"django\" "
+"duomenų bazėje"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "Comment as returned from grader, LTI2.0 spec"
-msgstr ""
+msgstr "Komentuoti kaip grįžusį iš vertintojo, LTI2.0 spec"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "Hide External Tool"
-msgstr ""
+msgstr "Slėpti išorinę priemonę"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
@@ -2528,20 +2764,27 @@ msgid ""
 "with an external grading  system rather than launch an external tool.  This "
 "setting hides the Launch button and any IFrames for this component."
 msgstr ""
+"Pasirinkite \"Taip\", jeigu norite šį komponentą panaudoti kaip vietaženklį "
+"sinchronizavimui su išorine vertinimo sistema, o ne paleisti išorinę "
+"priemonę. Šis parametras paslepia paleidimo mygtuką ir šio komponento "
+"polangius."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "Request user's username"
-msgstr ""
+msgstr "Prašyti naudotojo vardo"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
 "Select True to request the user's username. You must also set Open in New "
 "Page to True to get the user's information."
 msgstr ""
+"Pasirinkite \"Taip\", jeigu norite paprašyti naudotojo vardo. Taip pat "
+"turite nustatyti \"Taip\" \"Atidaryti naujame puslapyje\", jeigu norite "
+"gauti naudotojo informaciją."
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid "Request user's email"
-msgstr ""
+msgstr "Prašyti naudotojo el. pašto"
 
 #: common/lib/xmodule/xmodule/lti_module.py
 msgid ""
@@ -2637,23 +2880,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2706,6 +2932,8 @@ msgid ""
 "The experiment uses a deleted group configuration. Select a valid group "
 "configuration or delete this experiment."
 msgstr ""
+"Bandyme naudojama pašalinta grupės konfigūracija.  Pasirinkite galiojančią "
+"grupės konfigūraciją arba pašalinkite šį bandymą."
 
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid ""
@@ -2721,6 +2949,8 @@ msgid ""
 "The experiment has an inactive group. Move content into active groups, then "
 "delete the inactive group."
 msgstr ""
+"Bandyme yra neaktyvi grupė. Perkelkite turinį į aktyvias grupes, tada "
+"pašalinkite neaktyvią grupę."
 
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "This content experiment has issues that affect content visibility."
@@ -2751,7 +2981,7 @@ msgstr "Žinynas"
 #: common/lib/xmodule/xmodule/tabs.py cms/templates/textbooks.html
 #: cms/templates/textbooks.html cms/templates/widgets/header.html
 msgid "Textbooks"
-msgstr ""
+msgstr "Vadovėliai"
 
 #. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: "Staff grading" appears on a tab that allows
@@ -2952,7 +3182,7 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid "Enable LaTeX Compiler"
-msgstr ""
+msgstr "Leisti \"LaTeX\" kompiliatorių"
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
@@ -3009,9 +3239,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -3114,6 +3345,8 @@ msgid ""
 "Could not find needed tag {tag_name} in the survey responses. Please try "
 "submitting again."
 msgstr ""
+"Apklausos atsakymuose nerasta reikalinga žyma {tag_name}. Prašome pateikti "
+"dar kartą."
 
 #: common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
 msgid "There was an error saving your feedback. Please contact course staff."
@@ -3524,7 +3757,7 @@ msgstr "Atidaryta šio kurso dalyvių skaičiaus"
 
 #: lms/djangoapps/class_dashboard/dashboard_data.py
 msgid "subsections"
-msgstr ""
+msgstr "potemės"
 
 #: lms/djangoapps/class_dashboard/dashboard_data.py
 msgid "Count of Students"
@@ -3680,7 +3913,7 @@ msgstr "nustatytas slaptažodis"
 #. Translators: this means everything happened successfully, yay!
 #: lms/djangoapps/dashboard/sysadmin.py
 msgid "All ok!"
-msgstr ""
+msgstr "Viskas gerai!"
 
 #: lms/djangoapps/dashboard/sysadmin.py lms/djangoapps/dashboard/sysadmin.py
 msgid "Must provide username"
@@ -3725,7 +3958,7 @@ msgstr ""
 
 #: lms/djangoapps/dashboard/sysadmin.py
 msgid "Deleted user {username}"
-msgstr ""
+msgstr "Pašalintas naudotojas {username}"
 
 #: lms/djangoapps/dashboard/sysadmin.py
 msgid "Statistic"
@@ -3766,7 +3999,7 @@ msgstr ""
 
 #: lms/djangoapps/dashboard/sysadmin.py
 msgid "Delete User Results"
-msgstr ""
+msgstr "Pašalinti naudotojo rezultatus"
 
 #: lms/djangoapps/dashboard/sysadmin.py
 #: lms/djangoapps/dashboard/tests/test_sysadmin.py
@@ -3822,6 +4055,8 @@ msgid "Loaded course {course_name}<br/>Errors:"
 msgstr ""
 
 #: lms/djangoapps/dashboard/sysadmin.py lms/djangoapps/dashboard/sysadmin.py
+#: cms/templates/course-create-rerun.html cms/templates/index.html
+#: lms/templates/shoppingcart/receipt.html
 msgid "Course Name"
 msgstr "Kurso pavadinimas"
 
@@ -3853,7 +4088,7 @@ msgstr "Klaida – neįmanoma pasiekti kurso, kurio ID {0}<br/><pre>{1}</pre>"
 
 #: lms/djangoapps/dashboard/sysadmin.py
 msgid "Deleted"
-msgstr ""
+msgstr "Pašalinta"
 
 #: lms/djangoapps/dashboard/sysadmin.py lms/djangoapps/dashboard/sysadmin.py
 msgid "course_id"
@@ -4040,6 +4275,8 @@ msgid ""
 "Your enrolled student profile report is being generated! You can view the "
 "status of the generation task in the 'Pending Instructor Tasks' section."
 msgstr ""
+"Formuojama užregistruotų kurso dalyvių profilio ataskaita! Formavimo būseną "
+"galite pasitikrinti skyriuje \"Laukiančios vykdymo lektoriaus užduotys\"."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid ""
@@ -4084,6 +4321,8 @@ msgstr ""
 msgid ""
 "Successfully removed invalid due date extension (unit has no due date)."
 msgstr ""
+"Sėkmingai pašalintas neteisingas pateikimo datos pratęsimas \n"
+"(skyrius neturi pateikimo datos)."
 
 #: lms/djangoapps/instructor/views/api.py
 msgid "Successfully reset due date for student {0} for {1} to {2}"
@@ -4182,6 +4421,10 @@ msgstr "Duomenų parsisiuntimas"
 msgid "Analytics"
 msgstr "Analizė"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -4288,7 +4531,7 @@ msgstr "Panaikinta kurso dalyvio modulio būsena {state}!"
 
 #: lms/djangoapps/instructor/views/legacy.py
 msgid "Failed to delete module state for {id}/{url}. "
-msgstr ""
+msgstr "Nepavyko panaikinti modulio būsenos {id}/{url}."
 
 #: lms/djangoapps/instructor/views/legacy.py
 msgid "Module state successfully reset!"
@@ -4505,7 +4748,7 @@ msgstr ""
 
 #: lms/djangoapps/instructor/views/tools.py
 msgid "Unit {0} has no due date to extend."
-msgstr ""
+msgstr "Skyrius {0} neturi pateikimo datos, kurią būtų galima pratęsti."
 
 #: lms/djangoapps/instructor/views/tools.py
 msgid "An extended due date must be later than the original due date."
@@ -4514,6 +4757,7 @@ msgstr ""
 #: lms/djangoapps/instructor/views/tools.py
 msgid "No due date extension is set for that student and unit."
 msgstr ""
+"Šiam kurso dalyviui ir skyriui pateikimo datos pratęsimas nenumatytas."
 
 #: lms/djangoapps/instructor/views/tools.py
 #: lms/djangoapps/instructor/views/tools.py
@@ -4938,7 +5182,7 @@ msgstr "Kiekis"
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Unit Cost"
-msgstr ""
+msgstr "Vieneto kaina"
 
 #: lms/djangoapps/shoppingcart/reports.py
 msgid "Total Cost"
@@ -5110,15 +5354,27 @@ msgstr ""
 "Užsakymo dydis {2} {3} nesutampa su suma {0} {1}, kurią gavo užsakymo "
 "apdorojimo sistema "
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5126,37 +5382,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5413,17 +5657,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5433,7 +5677,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5444,11 +5688,15 @@ msgid ""
 "future purchase. If you feel that this is in error, please contact us with "
 "payment-specific questions at {email}."
 msgstr ""
+"Atsiprašome! Mūsų mokėjimų tvarkytojas atsiuntė mums pranešimą, kad jūs "
+"atšaukėte šią operaciją. Prekių krepšelyje esančios prekės liks ateičiai. "
+"Jeigu manote, kad tai klaida, prašome su mokėjimu susijusiais klausimais "
+"rašyti mums {email}."
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -5608,11 +5856,11 @@ msgstr ""
 
 #: lms/lib/xblock/mixin.py
 msgid "LaTeX Source File Name"
-msgstr ""
+msgstr "\"LaTeX\" šaltinio failo pavadinimas"
 
 #: lms/lib/xblock/mixin.py
 msgid "Enter the source file name for LaTeX."
-msgstr ""
+msgstr "Įveskite \"LaTeX\" šaltinio failo pavadinimą."
 
 #: lms/lib/xblock/mixin.py
 msgid "Course Is Public"
@@ -5865,6 +6113,9 @@ msgstr "Pašalinti straipsnį"
 
 #: lms/templates/wiki/delete.html
 #: lms/templates/wiki/plugins/attachments/index.html
+#: cms/templates/component.html cms/templates/studio_xblock_wrapper.html
+#: cms/templates/studio_xblock_wrapper.html
+#: lms/templates/discussion/_underscore_templates.html
 msgid "Delete"
 msgstr "Pašalinti"
 
@@ -6213,7 +6464,7 @@ msgid ""
 "The following files are available for this article. Copy the markdown tag to"
 " directly refer to a file from the article text."
 msgstr ""
-"Failai, prieinami šiame straipsnyje. Kopijuokite markdown žymę, nurodančią "
+"Failai, prieinami šiame straipsnyje. Kopijuokite markdown žymą, nurodančią "
 "tiesiogiai iš straipsnio į failą."
 
 #: lms/templates/wiki/plugins/attachments/index.html
@@ -6263,11 +6514,11 @@ msgstr "Straipsnis neturi prisegtų bylų."
 #: cms/djangoapps/contentstore/course_info_model.py
 #: cms/djangoapps/contentstore/course_info_model.py
 msgid "Invalid course update id."
-msgstr ""
+msgstr "Neteisingas kurso atnaujinimo identifikacijos numeris."
 
 #: cms/djangoapps/contentstore/course_info_model.py
 msgid "Course update not found."
-msgstr ""
+msgstr "Kurso atnaujinimas nerastas."
 
 #: cms/djangoapps/contentstore/git_export_utils.py
 msgid ""
@@ -6429,7 +6680,7 @@ msgstr ""
 
 #: cms/djangoapps/contentstore/views/item.py
 msgid "{section_or_subsection} \"{display_name}\""
-msgstr ""
+msgstr "{section_or_subsection} \"{display_name}\""
 
 #: cms/djangoapps/contentstore/views/transcripts_ajax.py
 msgid "Incoming video data is empty."
@@ -6536,12 +6787,12 @@ msgstr ""
 #: lms/templates/discussion/_underscore_templates.html
 #: lms/templates/verify_student/face_upload.html
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 #: cms/templates/course-create-rerun.html cms/templates/index.html
 #: cms/templates/settings.html lms/templates/courseware/course_about.html
 msgid "Course Number"
-msgstr ""
+msgstr "Kurso numeris/kodas"
 
 #: cms/templates/course_outline.html cms/templates/index.html
 #: lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html
@@ -6661,23 +6912,20 @@ msgstr ""
 msgid "Privacy Policy"
 msgstr ""
 
-#: cms/templates/widgets/header.html cms/templates/widgets/header.html
-#: lms/templates/help_modal.html lms/templates/navigation-edx.html
-#: lms/templates/navigation.html lms/templates/static_templates/help.html
-#: lms/templates/static_templates/help.html wiki/plugins/help/wiki_plugin.py
+#: wiki/plugins/help/wiki_plugin.py
 msgid "Help"
+msgstr "Pagalba"
+
+#: common/templates/course_modes/choose.html
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr ""
-
-#: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6714,7 +6962,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7006,7 +7254,7 @@ msgstr ""
 
 #: lms/templates/edit_unit_link.html
 msgid "View Unit in Studio"
-msgstr ""
+msgstr "Peržiūrėti skyrių mokymosi aplinkoje"
 
 #: lms/templates/email_change_failed.html lms/templates/email_exists.html
 msgid "E-mail change failed"
@@ -7136,11 +7384,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7173,7 +7416,7 @@ msgstr ""
 
 #: lms/templates/footer-edx-new.html
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: lms/templates/footer-edx-new.html
 msgid "Meetup"
@@ -7304,6 +7547,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7451,6 +7695,8 @@ msgstr ""
 #: lms/templates/login-sidebar.html
 msgid "View our help section for answers to commonly asked questions."
 msgstr ""
+"Apsilankykite mūsų pagalbos skiltyje, kur rasite atsakymus į dažniausiai "
+"užduodamus klausimus."
 
 #: lms/templates/login.html
 msgid "Log into your {platform_name} Account"
@@ -7606,6 +7852,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -7972,7 +8223,7 @@ msgstr ""
 
 #: lms/templates/seq_module.html lms/templates/seq_module.html
 msgid "Section Navigation"
-msgstr ""
+msgstr "Temos navigacija"
 
 #: lms/templates/seq_module.html lms/templates/seq_module.html
 #: lms/templates/discussion/mustache/_pagination.mustache
@@ -8063,15 +8314,15 @@ msgstr ""
 
 #: lms/templates/staff_problem_info.html
 msgid "Tag"
-msgstr ""
+msgstr "Žyma"
 
 #: lms/templates/staff_problem_info.html
 msgid "Optional tag (eg \"done\" or \"broken\"):"
-msgstr ""
+msgstr "Papildomos žymos (pvz \"atlikti\" ar \"neveikiantys\"):"
 
 #: lms/templates/staff_problem_info.html
 msgid "tag"
-msgstr ""
+msgstr "žyma"
 
 #: lms/templates/staff_problem_info.html
 msgid "Add comment"
@@ -8128,7 +8379,7 @@ msgstr "{course_number} vadovėlis"
 #: lms/templates/static_htmlbook.html lms/templates/static_pdfbook.html
 #: lms/templates/staticbook.html
 msgid "Textbook Navigation"
-msgstr ""
+msgstr "Vadovėlio navigacija"
 
 #: lms/templates/staticbook.html
 msgid "Previous page"
@@ -8170,7 +8421,7 @@ msgstr ""
 
 #: lms/templates/sysadmin_dashboard.html
 msgid "Delete user"
-msgstr ""
+msgstr "Pašalinti naudotoją"
 
 #: lms/templates/sysadmin_dashboard.html
 msgid "Create user"
@@ -8631,13 +8882,6 @@ msgstr "Peržiūrėti kurso medžiagą"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "Šis kursas yra įdėtas į jūsų <a href=\"{cart_link}\">krepšelį</a>."
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"Pridėti {course.display_number_with_default} į krepšelį "
-"({currency_symbol}{cost})"
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8650,6 +8894,13 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"Pridėti {course.display_number_with_default} į krepšelį "
+"({currency_symbol}{cost})"
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "Registruotis {course.display_number_with_default}"
@@ -8852,7 +9103,7 @@ msgstr ""
 #: lms/templates/courseware/gradebook.html
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Gradebook"
-msgstr ""
+msgstr "Pažymių knygelė"
 
 #: lms/templates/courseware/gradebook.html
 msgid "Search students"
@@ -8975,7 +9226,7 @@ msgstr ""
 #: lms/templates/courseware/instructor_dashboard.html
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Gradebook name:"
-msgstr ""
+msgstr "Pažymių knygelės pavadinimas"
 
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Assignment name:"
@@ -9072,6 +9323,10 @@ msgid ""
 "and re-open threads, endorse responses, and see posts from all cohorts (if "
 "the course is cohorted). Moderators' posts are marked as 'staff'."
 msgstr ""
+"Forumo moderatoriai: gali redaguoti arba pašalinti bet kurį įrašą, pašalinti"
+" netinkamumo žymes, pradėti ir užbaigti gijas, pritarti atsakymams ir matyti"
+" visų pogrupių įrašus (jei kursas sugrupuotas į pogrupius). Moderatorių "
+"įrašai yra žymimi \"personalas\"."
 
 #: lms/templates/courseware/instructor_dashboard.html
 msgid ""
@@ -9085,6 +9340,8 @@ msgid ""
 "Community TAs: have forum moderator privileges, and their posts are labelled"
 " 'Community TA'."
 msgstr ""
+"Mokymosi asistentai: forumuose turi moderatorių privilegijas, o jų įrašai "
+"žymimi \"Mokymosi asistentai\"."
 
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Enrollment Data"
@@ -9097,7 +9354,7 @@ msgstr ""
 #: lms/templates/courseware/instructor_dashboard.html
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Section:"
-msgstr ""
+msgstr "Tema:"
 
 #: lms/templates/courseware/instructor_dashboard.html
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -9208,7 +9465,7 @@ msgstr ""
 #: lms/templates/courseware/instructor_dashboard.html
 #: lms/templates/instructor/instructor_dashboard_2/send_email.html
 msgid "A queued email CANNOT be cancelled."
-msgstr ""
+msgstr "Išsiųsto laiško atšaukti NEGALIMA."
 
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "No Analytics are available at this time."
@@ -9275,7 +9532,7 @@ msgstr ""
 #: lms/templates/courseware/instructor_dashboard.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 msgid "There are no problems in this section."
-msgstr ""
+msgstr "Šioje temoje užduočių nėra."
 
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Students answering correctly"
@@ -9397,7 +9654,7 @@ msgstr "{course_number} Pažanga"
 
 #: lms/templates/courseware/progress.html
 msgid "Course Progress"
-msgstr ""
+msgstr "Kurso eiga"
 
 #: lms/templates/courseware/progress.html
 msgid "View Grading in studio"
@@ -9425,7 +9682,7 @@ msgstr ""
 
 #: lms/templates/courseware/progress.html
 msgid "No problem scores in this section"
-msgstr ""
+msgstr "Šioje temoje užduočių vertinimo nėra"
 
 #: lms/templates/courseware/syllabus.html
 msgid "{course.display_number_with_default} Course Info"
@@ -9436,6 +9693,8 @@ msgid ""
 "You were most recently in {section_link}.  If you're done with that, choose "
 "another section on the left."
 msgstr ""
+"Pastaruoju metu buvote {section_link}. Jei šią temą baigėte, kairėje "
+"pasirinkite kitą."
 
 #: lms/templates/dashboard/_dashboard_certificate_information.html
 msgid ""
@@ -9526,9 +9785,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9616,7 +9872,6 @@ msgstr "Peržiūrėti archyvuotus kursus"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "Peržiūrėti kursą"
 
@@ -9778,6 +10033,8 @@ msgstr ""
 #: lms/templates/discussion/_discussion_module_studio.html
 msgid "To view live discussions, click Preview or View Live in Unit Settings."
 msgstr ""
+"Norėdami peržiūrėti vykstančias diskusijas, skyriaus nustatymuose "
+"spustelėkite \"Peržiūra\" arba \"Žiūrėti gyvai\"."
 
 #: lms/templates/discussion/_filter_dropdown.html
 msgid "Filter Topics"
@@ -9897,11 +10154,9 @@ msgstr ""
 msgid "Edit post title"
 msgstr ""
 
-#: lms/templates/discussion/_underscore_templates.html
-#: lms/templates/discussion/_underscore_templates.html wiki/forms.py
-#: wiki/forms.py wiki/forms.py
+#: wiki/forms.py wiki/forms.py wiki/forms.py
 msgid "Title"
-msgstr ""
+msgstr "Pavadinimas"
 
 #: lms/templates/discussion/_underscore_templates.html
 msgid "Update post"
@@ -9982,7 +10237,7 @@ msgstr ""
 
 #: lms/templates/discussion/_underscore_templates.html
 msgid "By: Community TA"
-msgstr ""
+msgstr "Paskelbė: Mokymosi asistentas"
 
 #: lms/templates/discussion/_underscore_templates.html
 msgid "%(votes_up_count)s%(span_sr_open)s votes %(span_close)s"
@@ -10310,6 +10565,9 @@ msgid ""
 " any more email from us. Please do not reply to this e-mail; if you require "
 "assistance, check the about section of the {platform_name} Courses web site."
 msgstr ""
+"Jei to neprašėte, nieko nedarykite; daugiau el. laiškų jums nebesiųsime. "
+"Neatsakykite į šį laišką;  jei reikia pagalbos, apsilankykite "
+"{platform_name} internetinio puslapio \"Apie\" skiltyje."
 
 #: lms/templates/emails/activation_email.txt
 msgid ""
@@ -10317,6 +10575,9 @@ msgid ""
 " any more email from us. Please do not reply to this e-mail; if you require "
 "assistance, check the help section of the {platform_name} website."
 msgstr ""
+"Jei to neprašėte, nieko nedarykite; daugiau el. laiškų jums nebesiųsime. "
+"Neatsakykite į šį laišką;  jei reikia pagalbos, apsilankykite "
+"{platform_name} internetinio puslapio pagalbos skiltyje."
 
 #: lms/templates/emails/activation_email_subject.txt
 msgid "Activate Your {platform_name} Account"
@@ -10517,6 +10778,9 @@ msgid ""
 " any more email from us. Please do not reply to this e-mail; if you require "
 "assistance, check the help section of the {platform_name} web site."
 msgstr ""
+"Jei to neprašėte, nieko nedarykite; daugiau el. laiškų jums nebesiųsime. "
+"Neatsakykite į šį laišką;  jei reikia pagalbos, apsilankykite "
+"{platform_name} internetinio puslapio pagalbos skiltyje."
 
 #: lms/templates/emails/email_change_subject.txt
 msgid "Request to change {platform_name} account e-mail"
@@ -10739,6 +11003,10 @@ msgid ""
 "enrollment that use these codes. All purchases are final. Please refer to "
 "the cancellation policy on {site_name} for more information."
 msgstr ""
+"Neapmokėjus šios sąskaitos-faktūros, kurso dalyvio registracija, kuriai "
+"naudojami šie kodai, bus pripažinta negaliojančia. Visi pirkimai yra "
+"galutiniai. Daugiau informacijos apie atšaukimo politiką rasite apsilankę "
+"{site_name}."
 
 #: lms/templates/emails/registration_codes_sale_invoice_attachment.txt
 msgid "If you have payment questions, please contact {contact_email}"
@@ -10972,6 +11240,10 @@ msgid ""
 "exams and problem sets), and can be changed on the 'Grading' page (under "
 "'Settings') in Studio."
 msgstr ""
+"Spustelėkite rodyti kurso vertinimo konfigūraciją. Vertinimo konfigūracija -"
+" tai įvertintų kurso poskyrių išskirstymas (pavyzdžiui, egzaminų ir užduočių"
+" rinkinių). Mokymosi aplinkoje ji gali būti pakeista puslapyje "
+"\"Vertinimas\" (skiltyje \"Nustatymai\")."
 
 #: lms/templates/instructor/instructor_dashboard_2/data_download.html
 msgid "Grading Configuration"
@@ -11279,7 +11551,7 @@ msgstr "Kurso dalyvio el. paštas arba naudotojo vardas"
 #: lms/templates/instructor/instructor_dashboard_2/extensions.html
 #: lms/templates/instructor/instructor_dashboard_2/extensions.html
 msgid "Choose the graded unit:"
-msgstr ""
+msgstr "Pasirinkite įvertintą skyrių:"
 
 #. Translators: "format_string" is the string MM/DD/YYYY HH:MM, as that is the
 #. format the system requires.
@@ -11424,7 +11696,7 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html
 msgid "Internal tag to associate with the sale"
-msgstr ""
+msgstr "Vidinė pardavimo žyma"
 
 #: lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html
 msgid "(Optional) Customer Reference Number"
@@ -11438,18 +11710,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -11663,6 +11923,10 @@ msgid ""
 " re-open threads, endorse responses, and see posts from all cohorts. They "
 "CAN add/delete other moderators and their posts are marked as 'staff'."
 msgstr ""
+"Forumo administratoriai gali redaguoti arba pašalinti bet kurį įrašą, "
+"pašalinti netinkamumo žymas, pradėti ir užbaigti gijas, pritarti atsakymams "
+"ir matyti visų pogrupių įrašus. Jie GALI pridėti/pašalinti kitus "
+"moderatorius, o jų įrašai žymimi \"personalas\"."
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Add Discussion Admin"
@@ -11679,6 +11943,10 @@ msgid ""
 "They CANNOT add/delete other moderators and their posts are marked as "
 "'staff'."
 msgstr ""
+"Forumo moderatoriai gali redaguoti arba pašalinti bet kurį įrašą, pašalinti "
+"netinkamumo žymas, pradėti ir užbaigti gijas, pritarti atsakymams ir matyti "
+"visų pogrupių įrašus. Jie NEGALI pridėti/pašalinti kitų moderatorių, o jų "
+"įrašai žymimi \"personalas\"."
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Add Moderator"
@@ -11686,7 +11954,7 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Discussion Community TAs"
-msgstr ""
+msgstr "Diskusijos mokymosi asistentai"
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid ""
@@ -11695,10 +11963,14 @@ msgid ""
 "misuse flags, close and re-open threads, endorse responses, and see posts "
 "from all cohorts. Their posts are marked 'Community TA'."
 msgstr ""
+"Mokymosi asistentai yra kurso dalyviai, kurie, jūsų nuomone, yra ypač "
+"naudingi diskusijose. Jie gali redaguoti arba pašalinti bet kurį įrašą, "
+"pašalinti netinkamumo žymas, pradėti ir užbaigti gijas, pritarti atsakymams "
+"ir matyti visų pogrupių įrašus. Jų įrašai žymimi \"mokymosi asistentai\"."
 
 #: lms/templates/instructor/instructor_dashboard_2/membership.html
 msgid "Add Community TA"
-msgstr ""
+msgstr "Pridėti mokymosi asistentus"
 
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 msgid "Use Reload Graphs to refresh the graphs."
@@ -11710,17 +11982,19 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 msgid "Subsection Data"
-msgstr ""
+msgstr "Potemės duomenys"
 
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 msgid "Each bar shows the number of students that opened the subsection."
-msgstr ""
+msgstr "Kiekvienas stulpelis rodo skaičių kurso dalyvių, atidariusių potemę."
 
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 msgid ""
 "You can click on any of the bars to list the students that opened the "
 "subsection."
 msgstr ""
+"Spustelėję ant bet kurio iš mygtukų, pamatysite kurso dalyvių, atidariusių "
+"potemę, sąrašą."
 
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
@@ -11729,7 +12003,7 @@ msgstr ""
 
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 msgid "Download Subsection Data for all Subsections as a CSV"
-msgstr ""
+msgstr "Parsisiųsti visų potemių duomenis CSV formatu"
 
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 msgid "Grade Distribution Data"
@@ -11954,7 +12228,7 @@ msgstr "{course_number} kompleksiniai pranešimai "
 
 #: lms/templates/open_ended_problems/combined_notifications.html
 msgid "Open Ended Console"
-msgstr ""
+msgstr "Atidaryti atvirojo atsakymo užduočių valdymo pultą"
 
 #: lms/templates/open_ended_problems/combined_notifications.html
 msgid "Here are items that could potentially need your attention."
@@ -11966,17 +12240,19 @@ msgstr ""
 
 #: lms/templates/open_ended_problems/open_ended_flagged_problems.html
 msgid "{course_number} Flagged Open Ended Problems"
-msgstr "{course_number} pažymėtos pasirenkamo atsakymo užduotys"
+msgstr "{course_number} pažymėtos atvirojo atsakymo užduotys"
 
 #: lms/templates/open_ended_problems/open_ended_flagged_problems.html
 msgid "Flagged Open Ended Problems"
-msgstr ""
+msgstr "Pažymėtos atvirojo atsakymo užduotys"
 
 #: lms/templates/open_ended_problems/open_ended_flagged_problems.html
 msgid ""
 "Here is a list of open ended problems for this course that have been flagged"
 " by students as potentially inappropriate."
 msgstr ""
+"Čia rasite sąrašą atvirojo atsakymo užduočių, kurias kurso dalyviai pažymėjo"
+" kaip galimai netinkamas."
 
 #: lms/templates/open_ended_problems/open_ended_flagged_problems.html
 msgid "No flagged problems exist."
@@ -11992,19 +12268,19 @@ msgstr ""
 
 #: lms/templates/open_ended_problems/open_ended_problems.html
 msgid "{course_number} Open Ended Problems"
-msgstr "{course_number} pasirenkamo atsakymo užduotys"
+msgstr "{course_number} atvirojo atsakymo užduotys"
 
 #: lms/templates/open_ended_problems/open_ended_problems.html
 msgid "Open Ended Problems"
-msgstr ""
+msgstr "Atvirojo atsakymo užduotys"
 
 #: lms/templates/open_ended_problems/open_ended_problems.html
 msgid "Here is a list of open ended problems for this course."
-msgstr "Čia rasite šio kurso pasirenkamo atsakymo uždavinių sąrašą."
+msgstr "Čia rasite šio kurso atvirojo atsakymo užduočių sąrašą."
 
 #: lms/templates/open_ended_problems/open_ended_problems.html
 msgid "You have not attempted any open ended problems yet."
-msgstr ""
+msgstr "Jūs dar neatlikote nei vienos atvirojo atsakymo užduoties."
 
 #: lms/templates/open_ended_problems/open_ended_problems.html
 #: lms/templates/peer_grading/peer_grading.html
@@ -12823,6 +13099,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12878,19 +13197,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12898,15 +13217,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -13973,7 +14292,7 @@ msgstr ""
 
 #: cms/templates/component.html
 msgid "Delete this component"
-msgstr ""
+msgstr "Pašalinti šį komponentą"
 
 #: cms/templates/component.html cms/templates/edit-tabs.html
 #: cms/templates/edit-tabs.html cms/templates/studio_xblock_wrapper.html
@@ -14041,7 +14360,7 @@ msgstr ""
 
 #: cms/templates/container.html
 msgid "Unit Location"
-msgstr ""
+msgstr "Skyriaus vieta"
 
 #: cms/templates/container.html
 msgid "Location ID"
@@ -14052,6 +14371,8 @@ msgid ""
 "Use this ID when you create links to this unit from other course content. "
 "You enter the ID in the URL field."
 msgstr ""
+"Pasinaudokite šiuo identifikatoriumi kurdami nuorodas į šį skyrių iš kito "
+"kurso turinio. Identifikatorių įvedate į URL nuorodos lauką."
 
 #: cms/templates/container.html
 msgid "Location in Course Outline"
@@ -14218,19 +14539,19 @@ msgstr ""
 
 #: cms/templates/course_outline.html
 msgid "Click to add a new section"
-msgstr ""
+msgstr "Paspauskite norėdami pridėti naują temą"
 
 #: cms/templates/course_outline.html
 msgid "New Section"
-msgstr ""
+msgstr "Nauja tema"
 
 #: cms/templates/course_outline.html
 msgid "Collapse All Sections"
-msgstr ""
+msgstr "Suskleisti visas temas"
 
 #: cms/templates/course_outline.html
 msgid "Expand All Sections"
-msgstr ""
+msgstr "Išskleisti visas temas"
 
 #: cms/templates/course_outline.html
 msgid "Click to open the courseware in the LMS in a new tab"
@@ -14255,13 +14576,15 @@ msgstr ""
 
 #: cms/templates/course_outline.html
 msgid "You add sections, subsections, and units directly in the outline."
-msgstr ""
+msgstr "Plane pridėkite temas, potemes ir skyrius."
 
 #: cms/templates/course_outline.html
 msgid ""
 "Create a section, then add subsections and units. Open a unit to add course "
 "components."
 msgstr ""
+"Sukurkite temą, tada pridėkite potemes ir skyrius. Norėdami pridėti kurso "
+"komponentus atsidarykite skyrių."
 
 #: cms/templates/course_outline.html
 msgid "Reorganizing your course"
@@ -14269,7 +14592,7 @@ msgstr ""
 
 #: cms/templates/course_outline.html
 msgid "Drag sections, subsections, and units to new locations in the outline."
-msgstr ""
+msgstr "Nutempkite temas, potemes ir skyrius į naują vietą plane."
 
 #: cms/templates/course_outline.html
 msgid "Setting release dates and grading policies"
@@ -14281,6 +14604,9 @@ msgid ""
 "date. When you configure a subsection, you can also set the grading policy "
 "and due date."
 msgstr ""
+"Norėdami nustatyti temos ar potemės paskelbimo datą pasirinkite piktogramą "
+"\"Konfigūruoti\". Konfigūruodami potemę galite kartu nustatyti vertinimo "
+"tvarką ir atsiskaitymo pateikimo datą."
 
 #: cms/templates/course_outline.html
 msgid "Changing the content students see"
@@ -14291,12 +14617,17 @@ msgid ""
 "To publish draft content, select the Publish icon for a section, subsection,"
 " or unit."
 msgstr ""
+"Norėdami paskelbti juodraštinį turinį, temoje, potemėje arba skyriuje "
+"pasirinkite piktogramą \"Paskelbti\"."
 
 #: cms/templates/course_outline.html
 msgid ""
 "To hide content from students, select the Configure icon for a section, "
 "subsection, or unit, then select {em_start}Hide from students{em_end}."
 msgstr ""
+"Norėdami paslėpti turinį nuo kurso dalyvių, temoje, potemėje arba skyriuje "
+"pasirinkite piktogramą \"Konfigūruoti\", tada {em_start}Slėpti nuo kurso "
+"dalyvių{em_end}."
 
 #: cms/templates/course_outline.html
 msgid "Learn more about the course outline"
@@ -14456,6 +14787,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14469,9 +14809,14 @@ msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
 #: cms/templates/export.html
-msgid "Course Content (all Sections, Sub-sections, and Units)"
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Course Content (all Sections, Sub-sections, and Units)"
+msgstr "Kurso turinys (visos temos, potemės ir skyriai)"
+
 #: cms/templates/export.html
 msgid "Course Structure"
 msgstr ""
@@ -14526,15 +14871,12 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
-"Eksportuojamas tik kurso turinys ir struktūra (įskaitant temas, potemes ir "
-"skyrius). Kiti duomenys, įskaitant kurso dalyvių duomenis, vertinimo "
-"informaciją, diskusijų forumo duomenis, kurso nustatymus ir kurso komandos "
-"informaciją, neeksportuojami."
 
 #: cms/templates/export.html
 msgid "Opening the downloaded file"
@@ -14548,6 +14890,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
@@ -14618,7 +14964,7 @@ msgstr ""
 
 #: cms/templates/group_configurations.html
 msgid "You can create, edit, and delete group configurations."
-msgstr ""
+msgstr "Galite kurti, redaguoti ir pašalinti grupės konfigūracijas."
 
 #: cms/templates/group_configurations.html
 msgid ""
@@ -14640,6 +14986,9 @@ msgid ""
 "experiment. To delete a configuration, hover over its box and click the "
 "delete icon."
 msgstr ""
+"Galite pašalinti grupės konfigūraciją tik jeigu ji nėra naudojama bandyme. "
+"Norėdami pašalinti konfigūraciją, užeikite ant jos langelio ir paspauskite "
+"piktogramą \"Pašalinti\" ."
 
 #: cms/templates/group_configurations.html
 msgid "Learn More"
@@ -14718,6 +15067,8 @@ msgid ""
 "Studio uses a simple hierarchy of <strong>sections</strong> and "
 "<strong>subsections</strong> to organize your content."
 msgstr ""
+"Mokymosi aplinka mokymosi medžiagos organizavimui naudoja paprastą "
+"<strong>temų</strong> ir <strong>potemių</strong> hierarchiją."
 
 #: cms/templates/howitworks.html
 msgid "Change Your Mind Anytime"
@@ -14821,6 +15172,8 @@ msgid ""
 "When you've finished a <strong>section</strong>, pick when you want it to go"
 " live and Studio takes care of the rest. Build your course incrementally."
 msgstr ""
+"Baigę kurti <strong>temą</strong> pasirinkite, kada norite ją paskelbti, o "
+"kitkuo pasirūpins mokymosi aplinka. Kurkite savo kursą pakopa po pakopos."
 
 #: cms/templates/howitworks.html
 msgid "Work in Teams"
@@ -14873,8 +15226,8 @@ msgid ""
 "Simply set the date of a section or subsection, and Studio will publish it "
 "to your students for you."
 msgstr ""
-"Tiesiog nustatykite temos ar potemės datą ir Studio paskelbs jas jūsų kurso "
-"dalyviams."
+"Tiesiog nustatykite temos ar potemės datą ir mokymosi aplinka paskelbs jas "
+"jūsų kurso dalyviams."
 
 #: cms/templates/html_error.html
 msgid "We're having trouble rendering your component"
@@ -15386,7 +15739,7 @@ msgstr ""
 
 #: cms/templates/manage_users.html
 msgid "Delete the user, {username}"
-msgstr ""
+msgstr "Pašalinti naudotoją {username}"
 
 #: cms/templates/manage_users.html
 msgid "Add Team Members to This Course"
@@ -15702,7 +16055,7 @@ msgstr ""
 
 #: cms/templates/settings.html
 msgid "Delete Current Video"
-msgstr ""
+msgstr "Pašalinti šį vaizdo įrašą"
 
 #: cms/templates/settings.html
 msgid "Enter your YouTube video's ID (along with any restriction parameters)"
@@ -15873,11 +16226,11 @@ msgstr ""
 
 #: cms/templates/textbooks.html
 msgid "New Textbook"
-msgstr ""
+msgstr "Naujas vadovėlis"
 
 #: cms/templates/textbooks.html
 msgid "Why should I break my textbook into chapters?"
-msgstr ""
+msgstr "Kodėl turėčiau vadovėlį suskirstyti skyriais?"
 
 #: cms/templates/textbooks.html
 msgid ""
@@ -15892,7 +16245,7 @@ msgstr ""
 
 #: cms/templates/textbooks.html
 msgid "What if my book isn't divided into chapters?"
-msgstr ""
+msgstr "Kas, jeigu mano vadovėlis nesuskirstytas skyriais?"
 
 #: cms/templates/textbooks.html
 msgid ""
@@ -15900,10 +16253,12 @@ msgid ""
 " text as a single chapter and enter a name of your choice in the Chapter "
 "Name field."
 msgstr ""
+"Jeigu jūsų vadovėlyje nėra skyrių, jūs galite visą tekstą įkelti kaip vieną "
+"skyrių ir skyriaus pavadinimo laukelyje įrašyti pasirinktą pavadinimą."
 
 #: cms/templates/textbooks.html
 msgid "Learn more about textbooks"
-msgstr ""
+msgstr "Sužinoti daugiau apie vadovėlius"
 
 #: cms/templates/emails/activation_email.txt
 msgid ""
@@ -15917,6 +16272,9 @@ msgid ""
 " any more email from us. Please do not reply to this e-mail; if you require "
 "assistance, check the help section of the edX web site."
 msgstr ""
+"Jei to neprašėte, nieko nedarykite; daugiau el. laiškų jums nebesiųsime. "
+"Neatsakykite į šį laišką;  jei reikia pagalbos, apsilankykite edX "
+"internetinio puslapio pagalbos skiltyje."
 
 #: cms/templates/emails/activation_email_subject.txt
 msgid "Your account for edX Studio"
@@ -16081,7 +16439,7 @@ msgstr ""
 
 #: cms/templates/widgets/sock.html
 msgid "Looking for help with Studio?"
-msgstr ""
+msgstr "Ar reikalinga pagalba dėl \"Studio\"?"
 
 #: cms/templates/widgets/sock.html cms/templates/widgets/sock.html
 msgid "edX Studio Documentation"
@@ -16121,23 +16479,25 @@ msgstr ""
 
 # empty
 msgid "This is a key string."
-msgstr "Tai pagrindinė eilutė."
+msgstr "Tai rakto eilutė."
 
 #: wiki/admin.py wiki/models/article.py
 msgid "created"
-msgstr ""
+msgstr "sukurta"
 
 #: wiki/forms.py
 msgid "Only localhost... muahahaha"
-msgstr ""
+msgstr "Tik vietinis serveris... "
 
 #: wiki/forms.py
 msgid "Initial title of the article. May be overridden with revision titles."
 msgstr ""
+"Pradinis straipsnio pavadinimas. Gali būti pakeistas kitomis pavadinimo "
+"versijomis. "
 
 #: wiki/forms.py
 msgid "Type in some contents"
-msgstr ""
+msgstr "Įterpti turinį"
 
 #: wiki/forms.py
 msgid ""
@@ -16145,19 +16505,23 @@ msgid ""
 "can use more complex features like adding plugins, meta data, related "
 "articles etc..."
 msgstr ""
+"Tai tik pradinis jūsų straipsnio turinys. Sukūrę jį galite pasinaudoti "
+"sudėtingesnėmis galimybėmis, pavyzdžiui, pridėti papildinių, metaduomenų, "
+"susijusių straipsnių ir t. t. "
 
 #: wiki/forms.py wiki/forms.py
 msgid "Contents"
-msgstr ""
+msgstr "Turinys"
 
 #: wiki/forms.py wiki/forms.py
 msgid "Summary"
-msgstr ""
+msgstr "Santrauka"
 
 #: wiki/forms.py
 msgid ""
 "Give a short reason for your edit, which will be stated in the revision log."
 msgstr ""
+"Pateikite trumpą redagavimo priežastį, kuri bus nurodoma peržiūros žurnale."
 
 #: wiki/forms.py
 msgid ""
@@ -16165,18 +16529,20 @@ msgid ""
 "have been automatically merged with the new contents. Please review the text"
 " below."
 msgstr ""
+"Kol jūs redagavote, kažkas pakeitė pataisą. Jūsų turinys buvo automatiškai "
+"sujungtas su nauju turiniu. Prašome peržiūrėti toliau pateikiamą tekstą."
 
 #: wiki/forms.py
 msgid "No changes made. Nothing to save."
-msgstr ""
+msgstr "Niekas nepakeista. Nėra ko išsaugoti."
 
 #: wiki/forms.py
 msgid "Select an option"
-msgstr ""
+msgstr "Pasirinkite variantą"
 
 #: wiki/forms.py
 msgid "Slug"
-msgstr ""
+msgstr "URL nuoroda"
 
 #: wiki/forms.py
 msgid ""
@@ -16184,30 +16550,33 @@ msgid ""
 "alphanumeric characters and - or _. Note that you cannot change the slug "
 "after creating the article."
 msgstr ""
+"Tai bus adresas, kuriuo bus galima rasti jūsų straipsnį. Naudokite tik "
+"raides, skaičius ir - arba _. Atkreipkite dėmesį, kad sukūrę straipsnį URL "
+"nuorodos negalėsite pakeisti."
 
 #: wiki/forms.py
 msgid "Write a brief message for the article's history log."
-msgstr ""
+msgstr "Parašykite trumpą žinutę straipsnio istorijos žurnalui."
 
 #: wiki/forms.py
 msgid "A slug may not begin with an underscore."
-msgstr ""
+msgstr "URL nuoroda negali prasidėti pabraukimo brūkšniu. "
 
 #: wiki/forms.py
 msgid "A deleted article with slug \"%s\" already exists."
-msgstr ""
+msgstr "Pašalintas straipsnis, kurio URL nuoroda \"%s\", jau egzistuoja. "
 
 #: wiki/forms.py
 msgid "A slug named \"%s\" already exists."
-msgstr ""
+msgstr "URL nuoroda \"%s\" jau egzistuoja."
 
 #: wiki/forms.py
 msgid "Yes, I am sure"
-msgstr ""
+msgstr "Taip, tikrai."
 
 #: wiki/forms.py
 msgid "Purge"
-msgstr ""
+msgstr "Išvalyti"
 
 #: wiki/forms.py
 msgid ""
@@ -16215,236 +16584,252 @@ msgid ""
 " Purging is a good idea if you want to free the slug such that users can "
 "create new articles in its place."
 msgstr ""
+"Panaikinti straipsnį: visiškai jį (ir visą jo turinį) pašalinti be galimybės"
+" atšaukti. Panaikinti yra gerai, jeigu norite atlaisvinti URL nuorodas, kad "
+"naudotojai galėtų kurti naujus straipsnius su jomis."
 
 #: wiki/forms.py wiki/plugins/attachments/forms.py
 #: wiki/plugins/images/forms.py
 msgid "You are not sure enough!"
-msgstr ""
+msgstr "Jūs nesate visiškai įsitikinę!"
 
 #: wiki/forms.py
 msgid "While you tried to delete this article, it was modified. TAKE CARE!"
 msgstr ""
+"Kai bandėte pašalinti šį straipsnį, jis buvo modifikuotas. BŪKITE ATSARGŪS!"
 
 #: wiki/forms.py
 msgid "Lock article"
-msgstr ""
+msgstr "Užrakinti straipsnį"
 
 #: wiki/forms.py
 msgid "Deny all users access to edit this article."
-msgstr ""
+msgstr "Uždrausti visiems naudotojams redaguoti šį straipsnį."
 
 #: wiki/forms.py
 msgid "Permissions"
-msgstr ""
+msgstr "Teisės"
 
 #: wiki/forms.py
 msgid "Owner"
-msgstr ""
+msgstr "Savininkas"
 
 #: wiki/forms.py
 msgid "Enter the username of the owner."
-msgstr ""
+msgstr "Įvesti savininko naudotojo vardą."
 
 #: wiki/forms.py
 msgid "(none)"
-msgstr ""
+msgstr "(nėra)"
 
 #: wiki/forms.py
 msgid "Inherit permissions"
-msgstr ""
+msgstr "Gauti teises"
 
 #: wiki/forms.py
 msgid ""
 "Check here to apply the above permissions recursively to articles under this"
 " one."
 msgstr ""
+"Pažymėkite čia norėdami anksčiau nurodytas teises pakartotinai taikyti po "
+"šiuo straipsniu esantiems straipsniams. "
 
 #: wiki/forms.py
 msgid "Permission settings for the article were updated."
-msgstr ""
+msgstr "Straipsnio teisių nustatymai buvo atnaujinti."
 
 #: wiki/forms.py
 msgid "Your permission settings were unchanged, so nothing saved."
-msgstr ""
+msgstr "Jūsų teisių nustatymai nebuvo pakeisti, todėl niekas neišsaugota."
 
 #: wiki/forms.py
 msgid "No user with that username"
-msgstr ""
+msgstr "Nėra naudotojo, turinčio šį vardą"
 
 #: wiki/forms.py
 msgid "Article locked for editing"
-msgstr ""
+msgstr "Straipsnis užrakintas, jo negalima redaguoti"
 
 #: wiki/forms.py
 msgid "Article unlocked for editing"
-msgstr ""
+msgstr "Straipsnis atrakintas, jį galima redaguoti"
 
 #: wiki/forms.py
 msgid "Filter..."
-msgstr ""
+msgstr "Filtruojama..."
 
 #: wiki/core/plugins/base.py
 msgid "Settings for plugin"
-msgstr ""
+msgstr "Papildinio nustatymai"
 
 #: wiki/models/article.py wiki/models/pluginbase.py
 #: wiki/plugins/attachments/models.py
 msgid "current revision"
-msgstr ""
+msgstr "dabartinė versija"
 
 #: wiki/models/article.py
 msgid ""
 "The revision being displayed for this article. If you need to do a roll-"
 "back, simply change the value of this field."
 msgstr ""
+"Rodomas šio straipsnio taisymas. Jeigu norite atšaukti keitimus, tiesiog "
+"pakeiskite šio lauko reikšmę. "
 
 #: wiki/models/article.py
 msgid "modified"
-msgstr ""
+msgstr "koreguota"
 
 #: wiki/models/article.py
 msgid "Article properties last modified"
-msgstr ""
+msgstr "Straipsnio savybės paskutinį kartą buvo koreguotos"
 
 #: wiki/models/article.py
 msgid "owner"
-msgstr ""
+msgstr "savininkas"
 
 #: wiki/models/article.py
 msgid ""
 "The owner of the article, usually the creator. The owner always has both "
 "read and write access."
 msgstr ""
+"Straipsnio savininkas paprastai yra jo kūrėjas. Savininkas visada turi "
+"skaitymo ir rašymo teisę."
 
 #: wiki/models/article.py
 msgid "group"
-msgstr ""
+msgstr "grupė"
 
 #: wiki/models/article.py
 msgid ""
 "Like in a UNIX file system, permissions can be given to a user according to "
 "group membership. Groups are handled through the Django auth system."
 msgstr ""
+"Kaip ir UNIX failų sistemoje, teisės naudotojui gali būti suteikiamos pagal "
+"priklausymą grupei. Grupės prižiūrimos per Django autorių sistemą."
 
 #: wiki/models/article.py
 msgid "group read access"
-msgstr ""
+msgstr "grupės skaitymo teisė"
 
 #: wiki/models/article.py
 msgid "group write access"
-msgstr ""
+msgstr "grupės rašymo teisė"
 
 #: wiki/models/article.py
 msgid "others read access"
-msgstr ""
+msgstr "kitų skaitymo teisė"
 
 #: wiki/models/article.py
 msgid "others write access"
-msgstr ""
+msgstr "kitų rašymo teisė"
 
 #: wiki/models/article.py
 msgid "Article without content (%(id)d)"
-msgstr ""
+msgstr "Straipsnis be turinio (%(id)d)"
 
 #: wiki/models/article.py
 msgid "content type"
-msgstr ""
+msgstr "turinio tipas"
 
 #: wiki/models/article.py
 msgid "object ID"
-msgstr ""
+msgstr "objekto identifikacijos numeris"
 
 #: wiki/models/article.py
 msgid "Article for object"
-msgstr ""
+msgstr "Objekto straipsnis"
 
 #: wiki/models/article.py
 msgid "Articles for object"
-msgstr ""
+msgstr "Objekto straipsniai"
 
 #: wiki/models/article.py
 msgid "revision number"
-msgstr ""
+msgstr "versijos numeris"
 
 #: wiki/models/article.py
 msgid "IP address"
-msgstr ""
+msgstr "IP adresas"
 
 #: wiki/models/article.py
 msgid "user"
-msgstr ""
+msgstr "naudotojas"
 
 #: wiki/models/article.py
 msgid "locked"
-msgstr ""
+msgstr "užrakinta"
 
 #: wiki/models/article.py wiki/models/pluginbase.py
 msgid "article"
-msgstr ""
+msgstr "straipsnis"
 
 #: wiki/models/article.py
 msgid "article contents"
-msgstr ""
+msgstr "straipsnio turinys"
 
 #: wiki/models/article.py
 msgid "article title"
-msgstr ""
+msgstr "straipsnio pavadinimas"
 
 #: wiki/models/article.py
 msgid ""
 "Each revision contains a title field that must be filled out, even if the "
 "title has not changed"
 msgstr ""
+"Kiekvienoje versijoje yra pavadinimo laukas, kurį reikia užpildyti, net "
+"jeigu pavadinimas nepakeistas."
 
 #: wiki/models/pluginbase.py
 msgid "original article"
-msgstr ""
+msgstr "pirminis straipsnis"
 
 #: wiki/models/pluginbase.py
 msgid "Permissions are inherited from this article"
-msgstr ""
+msgstr "Teisės gautos iš šio straipsnio"
 
 #: wiki/models/pluginbase.py
 msgid "A plugin was changed"
-msgstr ""
+msgstr "Papildinys buvo pakeistas"
 
 #: wiki/models/pluginbase.py
 msgid ""
 "The revision being displayed for this plugin.If you need to do a roll-back, "
 "simply change the value of this field."
 msgstr ""
+"Rodomas šio papildinio taisymas. Jeigu norite atšaukti keitimus, tiesiog "
+"pakeiskite šio lauko reikšmę."
 
 #: wiki/models/urlpath.py
 msgid "Cache lookup value for articles"
-msgstr ""
+msgstr "Straipsnių paieškos talpykloje reikšmė "
 
 #: wiki/models/urlpath.py
 msgid "slug"
-msgstr ""
+msgstr "URL nuoroda"
 
 #: wiki/models/urlpath.py
 msgid "(root)"
-msgstr ""
+msgstr "(šaknis)"
 
 #: wiki/models/urlpath.py
 msgid "URL path"
-msgstr ""
+msgstr "URL kelias"
 
 #: wiki/models/urlpath.py
 msgid "URL paths"
-msgstr ""
+msgstr "URL keliai"
 
 #: wiki/models/urlpath.py
 msgid "Sorry but you cannot have a root article with a slug."
-msgstr ""
+msgstr "Atsiprašome, bet šakninis straipsnis negali būti su URL nuoroda."
 
 #: wiki/models/urlpath.py
 msgid "A non-root note must always have a slug."
-msgstr ""
+msgstr "Nešakninis užrašas visada privalo turėti URL nuorodą."
 
 #: wiki/models/urlpath.py
 msgid "There is already a root node on %s"
-msgstr ""
+msgstr "Jau yra šakninis mazgas %s"
 
 #: wiki/models/urlpath.py
 msgid ""
@@ -16453,273 +16838,289 @@ msgid ""
 "\n"
 "The children of this article have had their parents deleted. You should probably find a new home for them."
 msgstr ""
+"Straipsniai, likę be pirminių straipsnių\n"
+"===============================\n"
+"\n"
+"Šių susijusių straipsnių pirminiai straipsniai buvo pašalinti. Tikriausiai turėtumėte rasti jiems naują pagrindinį puslapį."
 
 #: wiki/models/urlpath.py
 msgid "Lost and found"
-msgstr ""
+msgstr "Prarasta ir atrasta"
 
 #: wiki/plugins/attachments/forms.py
 msgid "A short summary of what the file contains"
-msgstr ""
+msgstr "Trumpa santrauka to, kas yra faile"
 
 #: wiki/plugins/attachments/forms.py
 msgid "Yes I am sure..."
-msgstr ""
+msgstr "Taip, tikrai..."
 
 #: wiki/plugins/attachments/markdown_extensions.py
 msgid "Click to download file"
-msgstr ""
+msgstr "Spragtelėkite norėdami parsisiųsti failą"
 
 #: wiki/plugins/attachments/models.py
 msgid ""
 "The revision of this attachment currently in use (on all articles using the "
 "attachment)"
 msgstr ""
+"Šio priedo taisymo versija dabar yra naudojama (prie visų straipsnių su šiuo"
+" priedu)"
 
 #: wiki/plugins/attachments/models.py
 msgid "original filename"
-msgstr ""
+msgstr "pirminis failo pavadinimas"
 
 #: wiki/plugins/attachments/models.py
 msgid "attachment"
-msgstr ""
+msgstr "priedas"
 
 #: wiki/plugins/attachments/models.py
 msgid "attachments"
-msgstr ""
+msgstr "priedai"
 
 #: wiki/plugins/attachments/models.py
 msgid "file"
-msgstr ""
+msgstr "failas"
 
 #: wiki/plugins/attachments/models.py
 msgid "attachment revision"
-msgstr ""
+msgstr "priedo pataisa"
 
 #: wiki/plugins/attachments/models.py
 msgid "attachment revisions"
-msgstr ""
+msgstr "priedų pataisos"
 
 #: wiki/plugins/attachments/views.py
 msgid "%s was successfully added."
-msgstr ""
+msgstr "%s sėkmingai pridėta."
 
 #: wiki/plugins/attachments/views.py wiki/plugins/attachments/views.py
 msgid "Your file could not be saved: %s"
-msgstr ""
+msgstr "Jūsų failas negali būti išsaugotas: %s "
 
 #: wiki/plugins/attachments/views.py wiki/plugins/attachments/views.py
 msgid ""
 "Your file could not be saved, probably because of a permission error on the "
 "web server."
 msgstr ""
+"Jūsų failas negali būti išsaugotas tikriausiai dėl saityno serverio teisių "
+"klaidos."
 
 #: wiki/plugins/attachments/views.py
 msgid "%s uploaded and replaces old attachment."
-msgstr ""
+msgstr "Įkelta %s ir pakeičiamas senas priedas. "
 
 #: wiki/plugins/attachments/views.py
 msgid ""
 "Your new file will automatically be renamed to match the file already "
 "present. Files with different extensions are not allowed."
 msgstr ""
+"Jūsų naujas failas bus automatiškai pervadintas, kad atitiktų esamą failą. "
+"Failai su skirtingais plėtiniais neleidžiami."
 
 #: wiki/plugins/attachments/views.py
 msgid "Current revision changed for %s."
-msgstr ""
+msgstr "Dabartinė versija pakeista %s."
 
 #: wiki/plugins/attachments/views.py
 msgid "Added a reference to \"%(att)s\" from \"%(art)s\"."
-msgstr ""
+msgstr "Pridėta nuoroda iš \"%(art)s\" į \"%(att)s\"."
 
 #: wiki/plugins/attachments/views.py
 msgid "The file %s was deleted."
-msgstr ""
+msgstr "Failas %s buvo pašalintas."
 
 #: wiki/plugins/attachments/views.py
 msgid "This article is no longer related to the file %s."
-msgstr ""
+msgstr "Šis straipsnis daugiau nėra susijęs su failu %s."
 
 #: wiki/plugins/attachments/wiki_plugin.py
 msgid "A file was changed: %s"
-msgstr ""
+msgstr "Failas buvo pakeistas: %s"
 
 #: wiki/plugins/attachments/wiki_plugin.py
 msgid "A file was deleted: %s"
-msgstr ""
+msgstr "Failas buvo pašalintas: %s"
 
 #: wiki/plugins/images/forms.py
 msgid ""
 "New image %s was successfully uploaded. You can use it by selecting it from "
 "the list of available images."
 msgstr ""
+"Naujas paveikslas %s sėkmingai įkeltas. Galite jį pasirinkti iš esamų "
+"paveikslų sąrašo."
 
 #: wiki/plugins/images/forms.py
 msgid "Are you sure?"
-msgstr ""
+msgstr "Ar tikrai?"
 
 #: wiki/plugins/images/models.py
 msgid "image"
-msgstr ""
+msgstr "paveikslas"
 
 #: wiki/plugins/images/models.py
 msgid "images"
-msgstr ""
+msgstr "paveikslai"
 
 #: wiki/plugins/images/models.py
 msgid "Image: %s"
-msgstr ""
+msgstr "Paveikslas: %s"
 
 #: wiki/plugins/images/models.py
 msgid "Current revision not set!!"
-msgstr ""
+msgstr "Ši versija nenustatyta!"
 
 #: wiki/plugins/images/models.py
 msgid "image revision"
-msgstr ""
+msgstr "paveikslo taisymas"
 
 #: wiki/plugins/images/models.py
 msgid "image revisions"
-msgstr ""
+msgstr "paveikslų taisymas"
 
 #: wiki/plugins/images/models.py
 msgid "Image Revsion: %d"
-msgstr ""
+msgstr "Paveikslo taisymas: %d"
 
 #: wiki/plugins/images/views.py
 msgid "%s has been restored"
-msgstr ""
+msgstr "%s buvo atkurta"
 
 #: wiki/plugins/images/views.py
 msgid "%s has been marked as deleted"
-msgstr ""
+msgstr "%s pažymėta kaip pašalinta"
 
 #: wiki/plugins/images/views.py
 msgid "%(file)s has been changed to revision #%(revision)d"
-msgstr ""
+msgstr "%(file)s pakeista į versiją #%(revision)d"
 
 #: wiki/plugins/images/views.py
 msgid "%(file)s has been saved."
-msgstr ""
+msgstr "%(file)s išsaugota."
 
 #: wiki/plugins/images/wiki_plugin.py
 msgid "Images"
-msgstr ""
+msgstr "Paveikslai"
 
 #: wiki/plugins/images/wiki_plugin.py
 msgid "An image was added: %s"
-msgstr ""
+msgstr "Pridėtas paveikslas %s"
 
 #: wiki/plugins/links/wiki_plugin.py
 msgid "Links"
-msgstr ""
+msgstr "Nuorodos"
 
 #: wiki/plugins/notifications/forms.py
 msgid "Notifications"
-msgstr ""
+msgstr "Pranešimai"
 
 #: wiki/plugins/notifications/forms.py
 msgid "When this article is edited"
-msgstr ""
+msgstr "Kada šis straipsnis redaguojamas"
 
 #: wiki/plugins/notifications/forms.py
 msgid "Also receive emails about article edits"
-msgstr ""
+msgstr "Taip pat gauti el. laiškus apie straipsnių redakcijas"
 
 #: wiki/plugins/notifications/forms.py
 msgid "Your notification settings were updated."
-msgstr ""
+msgstr "Jūsų pranešimo nustatymai buvo atnaujinti."
 
 #: wiki/plugins/notifications/forms.py
 msgid "Your notification settings were unchanged, so nothing saved."
-msgstr ""
+msgstr "Jūsų pranešimo nustatymai nebuvo pakeisti, todėl niekas neišsaugota."
 
 #: wiki/plugins/notifications/models.py
 msgid "%(user)s subscribing to %(article)s (%(type)s)"
-msgstr ""
+msgstr "%(user)s yra užsisakę %(article)s (%(type)s)"
 
 #: wiki/plugins/notifications/models.py
 msgid "Article deleted: %s"
-msgstr ""
+msgstr "Straipsnis pašalintas: %s"
 
 #: wiki/plugins/notifications/models.py
 msgid "Article modified: %s"
-msgstr ""
+msgstr "Straipsnis pakoreguotas: %s"
 
 #: wiki/plugins/notifications/models.py
 msgid "New article created: %s"
-msgstr ""
+msgstr "Sukurtas naujas straipsnis: %s"
 
 #: wiki/views/accounts.py
 msgid "You are now sign up... and now you can sign in!"
-msgstr ""
+msgstr "Dabar jūs esate prisiregistravę... ir galite prisijungti!"
 
 #: wiki/views/accounts.py
 msgid "You are no longer logged in. Bye bye!"
-msgstr ""
+msgstr "Jūs jau neprisijungę. Iki!"
 
 #: wiki/views/accounts.py
 msgid "You are now logged in! Have fun!"
-msgstr ""
+msgstr "Dabar jūs prisijungę! Smagaus darbo!"
 
 #: wiki/views/article.py
 msgid "New article '%s' created."
-msgstr ""
+msgstr "Sukurtas naujas straipsnis \"%s\"."
 
 #: wiki/views/article.py
 msgid "There was an error creating this article: %s"
-msgstr ""
+msgstr "Įvyko klaida kuriant šį straipsnį: %s"
 
 #: wiki/views/article.py
 msgid "There was an error creating this article."
-msgstr ""
+msgstr "Įvyko klaida kuriant šį straipsnį."
 
 #: wiki/views/article.py
 msgid ""
 "This article cannot be deleted because it has children or is a root article."
 msgstr ""
+"Šio straipsnio negalima pašalinti, nes yra su juo susijusių straipsnių arba "
+"jis yra šakninis straipsnis."
 
 #: wiki/views/article.py
 msgid ""
 "This article together with all its contents are now completely gone! Thanks!"
-msgstr ""
+msgstr "Šio straipsnio ir viso jo turinio nebėra! Ačiū!"
 
 #: wiki/views/article.py
 msgid ""
 "The article \"%s\" is now marked as deleted! Thanks for keeping the site "
 "free from unwanted material!"
 msgstr ""
+"Straipsnis \"%s\" dabar yra pažymėtas kaip pašalintas! Dėkojame, kad "
+"svetainėje nepaliekate nereikalingos medžiagos!"
 
 #: wiki/views/article.py
 msgid "Your changes were saved."
-msgstr ""
+msgstr "Jūsų pakeitimai yra išsaugoti."
 
 #: wiki/views/article.py
 msgid "A new revision of the article was succesfully added."
-msgstr ""
+msgstr "Nauja straipsnio versija sėkmingai pridėta."
 
 #: wiki/views/article.py
 msgid "Restoring article"
-msgstr ""
+msgstr "Atkuriamas straipsnis"
 
 #: wiki/views/article.py
 msgid "The article \"%s\" and its children are now restored."
-msgstr ""
+msgstr "Straipsnis \"%s\" ir su juo susiję straipsniai yra atkurti."
 
 #: wiki/views/article.py
 msgid "The article %s is now set to display revision #%d"
-msgstr ""
+msgstr "Dabar rodoma straipsnio \"%s\" taisoma versija #%d"
 
 #: wiki/views/article.py
 msgid "New title"
-msgstr ""
+msgstr "Naujas pavadinimas"
 
 #: wiki/views/article.py
 msgid "Merge between Revision #%(r1)d and Revision #%(r2)d"
-msgstr ""
+msgstr "Sujungti versiją #%(r1)d su versija #%(r2)d"
 
 #: wiki/views/article.py
 msgid ""
 "A new revision was created: Merge between Revision #%(r1)d and Revision "
 "#%(r2)d"
-msgstr ""
+msgstr "Sukurta nauja versija: versijos #%(r1)d ir versijos #%(r2)d sąsaja"
diff --git a/conf/locale/lt_LT/LC_MESSAGES/djangojs.mo b/conf/locale/lt_LT/LC_MESSAGES/djangojs.mo
index ba072b6b06..c8e3f018d3 100644
Binary files a/conf/locale/lt_LT/LC_MESSAGES/djangojs.mo and b/conf/locale/lt_LT/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/lt_LT/LC_MESSAGES/djangojs.po b/conf/locale/lt_LT/LC_MESSAGES/djangojs.po
index 16e19dc18e..8d080eebbe 100644
--- a/conf/locale/lt_LT/LC_MESSAGES/djangojs.po
+++ b/conf/locale/lt_LT/LC_MESSAGES/djangojs.po
@@ -33,13 +33,14 @@
 # 
 # Translators:
 # Riina <ciairdabar@yahoo.com>, 2014
+# Edukometrija <jolitad@mruni.eu>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
-"PO-Revision-Date: 2014-10-08 18:08+0000\n"
-"Last-Translator: Sarina Canelake <sarina@edx.org>\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
+"PO-Revision-Date: 2014-11-06 23:45+0000\n"
+"Last-Translator: Edukometrija <jolitad@mruni.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/edx-platform/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,7 +58,7 @@ msgstr ""
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: common/static/coffee/src/discussion/utils.js
 msgid "OK"
-msgstr ""
+msgstr "Gerai"
 
 #. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
@@ -70,8 +71,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -81,19 +80,18 @@ msgstr ""
 #: cms/templates/js/xblock-string-field-editor.underscore
 #: lms/templates/instructor/instructor_dashboard_2/add-cohort-form.underscore
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 #: cms/static/js/base.js lms/static/js/verify_student/photocapture.js
-#: cms/templates/js/checklist.underscore
 msgid "This link will open in a new browser window/tab"
-msgstr ""
+msgstr "Ši nuoroda atvers puslapį naujame naršyklės lange/kortelėje"
 
 #: cms/static/js/factories/manage_users.js
 #: lms/static/coffee/src/instructor_dashboard/util.js
 #: lms/static/coffee/src/instructor_dashboard/util.js
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Unknown"
-msgstr ""
+msgstr "Nežinoma"
 
 #: cms/static/js/factories/manage_users.js cms/static/js/views/asset.js
 #: cms/static/js/views/group_configuration_item.js
@@ -111,54 +109,45 @@ msgstr ""
 #: cms/templates/js/xblock-outline.underscore
 #: cms/templates/js/xblock-outline.underscore
 msgid "Delete"
-msgstr ""
+msgstr "Pašalinti"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: cms/static/js/views/assets.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: cms/templates/js/asset-library.underscore
 msgid "Name"
-msgstr ""
+msgstr "Vardas"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: cms/static/js/views/modals/base_modal.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: cms/templates/js/course_info_handouts.underscore
-#: cms/templates/js/edit-textbook.underscore
-#: cms/templates/js/group-configuration-edit.underscore
-#: cms/templates/js/section-name-edit.underscore
-#: cms/templates/js/xblock-string-field-editor.underscore
-#: lms/templates/instructor/instructor_dashboard_2/add-cohort-form.underscore
 msgid "Save"
-msgstr ""
+msgstr "Išsaugoti"
 
 #: common/lib/xmodule/xmodule/js/src/annotatable/display.js
 msgid "Show Annotations"
-msgstr ""
+msgstr "Rodyti komentarus"
 
 #: common/lib/xmodule/xmodule/js/src/annotatable/display.js
 msgid "Hide Annotations"
-msgstr ""
+msgstr "Slėpti komentarus"
 
 #: common/lib/xmodule/xmodule/js/src/annotatable/display.js
 msgid "Expand Instructions"
-msgstr ""
+msgstr "Išskleisti instrukcijas"
 
 #: common/lib/xmodule/xmodule/js/src/annotatable/display.js
 msgid "Collapse Instructions"
-msgstr ""
+msgstr "Suskleisti instrukcijas"
 
 #: common/lib/xmodule/xmodule/js/src/annotatable/display.js
 msgid "Commentary"
-msgstr ""
+msgstr "Pastabos"
 
 #: common/lib/xmodule/xmodule/js/src/annotatable/display.js
 msgid "Reply to Annotation"
-msgstr ""
+msgstr "Atsakyti į komentarus"
 
 #. Translators: %(earned)s is the number of points earned. %(total)s is the
 #. total number of points (examples: 0/1, 1/1, 2/3, 5/10). The total number of
@@ -167,61 +156,61 @@ msgstr ""
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 msgid "(%(earned)s/%(possible)s point)"
 msgid_plural "(%(earned)s/%(possible)s points)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "(%(earned)s/%(possible)s taško)"
+msgstr[1] "(%(earned)s/%(possible)s taško)"
+msgstr[2] "(%(earned)s/%(possible)s taškų)"
 
 #. Translators: %(num_points)s is the number of points possible (examples: 1,
 #. 3, 10). There will always be at least 1 point possible.;
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 msgid "(%(num_points)s point possible)"
 msgid_plural "(%(num_points)s points possible)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "(galima gauti %(num_points)s tašką)"
+msgstr[1] "(galima gauti %(num_points)s tašką)"
+msgstr[2] "(galima gauti %(num_points)s taškus)"
 
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 msgid "Answer:"
-msgstr ""
+msgstr "Atsakymas:"
 
 #. Translators: the word Answer here refers to the answer to a problem the
 #. student must solve.;
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 msgid "Hide Answer"
-msgstr ""
+msgstr "Slėpti atsakymą"
 
 #. Translators: the word Answer here refers to the answer to a problem the
 #. student must solve.;
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 msgid "Show Answer"
-msgstr ""
+msgstr "Rodyti atsakymą"
 
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 msgid "Reveal Answer"
-msgstr ""
+msgstr "Parodyti atsakymą"
 
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 msgid "Answer hidden"
-msgstr ""
+msgstr "Atsakymas paslėptas"
 
 #. Translators: the word unanswered here is about answering a problem the
 #. student must solve.;
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 msgid "unanswered"
-msgstr ""
+msgstr "neatsakyta"
 
 #: common/lib/xmodule/xmodule/js/src/capa/display.js
 msgid "Status: unsubmitted"
-msgstr ""
+msgstr "Statusas: nepateikta"
 
 #. Translators: A "rating" is a score a student gives to indicate how well
 #. they feel they were graded on this problem
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 msgid "You need to pick a rating before you can submit."
-msgstr ""
+msgstr "Prieš pateikdami turite pasirinkti įvertinimą."
 
 #. Translators: this message appears when transitioning between openended
 #. grading
@@ -230,24 +219,25 @@ msgstr ""
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 msgid "Your score did not meet the criteria to move to the next step."
-msgstr ""
+msgstr "Jūsų rezultatas nepakankamas, kad galėtumėte pereiti į kitą pakopą."
 
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "Submit"
-msgstr ""
+msgstr "Pateikti"
 
 #. Translators: one clicks this button after one has finished filling out the
 #. grading
 #. form for an openended assessment
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 msgid "Submit assessment"
-msgstr ""
+msgstr "Pateikti vertinimą"
 
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 msgid ""
 "Your response has been submitted. Please check back later for your grade."
 msgstr ""
+"Jūsų atsakymas pateiktas. Prašome vėliau pasitikrinti, kokį pažymį gavote. "
 
 #. Translators: this button is clicked to submit a student's rating of
 #. an evaluator's assessment
@@ -257,28 +247,33 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 msgid "Answer saved, but not yet submitted."
-msgstr ""
+msgstr "Atsakymas išsaugotas, bet dar nepateiktas."
 
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 msgid ""
 "Please confirm that you wish to submit your work. You will not be able to "
 "make any changes after submitting."
 msgstr ""
+"Prašome patvirtinti, kad norite pateikti darbą. Pateikę negalėsite nieko "
+"keisti."
 
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 msgid ""
 "You are trying to upload a file that is too large for our system.  Please "
 "choose a file under 2MB or paste a link to it into the answer box."
 msgstr ""
+"Bandote įkelti failą, kuris mūsų sistemai yra per didelis. Prašome "
+"pasirinkti failą, mažesnį negu 2MB, arba nukopijuokite jo nuorodą į atsakymo"
+" langelį."
 
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 msgid ""
 "Are you sure you want to remove your previous response to this question?"
-msgstr ""
+msgstr "Ar jūs tikrai norite panaikinti ankstesnį atsakymą į šį klausimą?"
 
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 msgid "Moved to next step."
-msgstr ""
+msgstr "Perėjote į kitą pakopą."
 
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 msgid ""
@@ -287,6 +282,9 @@ msgid ""
 " uploaded the image to another website, you can paste a link to it into the "
 "answer box."
 msgstr ""
+"Šiame klausime reikia įkelti failus, bet jūsų naršyklė to neleidžia. "
+"Išmėginkite naujausią \"Google Chrome\" versiją arba, jeigu paveikslėlį "
+"įkėlėte į kitą svetainę, galite nukopijuoti jo nuorodą į atsakymo langelį."
 
 #. Translators: "Show Question" is some text that, when clicked, shows a
 #. question's
@@ -294,88 +292,86 @@ msgstr ""
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 msgid "Show Question"
-msgstr ""
+msgstr "Rodyti klausimą"
 
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 #: common/lib/xmodule/xmodule/js/src/combinedopenended/display.js
 msgid "Hide Question"
-msgstr ""
+msgstr "Slėpti klausimą"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Paragraph"
-msgstr ""
+msgstr "Pastraipa"
 
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Preformatted"
-msgstr ""
+msgstr "Iš anksto suformatuota"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Heading 1"
-msgstr ""
+msgstr "1 pavadinimas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Heading 2"
-msgstr ""
+msgstr "2 pavadinimas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Heading 3"
-msgstr ""
+msgstr "3 pavadinimas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Add to Dictionary"
-msgstr ""
+msgstr "Pridėti į žodyną"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: cms/templates/js/add-xblock-component-menu-problem.underscore
 msgid "Advanced"
-msgstr ""
+msgstr "Sudėtingesnis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Align center"
-msgstr ""
+msgstr "Lygiuoti centrus"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Align left"
-msgstr ""
+msgstr "Lygiuoti kairiąją pusę"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Align right"
-msgstr ""
+msgstr "Lygiuoti dešiniąją pusę"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Alignment"
-msgstr ""
+msgstr "Lygiuotė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Alternative source"
-msgstr ""
+msgstr "Alternatyvus šaltinis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
@@ -393,708 +389,693 @@ msgstr ""
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Author"
-msgstr ""
+msgstr "Autorius"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Background color"
-msgstr ""
+msgstr "Fono spalva"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: lms/static/js/Markdown.Editor.js
 msgid "Blockquote"
-msgstr ""
+msgstr "Citatos blokas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Blocks"
-msgstr ""
+msgstr "Blokai"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Body"
-msgstr ""
+msgstr "Pagrindinė dalis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Bold"
-msgstr ""
+msgstr "Paryškintas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Border color"
-msgstr ""
+msgstr "Kraštinių spalva"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Border"
-msgstr ""
+msgstr "Kraštinė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Bottom"
-msgstr ""
+msgstr "Apačia"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Bullet list"
-msgstr ""
+msgstr "Ženklelių sąrašas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Caption"
-msgstr ""
+msgstr "Pavadinimas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Cell padding"
-msgstr ""
+msgstr "Langelių užpildymas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Cell properties"
-msgstr ""
+msgstr "Langelių savybės"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Cell spacing"
-msgstr ""
+msgstr "Langelių išretinimas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Cell type"
-msgstr ""
+msgstr "Langelio tipas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Cell"
-msgstr ""
+msgstr "Langelis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Center"
-msgstr ""
+msgstr "Centras"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Circle"
-msgstr ""
+msgstr "Apskritimas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Clear formatting"
-msgstr ""
+msgstr "Valyti formatavimą"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: common/templates/js/image-modal.underscore
 msgid "Close"
-msgstr ""
+msgstr "Uždaryti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Code block"
-msgstr ""
+msgstr "Kodo blokas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Code"
-msgstr ""
+msgstr "Kodas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Color"
-msgstr ""
+msgstr "Spalva"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Cols"
-msgstr ""
+msgstr "Stulpeliai"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Column group"
-msgstr ""
+msgstr "Stulpelių grupė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Column"
-msgstr ""
+msgstr "Stulpelis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Constrain proportions"
-msgstr ""
+msgstr "Riboti proporcijas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Copy row"
-msgstr ""
+msgstr "Kopijuoti eilutę"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Copy"
-msgstr ""
+msgstr "Kopijuoti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Could not find the specified string."
-msgstr ""
+msgstr "Nepavyko rasti nurodytos eilutės."
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Custom color"
-msgstr ""
+msgstr "Tinkinta spalva"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Custom..."
-msgstr ""
+msgstr "Tinkinti..."
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Cut row"
-msgstr ""
+msgstr "Iškirpti eilutę"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Cut"
-msgstr ""
+msgstr "Iškirpti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Decrease indent"
-msgstr ""
+msgstr "Mažinti įtrauką"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Default"
-msgstr ""
+msgstr "Numatytasis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Delete column"
-msgstr ""
+msgstr "Pašalinti stulpelį"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Delete row"
-msgstr ""
+msgstr "Pašalinti eilutę"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Delete table"
-msgstr ""
+msgstr "Pašalinti lentelę"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: cms/templates/js/group-configuration-edit.underscore
 msgid "Description"
-msgstr ""
+msgstr "Aprašas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Dimensions"
-msgstr ""
+msgstr "Matmenys"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Disc"
-msgstr ""
+msgstr "Diskas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Div"
-msgstr ""
+msgstr "Skyr"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Document properties"
-msgstr ""
+msgstr "Dokumento savybės"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Edit HTML"
-msgstr ""
+msgstr "Redaguoti HTML"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: common/static/js/vendor/ova/catch/js/catch.js
-#: cms/templates/js/course_info_handouts.underscore
-#: cms/templates/js/group-configuration-details.underscore
-#: cms/templates/js/show-textbook.underscore
-#: cms/templates/js/xblock-string-field-editor.underscore
-#: cms/templates/js/mock/mock-container-page.underscore
 msgid "Edit"
-msgstr ""
+msgstr "Taisyti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Embed"
-msgstr ""
+msgstr "Įterpti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Emoticons"
-msgstr ""
+msgstr "Jaustukai"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Encoding"
-msgstr ""
+msgstr "Koduotė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "File"
-msgstr ""
+msgstr "Failas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Find and replace"
-msgstr ""
+msgstr "Rasti ir keisti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Find next"
-msgstr ""
+msgstr "Rasti paskesnį"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Find previous"
-msgstr ""
+msgstr "Rasti ankstesnį"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Find"
-msgstr ""
+msgstr "Rasti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Finish"
-msgstr ""
+msgstr "Baigti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Font Family"
-msgstr ""
+msgstr "Šriftų šeima"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Font Sizes"
-msgstr ""
+msgstr "Šrifto dydis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Footer"
-msgstr ""
+msgstr "Poraštė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Format"
-msgstr ""
+msgstr "Formatas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Formats"
-msgstr ""
+msgstr "Formatai"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: common/templates/js/image-modal.underscore
 msgid "Fullscreen"
-msgstr ""
+msgstr "Visas ekranas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "General"
-msgstr ""
+msgstr "Bendras"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "H Align"
-msgstr ""
+msgstr "H lygiuotė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Header 1"
-msgstr ""
+msgstr "1 antraštė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Header 2"
-msgstr ""
+msgstr "2 antraštė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Header 3"
-msgstr ""
+msgstr "3 antraštė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Header 4"
-msgstr ""
+msgstr "4 antraštė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Header 5"
-msgstr ""
+msgstr "5 antraštė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Header 6"
-msgstr ""
+msgstr "6 antraštė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Header cell"
-msgstr ""
+msgstr "Antraštės langelis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Header"
-msgstr ""
+msgstr "Antraštė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Headers"
-msgstr ""
+msgstr "Antraštės"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Heading 4"
-msgstr ""
+msgstr "4 pavadinimas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Heading 5"
-msgstr ""
+msgstr "5 pavadinimas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Heading 6"
-msgstr ""
+msgstr "6 pavadinimas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Headings"
-msgstr ""
+msgstr "Pavadinimai"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Height"
-msgstr ""
+msgstr "Aukštis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Horizontal line"
-msgstr ""
+msgstr "Horizontali linija"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Horizontal space"
-msgstr ""
+msgstr "Horizontalus tarpas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "HTML source code"
-msgstr ""
+msgstr "HTML šaltinio kodas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Ignore all"
-msgstr ""
+msgstr "Nepaisyti visko"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Ignore"
-msgstr ""
+msgstr "Nepaisyti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Image description"
-msgstr ""
+msgstr "Paveikslo aprašas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Increase indent"
-msgstr ""
+msgstr "Didinti įtrauką"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Inline"
-msgstr ""
+msgstr "Tiesiogiai įterpta"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert column after"
-msgstr ""
+msgstr "Įterpti stulpelius iš dešinės"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert column before"
-msgstr ""
+msgstr "Įterpti stulpelius iš kairės"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert date/time"
-msgstr ""
+msgstr "Įterpti datą/laiką"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert image"
-msgstr ""
+msgstr "Įterpti paveikslą"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert link"
-msgstr ""
+msgstr "Įterpti nuorodą"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert row after"
-msgstr ""
+msgstr "Įterpti eilutes žemiau"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert row before"
-msgstr ""
+msgstr "Įterpti eilutes aukščiau"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert table"
-msgstr ""
+msgstr "Įterpti lentelę"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert template"
-msgstr ""
+msgstr "Įterpti šabloną"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert video"
-msgstr ""
+msgstr "Įterpti vaizdo įrašą"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert"
-msgstr ""
+msgstr "Įterpti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert/edit image"
-msgstr ""
+msgstr "Įterpti/redaguoti paveikslą"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert/edit link"
-msgstr ""
+msgstr "Įterpti/redaguoti nuorodą"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Insert/edit video"
-msgstr ""
+msgstr "Įterpti/redaguoti vaizdo įrašą"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Italic"
-msgstr ""
+msgstr "Pasvirasis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Justify"
-msgstr ""
+msgstr "Abipusė lygiuotė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Keywords"
-msgstr ""
+msgstr "Reikšminiai žodžiai"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Left to right"
-msgstr ""
+msgstr "Iš kairės į dešinę"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Left"
-msgstr ""
+msgstr "Kairė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Lower Alpha"
-msgstr ""
+msgstr "Mažosios lotyniškos raidės"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Lower Greek"
-msgstr ""
+msgstr "Mažosios graikiškos raidės"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Lower Roman"
-msgstr ""
+msgstr "Mažieji romėniški skaitmenys"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Match case"
-msgstr ""
+msgstr "Skirti didžiąsias ir mažąsias raides"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Merge cells"
-msgstr ""
+msgstr "Sulieti langelius"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Middle"
-msgstr ""
+msgstr "Vidurys"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "New document"
-msgstr ""
+msgstr "Naujas dokumentas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "New window"
-msgstr ""
+msgstr "Naujas langas"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: cms/templates/js/paging-footer.underscore
-#: cms/templates/js/paging-header.underscore
 msgid "Next"
-msgstr ""
+msgstr "Kitas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "No color"
-msgstr ""
+msgstr "Be spalvų"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Nonbreaking space"
-msgstr ""
+msgstr "Neperkeliantis tarpas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
@@ -1106,25 +1087,25 @@ msgstr ""
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Numbered list"
-msgstr ""
+msgstr "Sunumeruotas sąrašas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Ok"
-msgstr ""
+msgstr "Gerai"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Page break"
-msgstr ""
+msgstr "Puslapio lūžis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Paste as text"
-msgstr ""
+msgstr "Įklijuoti kaip tekstą"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
@@ -1133,104 +1114,101 @@ msgid ""
 "Paste is now in plain text mode. Contents will now be pasted as plain text "
 "until you toggle this option off."
 msgstr ""
+"Dabar įklijuojama grynojo teksto režimu. Turinys dabar bus įklijuotas kaip "
+"grynasis tekstas, kol neišjungsite šios parinkties."
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Paste row after"
-msgstr ""
+msgstr "Įklijuoti eilutę žemiau"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Paste row before"
-msgstr ""
+msgstr "Įklijuoti eilutę aukščiau"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Paste your embed code below:"
-msgstr ""
+msgstr "Žemiau įklijuoti įterptąjį kodą:"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Paste"
-msgstr ""
+msgstr "Įklijuoti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Poster"
-msgstr ""
+msgstr "Plakatas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Pre"
-msgstr ""
+msgstr "Peržiūra"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Prev"
-msgstr ""
+msgstr "Ankstesnis"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: lms/static/coffee/src/customwmd.js
-#: cms/templates/js/asset-library.underscore
 msgid "Preview"
-msgstr ""
+msgstr "Peržiūra"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Print"
-msgstr ""
+msgstr "Spausdinti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Redo"
-msgstr ""
+msgstr "Grąžinti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Remove link"
-msgstr ""
+msgstr "Pašalinti nuorodą"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Replace all"
-msgstr ""
+msgstr "Keisti viską"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Replace with"
-msgstr ""
+msgstr "Keisti į"
 
-#. #-#-#-#-#  djangojs-partial.po (edx-platform)  #-#-#-#-#
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: cms/templates/js/metadata-file-uploader-item.underscore
-#: cms/templates/js/video/metadata-translations-item.underscore
 msgid "Replace"
-msgstr ""
+msgstr "Pakeisti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Restore last draft"
-msgstr ""
+msgstr "Atkurti paskutinį juodraštį"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
@@ -1239,156 +1217,159 @@ msgid ""
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press "
 "ALT-0 for help"
 msgstr ""
+"Raiškiojo teksto sritis. Norėdami atsidaryti meniu spauskite ALT-F9. "
+"Norėdami atsidaryti įrankių juostą spauskite ALT-F10. Norėdami gauti "
+"pagalbos spauskite ALT-0."
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Right to left"
-msgstr ""
+msgstr "Iš dešinės į kairę"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Right"
-msgstr ""
+msgstr "Dešinė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Robots"
-msgstr ""
+msgstr "Robotai"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Row group"
-msgstr ""
+msgstr "Eilučių grupė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Row properties"
-msgstr ""
+msgstr "Eilutės savybės"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Row type"
-msgstr ""
+msgstr "Eilutės tipas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Row"
-msgstr ""
+msgstr "Eilutė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Rows"
-msgstr ""
+msgstr "Eilutės"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Scope"
-msgstr ""
+msgstr "Galiojimo sritis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Select all"
-msgstr ""
+msgstr "Pasirinkti viską"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Show blocks"
-msgstr ""
+msgstr "Rodyti blokus"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Show invisible characters"
-msgstr ""
+msgstr "Rodyti nematomus simbolius"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Source code"
-msgstr ""
+msgstr "Šaltinio kodas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Source"
-msgstr ""
+msgstr "Šaltinis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Special character"
-msgstr ""
+msgstr "Specialusis simbolis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Spellcheck"
-msgstr ""
+msgstr "Rašybos tikrinimas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Split cell"
-msgstr ""
+msgstr "Skaidyti langelį"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Square"
-msgstr ""
+msgstr "Kvadratas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Start search"
-msgstr ""
+msgstr "Pradėti paiešką"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Strikethrough"
-msgstr ""
+msgstr "Perbraukimas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Style"
-msgstr ""
+msgstr "Stilius"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Subscript"
-msgstr ""
+msgstr "Apatinis indeksas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Superscript"
-msgstr ""
+msgstr "Viršutinis indeksas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Table properties"
-msgstr ""
+msgstr "Lentelės savybės"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Table"
-msgstr ""
+msgstr "Lentelė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
@@ -1400,19 +1381,19 @@ msgstr ""
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Templates"
-msgstr ""
+msgstr "Šablonai"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Text color"
-msgstr ""
+msgstr "Teksto spalva"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Text to display"
-msgstr ""
+msgstr "Rodytinas tekstas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
@@ -1429,102 +1410,104 @@ msgid ""
 "The URL you entered seems to be an external link. Do you want to add the "
 "required http:// prefix?"
 msgstr ""
+"Atrodo, kad jūsų įvesta URL nuoroda yra išorinė nuoroda. Ar norite pridėti "
+"privalomą priešdėlį \"http://\"?"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Title"
-msgstr ""
+msgstr "Pavadinimas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Tools"
-msgstr ""
+msgstr "Įrankiai"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Top"
-msgstr ""
+msgstr "Viršus"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Underline"
-msgstr ""
+msgstr "Pabraukti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Undo"
-msgstr ""
+msgstr "Atšaukti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Upper Alpha"
-msgstr ""
+msgstr "Didžiosios lotyniškos raidės"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Upper Roman"
-msgstr ""
+msgstr "Didieji romėniški skaitmenys"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Url"
-msgstr ""
+msgstr "Url nuoroda"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "V Align"
-msgstr ""
+msgstr "V lygiuotė"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Vertical space"
-msgstr ""
+msgstr "Vertikalusis tarpas"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "View"
-msgstr ""
+msgstr "Žiūrėti"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Visual aids"
-msgstr ""
+msgstr "Vaizdinės priemonės"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Whole words"
-msgstr ""
+msgstr "Ištisi žodžiai"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Width"
-msgstr ""
+msgstr "Plotis"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "Words: {0}"
-msgstr ""
+msgstr "Žodžiai: {0}"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
 msgid "You have unsaved changes are you sure you want to navigate away?"
-msgstr ""
+msgstr "Yra neišsaugotų pakeitimų. Ar tikrai norite išeiti iš šio puslapio?"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
@@ -1533,6 +1516,8 @@ msgid ""
 "Your browser doesn't support direct access to the clipboard. Please use the "
 "Ctrl+X/C/V keyboard shortcuts instead."
 msgstr ""
+"Jūsų naršyklė nepalaiko tiesioginės prieigos prie iškarpinės. Naudokitės "
+"sparčiųjų klavišų deriniais Ctrl+X/C/V. "
 
 #: common/lib/xmodule/xmodule/js/src/lti/lti.js
 msgid ""
@@ -1540,6 +1525,9 @@ msgid ""
 "\n"
 "Click Cancel to return to this page without sending your information."
 msgstr ""
+"Spauskite \"Gerai\", jeigu norite išsiųsti savo naudotojo vardą ir elektroninio pašto adresą 3-iosios šalies taikomajai programai.\n"
+"\n"
+"Spauskite \"Atšaukti\", jeigu norite grįžti į šį puslapį neišsiuntę savo informacijos."
 
 #: common/lib/xmodule/xmodule/js/src/lti/lti.js
 msgid ""
@@ -1547,6 +1535,9 @@ msgid ""
 "\n"
 "Click Cancel to return to this page without sending your information."
 msgstr ""
+"Spauskite \"Gerai\", jeigu norite išsiųsti savo naudotojo vardą 3-iosios šalies taikomajai programai.\n"
+"\n"
+"Spauskite \"Atšaukti\", jeigu norite grįžti į šį puslapį neišsiuntę savo informacijos."
 
 #: common/lib/xmodule/xmodule/js/src/lti/lti.js
 msgid ""
@@ -1554,12 +1545,17 @@ msgid ""
 "\n"
 "Click Cancel to return to this page without sending your information."
 msgstr ""
+"Spauskite \"Gerai\", jeigu norite išsiųsti savo elektroninio pašto adresą 3-iosios šalies taikomajai programai.\n"
+"\n"
+"Spauskite \"Atšaukti\", jeigu norite grįžti į šį puslapį neišsiuntę savo informacijos."
 
 #: common/lib/xmodule/xmodule/js/src/sequence/display.js
 msgid ""
 "Sequence error! Cannot navigate to tab %(tab_name)s in the current "
 "SequenceModule. Please contact the course staff."
 msgstr ""
+"Sekos klaida! Neįmanoma pereiti į %(tab_name)s kortelę šiame sekos modulyje."
+" Prašome susisiekti su kurso personalu."
 
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 #: common/lib/xmodule/xmodule/js/src/video/04_video_control.js
@@ -1573,11 +1569,11 @@ msgstr "Pauzė"
 
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 msgid "Mute"
-msgstr ""
+msgstr "Išjungti garsą"
 
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 msgid "Unmute"
-msgstr ""
+msgstr "Įjungti garsą"
 
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 #: common/lib/xmodule/xmodule/js/src/video/04_video_control.js
@@ -1591,101 +1587,101 @@ msgstr "Padidinti naršyklę"
 
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 msgid "Speed"
-msgstr ""
+msgstr "Greitis"
 
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 msgid "Volume"
-msgstr ""
+msgstr "Garsas"
 
 #. Translators: Volume level equals 0%.
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 msgid "Muted"
-msgstr ""
+msgstr "Nutildyta"
 
 #. Translators: Volume level in range ]0,20]%
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 msgid "Very low"
-msgstr ""
+msgstr "Labai tyliai"
 
 #. Translators: Volume level in range ]20,40]%
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 msgid "Low"
-msgstr ""
+msgstr "Tyliai"
 
 #. Translators: Volume level in range ]40,60]%
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 msgid "Average"
-msgstr ""
+msgstr "Vidutiniškai"
 
 #. Translators: Volume level in range ]60,80]%
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 msgid "Loud"
-msgstr ""
+msgstr "Garsiai"
 
 #. Translators: Volume level in range ]80,99]%
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 msgid "Very loud"
-msgstr ""
+msgstr "Labai garsiai"
 
 #. Translators: Volume level equals 100%.
 #: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
 msgid "Maximum"
-msgstr ""
+msgstr "Maksimumas"
 
 #: common/lib/xmodule/xmodule/js/src/video/02_html5_video.js
 msgid ""
 "VideoPlayer: Element corresponding to the given selector was not found."
-msgstr ""
+msgstr "Vaizdo leistuvė: elementas, atitinkantis šį parinkiklį, nerastas."
 
 #: common/lib/xmodule/xmodule/js/src/video/02_html5_video.js
 msgid "This browser cannot play .mp4, .ogg, or .webm files."
-msgstr ""
+msgstr "Šioje naršyklėje .mp4, .ogg ir .webm failai neveikia."
 
 #: common/lib/xmodule/xmodule/js/src/video/02_html5_video.js
 msgid "Try using a different browser, such as Google Chrome."
-msgstr ""
+msgstr "Pabandykite kitą naršyklę, pavyzdžiui, Google Chrome."
 
 #: common/lib/xmodule/xmodule/js/src/video/04_video_control.js
 msgid "Video slider"
-msgstr ""
+msgstr "Vaizdo juosta"
 
 #: common/lib/xmodule/xmodule/js/src/video/05_video_quality_control.js
 msgid "HD on"
-msgstr ""
+msgstr "Didelė raiška įjungta"
 
 #: common/lib/xmodule/xmodule/js/src/video/05_video_quality_control.js
 msgid "HD off"
-msgstr ""
+msgstr "Didelė raiška išjungta"
 
 #: common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
 #: common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
 msgid "Video position"
-msgstr ""
+msgstr "Vaizdo pozicija"
 
 #: common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
 msgid "Video ended"
-msgstr ""
+msgstr "Vaizdas baigėsi"
 
 #: common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
 msgid "%(value)s hour"
 msgid_plural "%(value)s hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s valandą"
+msgstr[1] "%(value)s valandų"
+msgstr[2] "%(value)s valandų"
 
 #: common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
 msgid "%(value)s minute"
 msgid_plural "%(value)s minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s minutę"
+msgstr[1] "%(value)s minučių"
+msgstr[2] "%(value)s minučių"
 
 #: common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
 msgid "%(value)s second"
 msgid_plural "%(value)s seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s sekundę"
+msgstr[1] "%(value)s sekundžių"
+msgstr[2] "%(value)s sekundžių"
 
 #: common/lib/xmodule/xmodule/js/src/video/09_video_caption.js
 msgid "Caption will be displayed when "
@@ -1701,16 +1697,16 @@ msgstr "Išjungti subtitrus"
 
 #: common/lib/xmodule/xmodule/public/js/split_test_author_view.js
 msgid "Creating missing groups&hellip;"
-msgstr ""
+msgstr "Kuriamos trūkstamos groups&hellip;"
 
 #: common/static/coffee/src/discussion/discussion_module_view.js
 #: common/static/coffee/src/discussion/discussion_module_view.js
 msgid "Hide Discussion"
-msgstr ""
+msgstr "Slėpti diskusiją"
 
 #: common/static/coffee/src/discussion/discussion_module_view.js
 msgid "Show Discussion"
-msgstr ""
+msgstr "Rodyti diskusiją"
 
 #: common/static/coffee/src/discussion/discussion_module_view.js
 #: common/static/coffee/src/discussion/discussion_module_view.js
@@ -1723,30 +1719,33 @@ msgstr ""
 #: common/static/coffee/src/discussion/views/discussion_user_profile_view.js
 #: common/static/coffee/src/discussion/views/response_comment_view.js
 msgid "Sorry"
-msgstr ""
+msgstr "Atsiprašome"
 
 #: common/static/coffee/src/discussion/discussion_module_view.js
 msgid "We had some trouble loading the discussion. Please try again."
-msgstr ""
+msgstr "Iškilo problema įkeliant diskusiją. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/discussion_module_view.js
 msgid ""
 "We had some trouble loading the threads you requested. Please try again."
 msgstr ""
+"Iškilo problema įkeliant jūsų prašomą temų giją. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/utils.js
 msgid "Loading content"
-msgstr ""
+msgstr "Įkeliamas turinys"
 
 #: common/static/coffee/src/discussion/utils.js
 msgid ""
 "We had some trouble processing your request. Please ensure you have copied "
 "any unsaved work and then reload the page."
 msgstr ""
+"Iškilo problema vykdant jūsų užklausą. Prašome įsitikinti, kad išsaugojote "
+"visus savo darbus, ir perkraukite puslapį iš naujo."
 
 #: common/static/coffee/src/discussion/utils.js
 msgid "We had some trouble processing your request. Please try again."
-msgstr ""
+msgstr "Iškilo problema vykdant jūsų užklausą. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/utils.js
 #: common/static/coffee/src/discussion/utils.js
@@ -1754,615 +1753,465 @@ msgstr ""
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 #: common/static/coffee/src/discussion/views/discussion_topic_menu_view.js
 msgid "…"
-msgstr ""
+msgstr "…"
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "currently %(numVotes)s vote"
 msgid_plural "currently %(numVotes)s votes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "šiuo metu %(numVotes)s balsas"
+msgstr[1] "šiuo metu %(numVotes)s balsai"
+msgstr[2] "šiuo metu %(numVotes)s balsų"
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "%(numVotes)s Vote"
 msgid_plural "%(numVotes)s Votes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(numVotes)s balsas"
+msgstr[1] "%(numVotes)s balsai"
+msgstr[2] "%(numVotes)s balsų"
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "We had some trouble subscribing you to this thread. Please try again."
 msgstr ""
+"Iškilo problema užregistruojant jus į šią giją. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid ""
 "We had some trouble unsubscribing you from this thread. Please try again."
 msgstr ""
+"Iškilo problema išregistruojant jus iš šios gijos. Prašome bandyti dar "
+"kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid ""
 "We had some trouble marking this response as an answer.  Please try again."
 msgstr ""
+"Iškilo problema pažymint šį atsiliepimą kaip atsakymą. Prašome bandyti dar "
+"kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid ""
 "We had some trouble removing this response as an answer.  Please try again."
 msgstr ""
+"Iškilo problema pašalinant šį atsiliepimą kaip atsakymą. Prašome bandyti dar"
+" kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "We had some trouble marking this response endorsed.  Please try again."
 msgstr ""
+"Iškilo problema pažymint šį atsiliepimą kaip patvirtintą. Prašome bandyti "
+"dar kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "We had some trouble removing this endorsement.  Please try again."
 msgstr ""
+"Iškilo problema pašalinant šį patvirtinimą. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "We had some trouble saving your vote.  Please try again."
-msgstr ""
+msgstr "Iškilo problema įrašant jūsų balsavimą. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "We had some trouble pinning this thread. Please try again."
-msgstr ""
+msgstr "Iškilo problema prisegant šią giją. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "We had some trouble unpinning this thread. Please try again."
-msgstr ""
+msgstr "Iškilo problema atsegant šią giją. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid ""
 "We had some trouble removing your flag on this post.  Please try again."
 msgstr ""
+"Iškilo problema pašalinant jūsų gairelę šiame skelbime. Prašome bandyti dar "
+"kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "We had some trouble reporting this post.  Please try again."
-msgstr ""
+msgstr "Iškilo problema paskelbiant šį skelbimą. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "We had some trouble closing this thread.  Please try again."
-msgstr ""
+msgstr "Iškilo problema uždarant šią giją. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_content_view.js
 msgid "We had some trouble reopening this thread.  Please try again."
 msgstr ""
+"Iškilo problema iš naujo atidarant šią giją. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 msgid "Load more"
-msgstr ""
+msgstr "Įkelti daugiau"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 msgid "Loading more threads"
-msgstr ""
+msgstr "Įkeliama daugiau gijų"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 msgid "We had some trouble loading more threads. Please try again."
-msgstr ""
+msgstr "Iškilo problema įkeliant daugiau gijų. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 msgid "%(unread_count)s new comment"
 msgid_plural "%(unread_count)s new comments"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(unread_count)s naujas komentaras"
+msgstr[1] "%(unread_count)s nauji komentarai"
+msgstr[2] "%(unread_count)s nauji komentarai"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 msgid "Search Results"
-msgstr ""
+msgstr "Paieškos rezultatai"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 msgid "Loading thread list"
-msgstr ""
+msgstr "Įkeliamas gijų sąrašas"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 msgid ""
 "No results found for %(original_query)s. Showing results for "
 "%(suggested_query)s."
 msgstr ""
+"Užklausos %(original_query)s rezultatų nerasta. Rodomi užklausos "
+"%(suggested_query)s rezultatai."
 
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 msgid "No threads matched your query."
-msgstr ""
+msgstr " Jokios gijos neatitiko jūsų užklausos."
 
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 msgid "Show posts by %(username)s."
-msgstr ""
+msgstr "Rodyti %(username)s skelbimus."
 
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid ""
 "The thread you selected has been deleted. Please select another thread."
-msgstr ""
+msgstr "Jūsų pasirinkta gija buvo pašalinta. Prašome pasirinkti kitą giją."
 
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "We had some trouble loading responses. Please reload the page."
-msgstr ""
+msgstr "Iškilo problema įkeliant atsakymus. Prašome perkrauti puslapį."
 
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "We had some trouble loading more responses. Please try again."
-msgstr ""
+msgstr "Iškilo problema įkeliant daugiau atsakymų. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "%(numResponses)s other response"
 msgid_plural "%(numResponses)s other responses"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(numResponses)s kitas atsakymas"
+msgstr[1] "%(numResponses)s kiti atsakymai"
+msgstr[2] "%(numResponses)s kiti atsakymai"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "%(numResponses)s response"
 msgid_plural "%(numResponses)s responses"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(numResponses)s atsakymas"
+msgstr[1] "%(numResponses)s atsakymai"
+msgstr[2] "%(numResponses)s atsakymai"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "Showing all responses"
-msgstr ""
+msgstr "Rodomi visi atsakymai"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "Showing first response"
 msgid_plural "Showing first %(numResponses)s responses"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Rodomas pirmas atsakymas"
+msgstr[1] "Rodomas pirmas atsakymas"
+msgstr[2] "Rodomi pirmi %(numResponses)s atsakymai"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "Load all responses"
-msgstr ""
+msgstr "Įkelti visus atsakymus"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "Load next %(numResponses)s responses"
-msgstr ""
+msgstr "Įkelti kitus %(numResponses)s atsakymus"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "Are you sure you want to delete this post?"
-msgstr ""
+msgstr "Ar jūs tikrai norite pašalinti šį pranešimą?"
 
 #: common/static/coffee/src/discussion/views/discussion_user_profile_view.js
 msgid "We had some trouble loading the page you requested. Please try again."
 msgstr ""
+"Iškilo problema įkeliant jūsų prašomą puslapį. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/views/new_post_view.js
 msgid "Your post will be discarded."
-msgstr ""
+msgstr "Jūsų skelbimas bus panaikintas."
 
 #: common/static/coffee/src/discussion/views/response_comment_show_view.js
 msgid "anonymous"
-msgstr ""
+msgstr "anonimas"
 
 #: common/static/coffee/src/discussion/views/response_comment_view.js
 msgid "Are you sure you want to delete this comment?"
-msgstr ""
+msgstr "Ar jūs tikrai norite panaikinti šį komentarą?"
 
 #: common/static/coffee/src/discussion/views/response_comment_view.js
 msgid "We had some trouble deleting this comment. Please try again."
-msgstr ""
+msgstr "Iškilo problema šalinant šį komentarą. Prašome bandyti dar kartą."
 
 #: common/static/coffee/src/discussion/views/thread_response_view.js
 msgid "Are you sure you want to delete this response?"
-msgstr ""
+msgstr "Ar jūs tikrai norite panaikinti šį atsakymą?"
 
 #: common/static/js/capa/drag_and_drop/base_image.js
 msgid "Drop target image"
-msgstr ""
+msgstr "Padėti paskirties paveikslą"
 
 #: common/static/js/capa/drag_and_drop/draggable_events.js
 msgid "dragging out of slider"
-msgstr ""
+msgstr "nutempiama iš slankiklio"
 
 #: common/static/js/capa/drag_and_drop/draggable_events.js
 msgid "dragging"
-msgstr ""
+msgstr "tempiama"
 
 #: common/static/js/capa/drag_and_drop/draggable_events.js
 msgid "dropped in slider"
-msgstr ""
+msgstr "nutempta į slankiklį"
 
 #: common/static/js/capa/drag_and_drop/draggable_events.js
 msgid "dropped on target"
-msgstr ""
+msgstr "nutempta į paskirties vietą"
 
 #. Translators: %s will be a time quantity, such as "4 minutes" or "1 day"
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "%s ago"
-msgstr ""
+msgstr "prieš %s"
 
 #. Translators: %s will be a time quantity, such as "4 minutes" or "1 day"
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "%s from now"
-msgstr ""
+msgstr "%s nuo dabar"
 
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "less than a minute"
-msgstr ""
+msgstr "mažiau nei minutę"
 
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "about a minute"
-msgstr ""
+msgstr "apie minutę"
 
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d minutę"
+msgstr[1] "%d minutes"
+msgstr[2] "%d minutes"
 
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "about an hour"
-msgstr ""
+msgstr "apie valandą"
 
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "about %d hour"
 msgid_plural "about %d hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "apie %d valandą"
+msgstr[1] "apie %d valandas"
+msgstr[2] "apie %d valandas"
 
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "a day"
-msgstr ""
+msgstr "diena"
 
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d dieną"
+msgstr[1] "%d dienas"
+msgstr[2] "%d dienas"
 
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "about a month"
-msgstr ""
+msgstr "apie mėnesį"
 
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "%d month"
 msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d mėnesį"
+msgstr[1] "%d mėnesius"
+msgstr[2] "%d mėnesius"
 
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "about a year"
-msgstr ""
+msgstr "apie metus"
 
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "%d year"
 msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d metus"
+msgstr[1] "%d metus"
+msgstr[2] "%d metų"
 
 #. Translators: please note that this is not a literal flag, but rather a
 #. report
 #: common/static/js/vendor/ova/flagging-annotator.js
 msgid "Check the box to remove all flags."
-msgstr ""
+msgstr "Norėdami pašalinti visas gaireles pažymėkite šį langelį."
 
 #. Translators: 'totalFlags' is the number of flags solely for that annotation
 #: common/static/js/vendor/ova/flagging-annotator.js
 msgid "Check the box to remove %(totalFlags)s flag."
 msgid_plural "Check the box to remove %(totalFlags)s flags."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Norėdami pašalinti %(totalFlags)s gairelę pažymėkite šį langelį."
+msgstr[1] "Norėdami pašalinti %(totalFlags)s gaireles pažymėkite šį langelį."
+msgstr[2] "Norėdami pašalinti %(totalFlags)s gaireles pažymėkite šį langelį."
 
 #. Translators: 'count' is the number of flags solely for that annotation that
 #. will be removed
 #: common/static/js/vendor/ova/flagging-annotator.js
 msgid "Check the box to remove %(count)s flag."
 msgid_plural "Check the box to remove %(count)s flags."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Norėdami pašalinti %(count)s gairelę pažymėkite šį langelį."
+msgstr[1] "Norėdami pašalinti %(count)s gaireles pažymėkite šį langelį."
+msgstr[2] "Norėdami pašalinti %(count)s gaireles pažymėkite šį langelį."
 
 #: common/static/js/vendor/ova/flagging-annotator.js
 msgid "All flags have been removed. To undo, uncheck the box."
 msgstr ""
+"Visos gairelės pašalintos. Norėdami atšaukti veiksmą, panaikinkite šio "
+"langelio žymėjimą."
 
 #: common/static/js/vendor/ova/flagging-annotator.js
 #: common/static/js/vendor/ova/flagging-annotator.js
 msgid "You have already reported this annotation."
-msgstr ""
+msgstr "Jūs jau pranešėte apie šį komentarą."
 
 #: common/static/js/vendor/ova/flagging-annotator.js
 #: common/static/js/vendor/ova/flagging-annotator.js
 msgid "Report annotation as inappropriate or offensive."
-msgstr ""
+msgstr "Praneškite apie netinkamą arba įžeidžiantį komentarą."
 
 #. Translators: 'count' is the number of flags solely for that annotation
 #: common/static/js/vendor/ova/flagging-annotator.js
 msgid "This annotation has %(count)s flag."
 msgid_plural "This annotation has %(count)s flags."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Šis komentaras pažymėtas %(count)s gairele."
+msgstr[1] "Šis komentaras pažymėtas %(count)s gairelėmis."
+msgstr[2] "Šis komentaras pažymėtas %(count)s gairelėmis."
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "User"
-msgstr ""
+msgstr "Naudotojas"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Annotation"
-msgstr ""
+msgstr "Komentaras"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Start"
-msgstr ""
+msgstr "Pradėti"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "End"
-msgstr ""
+msgstr "Baigti"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "#Replies"
-msgstr ""
+msgstr "#Atsakymai"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Date posted"
-msgstr ""
+msgstr "Data paskelbta"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "More"
-msgstr ""
+msgstr "Daugiau"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "My Notes"
-msgstr ""
+msgstr "Mano užrašai"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Instructor"
-msgstr ""
+msgstr "Lektorius"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Public"
-msgstr ""
+msgstr "Vieša"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Search"
-msgstr ""
+msgstr "Paieška"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Users"
-msgstr ""
+msgstr "Naudotojai"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Tags"
-msgstr ""
+msgstr "Žymos"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Annotation Text"
-msgstr ""
+msgstr "Komentaro tekstas"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 #: common/static/js/vendor/ova/catch/js/catch.js
-#: cms/templates/js/metadata-dict-entry.underscore
-#: cms/templates/js/metadata-file-uploader-entry.underscore
-#: cms/templates/js/metadata-list-entry.underscore
-#: cms/templates/js/metadata-number-entry.underscore
-#: cms/templates/js/metadata-option-entry.underscore
-#: cms/templates/js/metadata-string-entry.underscore
-#: cms/templates/js/mock/mock-xmodule-editor.underscore
-#: cms/templates/js/mock/mock-xmodule-settings-only-editor.underscore
-#: cms/templates/js/video/metadata-translations-entry.underscore
 msgid "Clear"
-msgstr ""
+msgstr "Išvalyti"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Text"
-msgstr ""
+msgstr "Tekstas"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Video"
-msgstr ""
+msgstr "Vaizdo įrašas"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Image"
-msgstr ""
+msgstr "Paveikslas"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Reply"
-msgstr ""
+msgstr "Atsakyti"
 
 #: common/static/js/vendor/ova/catch/js/catch.js
 msgid "Tags:"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "Galimi %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Galimų %s sąrašas. Pasirinkite, pažymėdami apačioje esančiame rėmelyje ir "
-"spausdami rodyklę \"Pasirinkti\", esančią tarp abiejų rėmelių."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "Įrašykite šiame langelyje, norėdami filtruoti galimų %s sąrašą."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Filtras"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Pasirinkti visus"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Spauskite, norėdami pasirinkti visus %s iš karto."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Pasirinkti"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "Pašalinti"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "Pasirinktas %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Pasirinktų %s sąrašas. Pasirinktus įrašus galima pašalinti, pažymint "
-"apačioje esančiame rėmelyje ir paspaudus \"Šalinti\" rodyklę, esančią tarp "
-"abiejų rėmelių."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Pašalinti viską"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Spauskite, norėdami pašalinti iš karto visus pasirinktus %s."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "Pasirinkta %(sel)s iš %(cnt)s"
-msgstr[1] "Pasirinkta %(sel)s iš %(cnt)s"
-msgstr[2] "Pasirinkta %(sel)s iš %(cnt)s"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"Redaguojamuose laukuose yra neišsaugotų pakeitimų. Jei dabar atliksite "
-"veiksmą, visi neišsaugoti pakeitimai bus prarasti."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Jūs pasirinkote veiksmą, tačiau neišsaugojote pakeitimų, atliktų atskiruose "
-"laukuose. Išsaugojimui paspauskite OK ir pakartotinai pasirinkite veiksmą. "
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"Jūs pasirinkote veiksmą, tačiau neatlikote jokių pakeitimų atskiruose "
-"laukuose. Tikėtina, kad jums reikia naudoti \"Vykdyti\", o ne \"Saugoti\" "
-"mygtuką."
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Rodyti"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Slėpti"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Dabar"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Laikrodis"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Pasirinkti laiką"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Vidurnaktis"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6:00 ryto"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Vidurdienis"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Šiandien"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Kalendorius"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Vakar"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Rytoj"
+msgstr "Žymos:"
 
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
-msgstr ""
+msgstr "Atverti skaičiuoklę"
 
 #: lms/static/coffee/src/calculator.js
 msgid "Close Calculator"
-msgstr ""
+msgstr "Užverti skaičiuoklę"
 
 #: lms/static/coffee/src/customwmd.js
 msgid "Post body"
-msgstr ""
+msgstr "Pranešimo tekstas"
 
 #. Translators: "Distribution" refers to a grade distribution. This error
 #. message appears when there is an error getting the data on grade
 #. distribution.;
 #: lms/static/coffee/src/instructor_dashboard/analytics.js
 msgid "Error fetching distribution."
-msgstr ""
+msgstr "Klaida parsiunčiant pasiskirstymą"
 
 #: lms/static/coffee/src/instructor_dashboard/analytics.js
 #: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
 msgid "Unavailable metric display."
-msgstr ""
+msgstr "Metrinis vaizdas neįmanomas "
 
 #: lms/static/coffee/src/instructor_dashboard/analytics.js
 #: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
 msgid "Error fetching grade distributions."
-msgstr ""
+msgstr "Klaida parsiunčiant pažymių pasiskirstymą"
 
 #: lms/static/coffee/src/instructor_dashboard/analytics.js
 #: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
 msgid "Last Updated: <%= timestamp %>"
-msgstr ""
+msgstr "Paskutinį kartą atnaujinta: <%= timestamp %>"
 
 #: lms/static/coffee/src/instructor_dashboard/analytics.js
 #: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
@@ -2372,27 +2221,28 @@ msgstr "<%= num_students %> kurso dalyvių (-ai) gavo balų."
 #: lms/static/coffee/src/instructor_dashboard/data_download.js
 msgid "Error generating student profile information. Please try again."
 msgstr ""
+"Klaida formuojant kurso dalyvių profilio informaciją. Prašome bandyti dar "
+"kartą."
 
 #: lms/static/coffee/src/instructor_dashboard/data_download.js
-#: cms/templates/js/mock/mock-group-configuration-page.underscore
 msgid "Loading..."
-msgstr ""
+msgstr "Įkeliama..."
 
 #: lms/static/coffee/src/instructor_dashboard/data_download.js
 msgid "Error getting student list."
-msgstr ""
+msgstr "Klaida gaunant kurso dalyvių sąrašą."
 
 #: lms/static/coffee/src/instructor_dashboard/data_download.js
 msgid "Error retrieving grading configuration."
-msgstr ""
+msgstr "Klaida nuskaitant įvertinimą."
 
 #: lms/static/coffee/src/instructor_dashboard/data_download.js
 msgid "Error generating grades. Please try again."
-msgstr ""
+msgstr "Klaida generuojant įvertinimą. Prašome bandyti dar kartą."
 
 #: lms/static/coffee/src/instructor_dashboard/data_download.js
 msgid "File Name"
-msgstr ""
+msgstr "Failo pavadinimas"
 
 #: lms/static/coffee/src/instructor_dashboard/data_download.js
 msgid ""
@@ -2404,110 +2254,118 @@ msgstr ""
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "Username"
-msgstr ""
+msgstr "Naudotojo vardas"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "Email"
-msgstr ""
+msgstr "El. paštas"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "Revoke access"
-msgstr ""
+msgstr "Panaikinti prieigą"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "Enter username or email"
-msgstr ""
+msgstr "Įvesti naudotojo vardą arba el. paštą"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 #: lms/static/js/views/cohort_editor.js
 msgid "Please enter a username or email."
-msgstr ""
+msgstr "Prašome įvesti naudotojo vardą arba el. paštą."
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "Error changing user's permissions."
-msgstr ""
+msgstr "Klaida keičiant naudotojo teises."
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid ""
 "Could not find a user with username or email address '<%= identifier %>'."
 msgstr ""
+"Nepavyko rasti naudotojo, turinčio naudotojo vardą arba el. adresą <%= "
+"identifier %>."
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid ""
 "Error: User '<%= username %>' has not yet activated their account. Users "
 "must create and activate their accounts before they can be assigned a role."
 msgstr ""
+"Klaida: naudotojas <%= username %> neaktyvavo savo paskyros. Naudotojai turi"
+" susikurti ir aktyvuoti paskyras prieš jiems suteikiant vaidmenis."
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "Error: You cannot remove yourself from the Instructor group!"
-msgstr ""
+msgstr "Klaida: jūs negalite pašalinti savęs iš lektorių grupės!"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "The following errors were generated:"
-msgstr ""
+msgstr "Generuotos šios klaidos:"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "The following warnings were generated:"
-msgstr ""
+msgstr "Generuoti šie įspėjimai:"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "All accounts were created successfully."
-msgstr ""
+msgstr "Visos paskyros sėkmingai sukurtos."
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "Error adding/removing users as beta testers."
-msgstr ""
+msgstr "Klaida pridedant / šalinant naudotojus kaip beta versijos bandytojus."
 
 #. Translators: A list of users appears after this sentence;
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "These users were successfully added as beta testers:"
-msgstr ""
+msgstr "Šie naudotojai buvo sėkmingai pridėti kaip beta versijos bandytojai:"
 
 #. Translators: A list of users appears after this sentence;
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "These users were successfully removed as beta testers:"
 msgstr ""
+"Šie naudotojai buvo sėkmingai pašalinti kaip beta versijos bandytojai:"
 
 #. Translators: A list of users appears after this sentence;
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "These users were not added as beta testers:"
-msgstr ""
+msgstr "Šie naudotojai nebuvo pridėti kaip beta versijos bandytojai:"
 
 #. Translators: A list of users appears after this sentence;
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "These users were not removed as beta testers:"
-msgstr ""
+msgstr "Šie naudotojai nebuvo pašalinti kaip beta versijos bandytojai:"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid ""
 "Users must create and activate their account before they can be promoted to "
 "beta tester."
 msgstr ""
+"Naudotojai turi susikurti ir aktyvuoti paskyras prieš juos pakeliant į beta "
+"versijos bandytojus."
 
 #. Translators: A list of identifiers (which are email addresses and/or
 #. usernames) appears after this sentence;
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "Could not find users associated with the following identifiers:"
-msgstr ""
+msgstr "Nerasti naudotojai, susiję su šiais identifikatoriais:"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "Error enrolling/unenrolling users."
-msgstr ""
+msgstr "Klaida įtraukiant į sąrašą / išbraukiant iš sąrašo naudotojus."
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "The following email addresses and/or usernames are invalid:"
-msgstr ""
+msgstr "Šie el. pašto adresai ir (arba) naudotojų vardai negalioja:"
 
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "Successfully enrolled and sent email to the following users:"
 msgstr ""
+"Sėkmingai įtraukti į sąrašą ir išsiųsti el. laiškai šiems naudotojams:"
 
 #. Translators: A list of users appears after this sentence;
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "Successfully enrolled the following users:"
-msgstr ""
+msgstr "Sėkmingai įtraukti į sąrašą šie naudotojai:"
 
 #. Translators: A list of users appears after this sentence;
 #: lms/static/coffee/src/instructor_dashboard/membership.js
@@ -2515,11 +2373,14 @@ msgid ""
 "Successfully sent enrollment emails to the following users. They will be "
 "allowed to enroll once they register:"
 msgstr ""
+"Sėkmingai išsiųsti registracijos el. laiškai šiems naudotojams. Juos bus "
+"leista įtraukti į sąrašą, kai tik jie užsiregistruos:"
 
 #. Translators: A list of users appears after this sentence;
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "These users will be allowed to enroll once they register:"
 msgstr ""
+"Šiuos naudotojus bus leista įtraukti į sąrašą, kai tik jie užsiregistruos:"
 
 #. Translators: A list of users appears after this sentence;
 #: lms/static/coffee/src/instructor_dashboard/membership.js
@@ -2527,11 +2388,13 @@ msgid ""
 "Successfully sent enrollment emails to the following users. They will be "
 "enrolled once they register:"
 msgstr ""
+"Sėkmingai išsiųsti registracijos el. laiškai šiems naudotojams. Jie bus "
+"įtraukti į sąrašą, kai tik užsiregistruos:"
 
 #. Translators: A list of users appears after this sentence;
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "These users will be enrolled once they register:"
-msgstr ""
+msgstr "Šie naudotojai bus įtraukti į sąrašą, kai tik užsiregistruos: "
 
 #. Translators: A list of users appears after this sentence;
 #: lms/static/coffee/src/instructor_dashboard/membership.js
@@ -2539,11 +2402,12 @@ msgid ""
 "Emails successfully sent. The following users are no longer enrolled in the "
 "course:"
 msgstr ""
+"El. laiškai išsiųsti sėkmingai. Šie naudotojai išbraukti iš kurso sąrašo:"
 
 #. Translators: A list of users appears after this sentence;
 #: lms/static/coffee/src/instructor_dashboard/membership.js
 msgid "The following users are no longer enrolled in the course:"
-msgstr ""
+msgstr "Šie naudotojai išbraukti iš kurso sąrašo:"
 
 #. Translators: A list of users appears after this sentence. This situation
 #. arises when a staff member tries to unenroll a user who is not currently
@@ -2552,30 +2416,34 @@ msgstr ""
 msgid ""
 "These users were not affiliated with the course so could not be unenrolled:"
 msgstr ""
+"Šie naudotojai nepriskirti kursui ir todėl negali būti įtraukti į sąrašą:"
 
 #: lms/static/coffee/src/instructor_dashboard/send_email.js
 msgid "Your message must have a subject."
-msgstr ""
+msgstr "Jūsų pranešimas turi turėti temos pavadinimą."
 
 #: lms/static/coffee/src/instructor_dashboard/send_email.js
 msgid "Your message cannot be blank."
-msgstr ""
+msgstr "Jūsų pranešimas negali būti tuščias."
 
 #: lms/static/coffee/src/instructor_dashboard/send_email.js
 msgid "Your email was successfully queued for sending."
-msgstr ""
+msgstr "Jūsų el. laiškas sėkmingai parengtas siuntimui."
 
 #: lms/static/coffee/src/instructor_dashboard/send_email.js
 msgid ""
 "You are about to send an email titled '<%= subject %>' to yourself. Is this "
 "OK?"
 msgstr ""
+"Jūs ketinate sau siųsti el. laišką, pavadintą \"<%= subject %>\". Teisingai?"
 
 #: lms/static/coffee/src/instructor_dashboard/send_email.js
 msgid ""
 "You are about to send an email titled '<%= subject %>' to everyone who is "
 "staff or instructor on this course. Is this OK?"
 msgstr ""
+"Jūs ketinate siųsti el. laišką, pavadintą \"<%= subject %>\", visiems kurso "
+"darbuotojams ir lektoriams. Teisingai? "
 
 #: lms/static/coffee/src/instructor_dashboard/send_email.js
 msgid ""
@@ -2591,23 +2459,27 @@ msgid ""
 "classes, it may take up to an hour (or more, if other courses are "
 "simultaneously sending email) to send all emails."
 msgstr ""
+"Jūsų el. laiškas sėkmingai parengtas siuntimui. Atminkite, kad esant "
+"dideliam kurso dalyvių skaičiui, el. laiško išsiuntimas gali užtrukti iki "
+"valandos (arba net ilgiau, jei tuo pat metu ir kitų kursų dalyviai siunčia "
+"el. laiškus)."
 
 #: lms/static/coffee/src/instructor_dashboard/send_email.js
 msgid "Error sending email."
-msgstr ""
+msgstr "Klaida siunčiant el. laišką."
 
 #: lms/static/coffee/src/instructor_dashboard/send_email.js
 #: lms/static/coffee/src/instructor_dashboard/send_email.js
 msgid "There is no email history for this course."
-msgstr ""
+msgstr "Šiame kurse nėra kaupiama el. laiškų istorija."
 
 #: lms/static/coffee/src/instructor_dashboard/send_email.js
 msgid "There was an error obtaining email task history for this course."
-msgstr ""
+msgstr "Klaida gaunant šio kurso el. laiškų užduočių istoriją."
 
 #: lms/static/coffee/src/instructor_dashboard/send_email.js
 msgid "There was an error obtaining email content history for this course."
-msgstr ""
+msgstr "Klaida gaunant šio kurso el. laiškų turinio istoriją."
 
 #: lms/static/coffee/src/instructor_dashboard/student_admin.js
 #: lms/static/coffee/src/instructor_dashboard/student_admin.js
@@ -2615,7 +2487,7 @@ msgstr ""
 #: lms/static/coffee/src/instructor_dashboard/student_admin.js
 #: lms/static/coffee/src/instructor_dashboard/student_admin.js
 msgid "Please enter a student email address or username."
-msgstr ""
+msgstr "Prašome įvesti kurso dalyvio el. adresą arba naudotojo vardą."
 
 #: lms/static/coffee/src/instructor_dashboard/student_admin.js
 msgid ""
@@ -2633,7 +2505,7 @@ msgstr ""
 #: lms/static/coffee/src/instructor_dashboard/student_admin.js
 #: lms/static/coffee/src/instructor_dashboard/student_admin.js
 msgid "Please enter a problem location."
-msgstr ""
+msgstr "Prašome įvesti uždavinio adresą."
 
 #: lms/static/coffee/src/instructor_dashboard/student_admin.js
 msgid ""
@@ -2672,7 +2544,7 @@ msgstr ""
 
 #: lms/static/coffee/src/instructor_dashboard/student_admin.js
 msgid "Module state successfully deleted."
-msgstr ""
+msgstr "Modulio būsena sėkmingai pašalinta."
 
 #: lms/static/coffee/src/instructor_dashboard/student_admin.js
 msgid ""
@@ -2716,6 +2588,9 @@ msgid ""
 " Click the 'Show Background Task History for Problem' button to see the "
 "status of the task."
 msgstr ""
+"Sėkmingai pradėtas nustatymas, kad būtų galima iš naujo spręsti <%= "
+"problem_id %> uždavinį. Norėdami pamatyti užduoties būseną, spragtelėkite "
+"mygtuką \"Rodyti pirminę užduoties istoriją\"."
 
 #: lms/static/coffee/src/instructor_dashboard/student_admin.js
 msgid ""
@@ -2747,6 +2622,8 @@ msgid ""
 "Error starting a task to rescore problem '<%= problem_id %>'. Make sure that"
 " the problem identifier is complete and correct."
 msgstr ""
+"Klaida pradedant <%= problem_id %> uždavinio įvertinimo perskaičiavimą. "
+"Įsitikinkite, ar teisingai ir iki galo parašytas uždavinio identifikatorius."
 
 #: lms/static/coffee/src/instructor_dashboard/student_admin.js
 msgid "Error listing task history for this student and problem."
@@ -2756,283 +2633,289 @@ msgstr "Klaida pateikiant šio kurso dalyvio šio uždavinio užduočių istorij
 #. sending email
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Task Type"
-msgstr ""
+msgstr "Užduoties tipas"
 
 #. Translators: a "Task" is a background process such as grading students or
 #. sending email
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Task inputs"
-msgstr ""
+msgstr "Užduoties įvestis"
 
 #. Translators: a "Task" is a background process such as grading students or
 #. sending email
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Task ID"
-msgstr ""
+msgstr "Užduoties indentifikatorius"
 
 #. Translators: a "Requester" is a username that requested a task such as
 #. sending email
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Requester"
-msgstr ""
+msgstr "Užklausėjas"
 
 #. Translators: A timestamp of when a task (eg, sending email) was submitted
 #. appears after this
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Submitted"
-msgstr ""
+msgstr "Pateikta"
 
 #. Translators: The length of a task (eg, sending email) in seconds appears
 #. this
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Duration (sec)"
-msgstr ""
+msgstr "Trukmė (s)"
 
 #. Translators: The state (eg, "In progress") of a task (eg, sending email)
 #. appears after this.
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "State"
-msgstr ""
+msgstr "Būsena"
 
 #. Translators: a "Task" is a background process such as grading students or
 #. sending email
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Task Status"
-msgstr ""
+msgstr "Užduoties būsena"
 
 #. Translators: a "Task" is a background process such as grading students or
 #. sending email
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Task Progress"
-msgstr ""
+msgstr "Užduoties pažanga"
 
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid ""
 "An error occurred retrieving your email. Please try again later, and contact"
 " technical support if the problem persists."
 msgstr ""
+"Įvyko klaida gaunant jūsų el. laišką. Bandykite vėliau ir, jeigu problema "
+"išliks, susisiekite su techninės priežiūros komanda."
 
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Subject"
-msgstr ""
+msgstr "Tema"
 
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Sent By"
-msgstr ""
+msgstr "Nuo"
 
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Time Sent"
-msgstr ""
+msgstr "Siuntimo laikas"
 
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Number Sent"
-msgstr ""
+msgstr "Išsiųstas kiekis"
 
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Copy Email To Editor"
-msgstr ""
+msgstr "El. laišką nukopijuoti į rengyklę"
 
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Subject:"
-msgstr ""
+msgstr "Tema:"
 
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Sent By:"
-msgstr ""
+msgstr "Nuo:"
 
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Time Sent:"
-msgstr ""
+msgstr "Siuntimo laikas:"
 
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Sent To:"
-msgstr ""
+msgstr "Kam:"
 
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "Message:"
-msgstr ""
+msgstr "Žinutė:"
 
 #: lms/static/coffee/src/instructor_dashboard/util.js
 msgid "No tasks currently running."
-msgstr ""
+msgstr "Šiuo metu nevykdoma nė viena užduotis."
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "Grades saved.  Fetching the next submission to grade."
-msgstr ""
+msgstr "Vertinimai išsaugoti. Pateikite kitą užklausą vertinimui."
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "Problem Name"
-msgstr ""
+msgstr "Užduoties pavadinimas"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "Graded"
-msgstr ""
+msgstr "Įvertinta"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "Available to Grade"
-msgstr ""
+msgstr "Galima vertinti"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "Required"
-msgstr ""
+msgstr "Būtinas"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "Progress"
-msgstr ""
+msgstr "Pažanga"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "Back to problem list"
-msgstr ""
+msgstr "Grįžti į užduočių sąrašą"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "Try loading again"
-msgstr ""
+msgstr "Bandykite įkelti vėl"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "<%= num %> available "
-msgstr ""
+msgstr "<%= num %> laisvas"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "<%= num %> graded "
-msgstr ""
+msgstr "<%= num %> įvertintas"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "<%= num %> more needed to start ML"
-msgstr ""
+msgstr "Reikia dar <%= num %> norint pradėti ML"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "Re-check for submissions"
-msgstr ""
+msgstr "Patikrinkite prieš pateikiant"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "System got into invalid state: <%= state %>"
-msgstr ""
+msgstr "Sistema pateko į klaidingą būseną: <%= state %> "
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "System got into invalid state for submission: "
-msgstr ""
+msgstr "Sistema pateko į klaidingą būseną dėl pateikimo: "
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "(Hide)"
-msgstr ""
+msgstr "(Slėpti)"
 
 #: lms/static/coffee/src/staff_grading/staff_grading.js
 msgid "(Show)"
-msgstr ""
+msgstr "(Rodyti)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Insert Hyperlink"
-msgstr ""
+msgstr "Įterpti hipersaitą "
 
 #. Translators: Please keep the quotation marks (") around this text
 #: lms/static/js/Markdown.Editor.js lms/static/js/Markdown.Editor.js.c
 msgid "\"optional title\""
-msgstr ""
+msgstr "\"neprivalomas pavadinimas\""
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Insert Image (upload file or type url)"
-msgstr ""
+msgstr "Įterpkite paveikslėlį (įkelkite failą arba parašykite url nuorodą)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Markdown Editing Help"
-msgstr ""
+msgstr "Markdown redagavimo pagalba"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Bold (Ctrl+B)"
-msgstr ""
+msgstr "Paryškintas (Ctrl+B)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Italic (Ctrl+I)"
-msgstr ""
+msgstr "Pasvirasis (Ctrl+I)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Hyperlink (Ctrl+L)"
-msgstr ""
+msgstr "Nuoroda (Ctrl+L)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Blockquote (Ctrl+Q)"
-msgstr ""
+msgstr "Įtrauka (Ctrl+Q)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Code Sample (Ctrl+K)"
-msgstr ""
+msgstr "Kodo pavyzdys (Ctrl+K)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Image (Ctrl+G)"
-msgstr ""
+msgstr "Vaizdas (Ctrl+G)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Numbered List (Ctrl+O)"
-msgstr ""
+msgstr "Sunumeruotas sąrašas (Ctrl+O)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Bulleted List (Ctrl+U)"
-msgstr ""
+msgstr "Suženklintas sąrašas (Ctrl+U)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Heading (Ctrl+H)"
-msgstr ""
+msgstr "Pavadinimas (Ctrl+H)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Horizontal Rule (Ctrl+R)"
-msgstr ""
+msgstr "Horizontali taisyklė  (Ctrl+R)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Undo (Ctrl+Z)"
-msgstr ""
+msgstr "Atšaukti (Ctrl+Z)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Redo (Ctrl+Y)"
-msgstr ""
+msgstr "Atstatyti (Ctrl+Y)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Redo (Ctrl+Shift+Z)"
-msgstr ""
+msgstr "Atstatyti (Ctrl+Shift+Z)"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "strong text"
-msgstr ""
+msgstr "ryškus tekstas"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "emphasized text"
-msgstr ""
+msgstr "pabrėžtas tekstas"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "enter image description here"
-msgstr ""
+msgstr "čia įvesti paveikslo aprašymą"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "enter link description here"
-msgstr ""
+msgstr "čia įvesti nuorodos aprašymą"
 
 #: lms/static/js/Markdown.Editor.js lms/static/js/Markdown.Editor.js
 msgid "enter code here"
-msgstr ""
+msgstr "čia įveskite kodą"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "List item"
-msgstr ""
+msgstr "Sąrašo punktas"
 
 #: lms/static/js/Markdown.Editor.js
 msgid "Heading"
-msgstr ""
+msgstr "Pavadinimas"
 
 #: lms/static/js/ajax-error.js
 msgid "You have been logged out of your edX account. "
-msgstr ""
+msgstr "Jūs atsijungėte nuo \"edX\" paskyros."
+
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr "Atliekant jūsų užklausą įvyko klaida."
 
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
-msgstr ""
+msgstr "Įvyko nežinoma klaida"
 
 #: lms/static/js/staff_debug_actions.js
 msgid "Successfully reset the attempts for user {user}"
-msgstr ""
+msgstr "Sėkmingai nustatyta, kad naudotojas {user} galėtų bandyti iš naujo. "
 
 #: lms/static/js/staff_debug_actions.js
 msgid "Failed to reset attempts."
-msgstr ""
+msgstr "Nepavyko nustatyti, kad būtų galima bandyti iš naujo."
 
 #: lms/static/js/staff_debug_actions.js
 msgid "Successfully deleted student state for user {user}"
@@ -3044,166 +2927,172 @@ msgstr "Nepavyko panaikinti kurso dalyvio būsenos."
 
 #: lms/static/js/staff_debug_actions.js
 msgid "Successfully rescored problem for user {user}"
-msgstr ""
+msgstr "Sėkmingai perskaičiuotas naudotojo {user} uždavinio įvertinimas."
 
 #: lms/static/js/staff_debug_actions.js
 msgid "Failed to rescore problem."
-msgstr ""
+msgstr "Nepavyko perskaičiuoti uždavinio įvertinimo."
 
 #: lms/static/js/dashboard/donation.js
 msgid "Please enter a valid donation amount."
-msgstr ""
+msgstr "Prašome įvesti tinkamą aukos sumą."
 
 #: lms/static/js/dashboard/donation.js
 msgid "Your donation could not be submitted."
-msgstr ""
+msgstr "Nepavyko pateikti jūsų aukos."
 
 #: lms/static/js/dashboard/legacy.js
 msgid "An error occurred. Please try again later."
-msgstr ""
+msgstr "Įvyko klaida. Prašome pabandyti vėliau."
 
 #: lms/static/js/dashboard/legacy.js
 msgid "Please verify your new email address"
-msgstr ""
+msgstr "Patvirtinkite naują el. pašto adresą"
 
 #: lms/static/js/dashboard/legacy.js
 msgid ""
 "You'll receive a confirmation in your inbox. Please follow the link in the "
 "email to confirm your email address change."
 msgstr ""
+"Nurodytu el. paštu gausite patvirtinimą. Spustelėkite gautą nuorodą ir "
+"patvirtinkite el. pašto pakeitimą.  "
 
 #: lms/static/js/student_account/account.js
 #: lms/static/js/student_profile/profile.js
 msgid "The data could not be saved."
-msgstr ""
+msgstr "Nepavyko įrašyti duomenų."
 
 #: lms/static/js/student_account/account.js
 msgid "Please enter a valid email address"
-msgstr ""
+msgstr "Prašome įvesti galiojantį el. pašto adresą"
 
 #: lms/static/js/student_account/account.js
 msgid "Please enter a valid password"
-msgstr ""
+msgstr "Prašome įvesti tinkamą slaptažodį"
 
 #: lms/static/js/student_account/account.js
 msgid ""
 "Password reset email sent. Follow the link in the email to change your "
 "password."
 msgstr ""
+"Išsiųstas el. laiškas dėl naujo slaptažodžio nustatymo. Norėdami pakeisti "
+"slaptažodį, spauskite ant laiške esančios nuorodos."
 
 #: lms/static/js/student_account/account.js
 msgid "We weren't able to send you a password reset email."
-msgstr ""
+msgstr "Nepavyko išsiųsti el. laiško dėl slaptažodžio nustatymo."
 
 #: lms/static/js/student_account/account.js
 msgid "Please check your email to confirm the change"
-msgstr ""
+msgstr "Patikrinkite savo el. paštą, kad galėtumėte patvirtinti pakeitimą"
 
 #: lms/static/js/student_profile/profile.js
 msgid "Full name cannot be blank"
-msgstr ""
+msgstr "Vardo ir pavardės vieta negali būti tuščia"
 
 #: lms/static/js/student_profile/profile.js
 msgid "Language cannot be blank"
-msgstr ""
+msgstr "Kalbos vieta negali būti tuščia"
 
 #: lms/static/js/student_profile/profile.js
 msgid "We couldn't populate the list of language choices."
-msgstr ""
+msgstr "Nepavyko automatiškai įvesti kalbų sąrašo."
 
 #: lms/static/js/student_profile/profile.js
 msgid "Saved"
-msgstr ""
+msgstr "Įrašyta"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "Error adding students."
-msgstr ""
+msgstr "Klaida pridedant kurso dalyvius."
 
 #: lms/static/js/views/cohort_editor.js
 msgid "{numUsersAdded} student has been added to this cohort group"
 msgid_plural "{numUsersAdded} students have been added to this cohort group"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "{numUsersAdded} kurso dalyvis pridėtas prie šio pogrupio"
+msgstr[1] "{numUsersAdded} kurso dalyviai pridėti prie šio pogrupio"
+msgstr[2] "{numUsersAdded} kurso dalyvių pridėta prie šio pogrupio"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "{numMoved} student was removed from {oldCohort}"
 msgid_plural "{numMoved} students were removed from {oldCohort}"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "{numMoved} kurso dalyvis pašalintas iš {oldCohort}"
+msgstr[1] "{numMoved} kurso dalyviai pašalinti iš {oldCohort}"
+msgstr[2] "{numMoved} kurso dalyvių pašalinta iš {oldCohort}"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "{numPresent} student was already in the cohort group"
 msgid_plural "{numPresent} students were already in the cohort group"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "{numPresent} kurso dalyvis jau buvo pogrupyje"
+msgstr[1] "{numPresent} kurso dalyviai jau buvo pogrupyje"
+msgstr[2] "{numPresent} kurso dalyvių jau buvo pogrupyje"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "Unknown user: {user}"
-msgstr ""
+msgstr "Nežinomas naudotojas: {user}"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "There was an error when trying to add students:"
 msgid_plural "There were {numErrors} errors when trying to add students:"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Įvyko klaida bandant pridėti kurso dalyvius:"
+msgstr[1] "Įvyko {numErrors} klaidos bandant pridėti kurso dalyvius:"
+msgstr[2] "Įvyko {numErrors} klaidų bandant pridėti kurso dalyvius:"
 
 #: lms/static/js/views/cohort_editor.js
 msgid "View all errors"
-msgstr ""
+msgstr "Peržiūrėti visas klaidas"
 
 #: lms/static/js/views/cohorts.js
 msgid "You currently have no cohort groups configured"
-msgstr ""
+msgstr "Jūs dar nekonfigūravote pogrupių"
 
 #: lms/static/js/views/cohorts.js
-#: lms/templates/instructor/instructor_dashboard_2/cohorts.underscore
 msgid "Add Cohort Group"
-msgstr ""
+msgstr "Pridėti pogrupį"
 
 #: lms/static/js/views/cohorts.js
 msgid ""
 "The {cohortGroupName} cohort group has been created. You can manually add "
 "students to this group below."
 msgstr ""
+"Sukurtas {cohortGroupName} pogrupis. Žemiau galite rankiniu būdu pridėti "
+"kurso dalyvius prie šio grupio. "
 
 #: lms/static/js/views/cohorts.js
 msgid ""
 "We've encountered an error. Please refresh your browser and then try again."
 msgstr ""
+"Mes aptikome klaidą. Prašome atnaujinti naršyklę ir bandyti dar kartą."
 
 #: lms/static/js/views/cohorts.js
 msgid "Please enter a name for your new cohort group."
-msgstr ""
+msgstr "Prašome įvesti naujo pogrupio pavadinimą."
 
 #: lms/templates/class_dashboard/all_section_metrics.js
 #: lms/templates/class_dashboard/all_section_metrics.js
 msgid "Unable to retrieve data, please try again later."
-msgstr ""
+msgstr "Neįmanoma gauti duomenų, prašome pabandyti vėliau."
 
 #: lms/templates/class_dashboard/d3_stacked_bar_graph.js
 msgid "%(num_students)s student opened Subsection"
 msgid_plural "%(num_students)s students opened Subsection"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(num_students)s kurso dalyvis atsidarė potemę"
+msgstr[1] "%(num_students)s kurso dalyviai atsidarė potemę"
+msgstr[2] "%(num_students)s kurso dalyvių atsidarė potemę"
 
 #: lms/templates/class_dashboard/d3_stacked_bar_graph.js
 msgid "%(num_students)s student"
 msgid_plural "%(num_students)s students"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(num_students)s kurso dalyvis"
+msgstr[1] "%(num_students)s kurso dalyviai"
+msgstr[2] "%(num_students)s kurso dalyvių"
 
 #: lms/templates/class_dashboard/d3_stacked_bar_graph.js
 msgid "%(num_questions)s question"
 msgid_plural "%(num_questions)s questions"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(num_questions)s klausimas"
+msgstr[1] "%(num_questions)s klausimai"
+msgstr[2] "%(num_questions)s klausimų"
 
 #: lms/templates/class_dashboard/d3_stacked_bar_graph.js
 msgid "Number of Students"
@@ -3233,12 +3122,14 @@ msgstr ""
 
 #: cms/static/coffee/src/views/tabs.js
 msgid "Delete Page Confirmation"
-msgstr ""
+msgstr "Puslapio pašalinimo patvirtinimas"
 
 #: cms/static/coffee/src/views/tabs.js
 msgid ""
 "Are you sure you want to delete this page? This action cannot be undone."
 msgstr ""
+"Ar jūs tikrai norite pašalinti šį puslapį? Šis veiksmas negalės būti "
+"atšauktas."
 
 #: cms/static/coffee/src/views/tabs.js
 #: cms/static/js/views/course_info_update.js
@@ -3338,10 +3229,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3379,7 +3266,7 @@ msgstr ""
 #: cms/static/js/factories/manage_users.js
 msgid ""
 "Are you sure you want to delete {email} from the course team for “{course}”?"
-msgstr ""
+msgstr "Ar tikrai norite pašalinti {email} iš “{course}” kurso komandos?"
 
 #: cms/static/js/factories/manage_users.js
 msgid "Error removing user"
@@ -3444,6 +3331,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3494,7 +3385,7 @@ msgstr ""
 
 #: cms/static/js/views/asset.js
 msgid "Delete File Confirmation"
-msgstr ""
+msgstr "Failo pašalinimo patvirtinimas"
 
 #: cms/static/js/views/asset.js
 msgid ""
@@ -3502,10 +3393,13 @@ msgid ""
 "\n"
 "Also any content that links/refers to this item will no longer work (e.g. broken images and/or links)"
 msgstr ""
+"Ar jūs tikrai norite pašalinti šį elementą? Šio veiksmo nebus galima atšaukti.\n"
+"\n"
+"Taip pat bet koks turinys, susietas su šiuo elementu, gali nebeveikti (pvz., gali būti nerodomi paveikslėliai arba gali neveikti nuorodos)"
 
 #: cms/static/js/views/asset.js
 msgid "Your file has been deleted."
-msgstr ""
+msgstr "Jūsų failas buvo pašalintas."
 
 #: cms/static/js/views/assets.js cms/templates/js/asset-library.underscore
 msgid "Date Added"
@@ -3531,7 +3425,7 @@ msgstr ""
 
 #: cms/static/js/views/course_info_update.js
 msgid "Are you sure you want to delete this update?"
-msgstr ""
+msgstr "Ar jūs tikrai norite pašalinti šį atnaujinimą?"
 
 #: cms/static/js/views/course_info_update.js
 msgid "This action cannot be undone."
@@ -3577,9 +3471,9 @@ msgstr ""
 #: cms/static/js/views/group_configuration_details.js
 msgid "Used in %(count)s unit"
 msgid_plural "Used in %(count)s units"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Naudojama %(count)s skyriuje"
+msgstr[1] "Naudojama %(count)s skyriuose"
+msgstr[2] "Naudojama %(count)s skyriuose"
 
 #. Translators: 'outlineAnchor' is an anchor pointing to
 #. the course outline page.
@@ -3588,6 +3482,8 @@ msgid ""
 "This Group Configuration is not in use. Start by adding a content experiment"
 " to any Unit via the %(outlineAnchor)s."
 msgstr ""
+"Ši grupės konfigūracija nenaudojama. Pradėkite ją naudoti prie bet kurio "
+"skyriaus pridėdami turinio bandymą per %(outlineAnchor)s."
 
 #: cms/static/js/views/group_configuration_details.js
 msgid "Course Outline"
@@ -3595,7 +3491,7 @@ msgstr ""
 
 #: cms/static/js/views/group_configuration_item.js
 msgid "Delete this Group Configuration?"
-msgstr ""
+msgstr "Pašalinti šią grupės konfigūraciją?"
 
 #: cms/static/js/views/group_configuration_item.js
 msgid "Deleting this Group Configuration is permanent and cannot be undone."
@@ -3626,11 +3522,11 @@ msgstr ""
 
 #: cms/static/js/views/overview.js
 msgid "Collapse All Sections"
-msgstr ""
+msgstr "Suskleisti visas temas"
 
 #: cms/static/js/views/overview.js
 msgid "Expand All Sections"
-msgstr ""
+msgstr "Išskleisti visas temas"
 
 #: cms/static/js/views/overview.js
 msgid "Release date:"
@@ -3642,7 +3538,7 @@ msgstr ""
 
 #: cms/static/js/views/overview.js
 msgid "Edit section release date"
-msgstr ""
+msgstr "Redaguoti temos paskelbimo datą"
 
 #: cms/static/js/views/overview_assignment_grader.js
 #: cms/templates/js/course-outline.underscore
@@ -3674,13 +3570,15 @@ msgstr ""
 
 #: cms/static/js/views/show_textbook.js
 msgid "Delete “<%= name %>”?"
-msgstr ""
+msgstr "Ar pašalinti “<%= name %>”?"
 
 #: cms/static/js/views/show_textbook.js
 msgid ""
 "Deleting a textbook cannot be undone and once deleted any reference to it in"
 " your courseware's navigation will also be removed."
 msgstr ""
+"Vadovėlio pašalinimas vėliau negalės būti atšauktas, o jį pašalinus, visos "
+"nuorodos į jį, sukurtos kurso priemonėse, taip pat bus pašalintos."
 
 #: cms/static/js/views/uploads.js
 #: cms/templates/js/metadata-file-uploader-item.underscore
@@ -3730,6 +3628,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -3797,6 +3709,8 @@ msgid ""
 "Are you sure you want to revert to the last published version of the unit? "
 "You cannot undo this action."
 msgstr ""
+"Ar jūs tikrai norite grįžti prie paskutinės paskelbtos skyriaus versijos? "
+"Jūs negalėsite atšaukti šio veiksmo. "
 
 #: cms/static/js/views/pages/container_subviews.js
 msgid "Discarding Changes&hellip;"
@@ -3825,6 +3739,9 @@ msgid ""
 "you made to the unit when it was hidden will now be visible to students. Do "
 "you want to proceed?"
 msgstr ""
+"Jeigu skyrius buvo paskelbtas ir leistas rodyti kurso dalyviams, visi "
+"pakeitimai, kuriuos padarėte skyriuje, kai jis buvo paslėptas, dabar bus "
+"matomi kurso dalyviams. Ar norite tęsti? "
 
 #: cms/static/js/views/pages/container_subviews.js
 msgid "Making Visible to Students&hellip;"
@@ -3883,7 +3800,7 @@ msgstr ""
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Delete this %(xblock_type)s?"
-msgstr ""
+msgstr "Pašalinti šį %(xblock_type)s?"
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Deleting this %(xblock_type)s is permanent and cannot be undone."
@@ -3891,19 +3808,19 @@ msgstr ""
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Yes, delete this %(xblock_type)s"
-msgstr ""
+msgstr "Taip, pašalinti šį %(xblock_type)s"
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "section"
-msgstr ""
+msgstr "tema"
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "subsection"
-msgstr ""
+msgstr "potemė"
 
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "unit"
-msgstr ""
+msgstr "skyrius"
 
 #: cms/static/js/views/video/translations_editor.js
 msgid ""
@@ -4133,7 +4050,7 @@ msgstr ""
 
 #: cms/templates/js/asset.underscore
 msgid "Delete this asset"
-msgstr ""
+msgstr "Pašalinti šį mokymosi komponentą"
 
 #: cms/templates/js/asset.underscore
 msgid "Lock this asset"
@@ -4156,6 +4073,8 @@ msgid ""
 "Caution: The last published version of this unit is live. By publishing "
 "changes you will change the student experience."
 msgstr ""
+"Įspėjimas: paskutinė paskelbta šio skyriaus versija yra tiesiogiai "
+"naudojama. Paskelbdami pakeitimus pakeisite kurso dalyvių atliktą darbą."
 
 #: cms/templates/js/course-outline.underscore
 msgid "Contains staff only content"
@@ -4167,7 +4086,7 @@ msgstr ""
 
 #: cms/templates/js/course-outline.underscore
 msgid "Unpublished units will not be released"
-msgstr ""
+msgstr "Nepaskelbti skyriai nebus rodomi"
 
 #: cms/templates/js/course-outline.underscore
 msgid "Unpublished changes to content that will release in the future"
@@ -4328,7 +4247,7 @@ msgstr ""
 
 #: cms/templates/js/edit-chapter.underscore
 msgid "delete chapter"
-msgstr ""
+msgstr "pašalinti skyrių"
 
 #: cms/templates/js/edit-textbook.underscore
 #: cms/templates/js/group-configuration-edit.underscore
@@ -4337,15 +4256,15 @@ msgstr ""
 
 #: cms/templates/js/edit-textbook.underscore
 msgid "Textbook information"
-msgstr ""
+msgstr "Vadovėlio informacija"
 
 #: cms/templates/js/edit-textbook.underscore
 msgid "Textbook Name"
-msgstr ""
+msgstr "Vadovėlio pavadinimas"
 
 #: cms/templates/js/edit-textbook.underscore
 msgid "Introduction to Cookie Baking"
-msgstr ""
+msgstr "Sausainių kepimo įvadas"
 
 #: cms/templates/js/edit-textbook.underscore
 msgid ""
@@ -4376,7 +4295,7 @@ msgstr ""
 #: cms/templates/js/group-configuration-details.underscore
 #: cms/templates/js/group-configuration-edit.underscore
 msgid "Cannot delete when in use by an experiment"
-msgstr ""
+msgstr "Negalima pašalinti, kai naudojama bandyme"
 
 #: cms/templates/js/group-configuration-details.underscore
 msgid "This Group Configuration is used in:"
@@ -4440,7 +4359,7 @@ msgstr ""
 
 #: cms/templates/js/group-edit.underscore
 msgid "delete group"
-msgstr ""
+msgstr "pašalinti grupę"
 
 #: cms/templates/js/metadata-dict-entry.underscore
 #: cms/templates/js/metadata-list-entry.underscore
@@ -4479,7 +4398,7 @@ msgstr ""
 
 #: cms/templates/js/no-textbooks.underscore
 msgid "Add your first textbook"
-msgstr ""
+msgstr "Pridėkite savo pirmą vadovėlį"
 
 #: cms/templates/js/paging-footer.underscore
 #: cms/templates/js/paging-header.underscore
@@ -4594,6 +4513,9 @@ msgid ""
 "If the unit was previously published and released to students, any changes "
 "you made to the unit when it was hidden will now be visible to students."
 msgstr ""
+"Jeigu skyrius buvo paskelbtas ir leistas rodyti kurso dalyviams, visi "
+"pakeitimai, kuriuos padarėte skyriuje, kai jis buvo paslėptas, dabar bus "
+"matomi kurso dalyviams."
 
 #: cms/templates/js/staff-lock-editor.underscore
 msgid ""
@@ -4601,18 +4523,24 @@ msgid ""
 "to see its content after the release date has passed and you have published "
 "the unit(s)."
 msgstr ""
+"Jeigu šį %(xblockType)s padarysite matomą kurso dalyviams, kurso dalyviai "
+"matys jo turinį praėjus išleidimo datai ir jums paskelbus skyrių (-ius)."
 
 #: cms/templates/js/staff-lock-editor.underscore
 msgid ""
 "Any subsections or units that are explicitly hidden from students will "
 "remain hidden after you clear this option for the section."
 msgstr ""
+"Potemės ir skyriai, kurie yra paslėpti nuo kurso dalyvių, liks paslėpti jums"
+" panaikinus šią temos parinktį."
 
 #: cms/templates/js/staff-lock-editor.underscore
 msgid ""
 "Any units that are explicitly hidden from students will remain hidden after "
 "you clear this option for the subsection."
 msgstr ""
+"Skyriai, kurie yra paslėpti nuo kurso dalyvių, liks paslėpti jums panaikinus"
+" šią potemės parinktį."
 
 #: cms/templates/js/upload-dialog.underscore
 msgid "File upload succeeded"
@@ -4653,13 +4581,15 @@ msgstr ""
 
 #: cms/templates/js/mock/mock-container-page.underscore
 msgid "Unit Location"
-msgstr ""
+msgstr "Skyriaus vieta"
 
 #: cms/templates/js/mock/mock-container-page.underscore
 msgid ""
 "Use this ID when you create links to this unit from other course content. "
 "You enter the ID in the URL field."
 msgstr ""
+"Pasinaudokite šiuo identifikatoriumi kurdami nuorodas į šį skyrių iš kito "
+"kurso turinio. Identifikatorių įvedate į URL nuorodos lauką."
 
 #: cms/templates/js/mock/mock-group-configuration-page.underscore
 msgid "Group Configurations"
@@ -4673,6 +4603,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/ml/LC_MESSAGES/django.mo b/conf/locale/ml/LC_MESSAGES/django.mo
index 36ffdf8826..f891c466e1 100644
Binary files a/conf/locale/ml/LC_MESSAGES/django.mo and b/conf/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ml/LC_MESSAGES/django.po b/conf/locale/ml/LC_MESSAGES/django.po
index 30d93ad7b7..050ec863eb 100644
--- a/conf/locale/ml/LC_MESSAGES/django.po
+++ b/conf/locale/ml/LC_MESSAGES/django.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-08-23 21:10+0000\n"
 "Last-Translator: karthikkn\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/edx-platform/language/ml/)\n"
@@ -105,14 +105,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -204,6 +196,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2212,6 +2205,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2570,23 +2604,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2948,9 +2965,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4116,6 +4134,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5017,15 +5039,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5033,37 +5067,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5304,17 +5326,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5324,7 +5346,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5338,8 +5360,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6525,15 +6547,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6570,7 +6592,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6988,11 +7010,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7153,6 +7170,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7455,6 +7473,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8463,11 +8486,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8480,6 +8498,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9331,9 +9354,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9421,7 +9441,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11219,18 +11238,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12567,6 +12574,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12622,19 +12672,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12642,15 +12692,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14173,6 +14223,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14185,6 +14244,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14243,10 +14307,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14261,6 +14326,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/ml/LC_MESSAGES/djangojs.mo b/conf/locale/ml/LC_MESSAGES/djangojs.mo
index ac35b75fa7..cfe3cdf374 100644
Binary files a/conf/locale/ml/LC_MESSAGES/djangojs.mo and b/conf/locale/ml/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ml/LC_MESSAGES/djangojs.po b/conf/locale/ml/LC_MESSAGES/djangojs.po
index 697a7a5606..2869598592 100644
--- a/conf/locale/ml/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ml/LC_MESSAGES/djangojs.po
@@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/edx-platform/language/ml/)\n"
@@ -63,8 +63,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2145,153 +2143,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2950,6 +2801,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3259,10 +3114,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3365,6 +3216,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3649,6 +3504,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4591,6 +4460,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/mn/LC_MESSAGES/django.mo b/conf/locale/mn/LC_MESSAGES/django.mo
index a7ef82b164..fb32dde31e 100644
Binary files a/conf/locale/mn/LC_MESSAGES/django.mo and b/conf/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/mn/LC_MESSAGES/django.po b/conf/locale/mn/LC_MESSAGES/django.po
index 39204c6e12..5a57bb824d 100644
--- a/conf/locale/mn/LC_MESSAGES/django.po
+++ b/conf/locale/mn/LC_MESSAGES/django.po
@@ -17,6 +17,7 @@
 # This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
 # 
 # Translators:
+# Munkhtsetseg <moogmonkhoo_n@yahoo.com>, 2014
 # #-#-#-#-#  mako-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file
 # Copyright (C) 2014 edX
@@ -43,7 +44,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-08-14 21:21+0000\n"
 "Last-Translator: zolboo0411 <zolboo0411@yahoo.com>\n"
 "Language-Team: Mongolian (http://www.transifex.com/projects/p/edx-platform/language/mn/)\n"
@@ -109,14 +110,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -208,6 +201,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2216,6 +2210,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2574,23 +2609,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2952,9 +2970,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4120,6 +4139,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5021,15 +5044,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5037,37 +5072,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5308,17 +5331,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5328,7 +5351,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5342,8 +5365,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6529,15 +6552,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6574,7 +6597,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6992,11 +7015,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7157,6 +7175,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7459,6 +7478,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8467,11 +8491,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8484,6 +8503,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9335,9 +9359,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9425,7 +9446,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11223,18 +11243,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12571,6 +12579,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12626,19 +12677,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12646,15 +12697,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14177,6 +14228,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14189,6 +14249,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14247,10 +14312,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14265,6 +14331,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/mn/LC_MESSAGES/djangojs.mo b/conf/locale/mn/LC_MESSAGES/djangojs.mo
index 7fa7f7a97c..9cdf72ae16 100644
Binary files a/conf/locale/mn/LC_MESSAGES/djangojs.mo and b/conf/locale/mn/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/mn/LC_MESSAGES/djangojs.po b/conf/locale/mn/LC_MESSAGES/djangojs.po
index fdcbab2c37..f440624cfa 100644
--- a/conf/locale/mn/LC_MESSAGES/djangojs.po
+++ b/conf/locale/mn/LC_MESSAGES/djangojs.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Mongolian (http://www.transifex.com/projects/p/edx-platform/language/mn/)\n"
@@ -64,8 +64,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2146,153 +2144,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2951,6 +2802,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3260,10 +3115,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3366,6 +3217,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3650,6 +3505,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4592,6 +4461,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/mr/LC_MESSAGES/django.mo b/conf/locale/mr/LC_MESSAGES/django.mo
index 41a8e8abac..12ccbd3e09 100644
Binary files a/conf/locale/mr/LC_MESSAGES/django.mo and b/conf/locale/mr/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/mr/LC_MESSAGES/django.po b/conf/locale/mr/LC_MESSAGES/django.po
index c230818d7b..663e208453 100644
--- a/conf/locale/mr/LC_MESSAGES/django.po
+++ b/conf/locale/mr/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-06 03:04+0000\n"
 "Last-Translator: \n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/edx-platform/language/mr/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/mr/LC_MESSAGES/djangojs.mo b/conf/locale/mr/LC_MESSAGES/djangojs.mo
index 2f19b2959a..a9a8691e98 100644
Binary files a/conf/locale/mr/LC_MESSAGES/djangojs.mo and b/conf/locale/mr/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/mr/LC_MESSAGES/djangojs.po b/conf/locale/mr/LC_MESSAGES/djangojs.po
index b3e49ce794..9818bebf35 100644
--- a/conf/locale/mr/LC_MESSAGES/djangojs.po
+++ b/conf/locale/mr/LC_MESSAGES/djangojs.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/edx-platform/language/mr/)\n"
@@ -60,8 +60,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2142,153 +2140,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2947,6 +2798,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3256,10 +3111,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3362,6 +3213,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3646,6 +3501,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4588,6 +4457,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/ms/LC_MESSAGES/django.mo b/conf/locale/ms/LC_MESSAGES/django.mo
index fdb68cc44c..00d79e183c 100644
Binary files a/conf/locale/ms/LC_MESSAGES/django.mo and b/conf/locale/ms/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ms/LC_MESSAGES/django.po b/conf/locale/ms/LC_MESSAGES/django.po
index 15a9f83ebc..8fc40eee8b 100644
--- a/conf/locale/ms/LC_MESSAGES/django.po
+++ b/conf/locale/ms/LC_MESSAGES/django.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-03-18 18:07+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Malay (http://www.transifex.com/projects/p/edx-platform/language/ms/)\n"
@@ -105,14 +105,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -204,6 +196,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2210,6 +2203,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2568,23 +2602,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2946,9 +2963,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4114,6 +4132,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5013,15 +5035,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5029,37 +5063,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5300,17 +5322,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5320,7 +5342,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5334,8 +5356,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6521,15 +6543,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6566,7 +6588,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6984,11 +7006,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7149,6 +7166,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7451,6 +7469,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8457,11 +8480,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8474,6 +8492,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9325,9 +9348,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9415,7 +9435,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11211,18 +11230,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12559,6 +12566,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12614,19 +12664,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12634,15 +12684,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14165,6 +14215,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14177,6 +14236,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14235,10 +14299,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14253,6 +14318,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/ms/LC_MESSAGES/djangojs.mo b/conf/locale/ms/LC_MESSAGES/djangojs.mo
index 5681c0662c..4f30a448b0 100644
Binary files a/conf/locale/ms/LC_MESSAGES/djangojs.mo and b/conf/locale/ms/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ms/LC_MESSAGES/djangojs.po b/conf/locale/ms/LC_MESSAGES/djangojs.po
index 35c9a2d4c2..e9bc78c064 100644
--- a/conf/locale/ms/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ms/LC_MESSAGES/djangojs.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Malay (http://www.transifex.com/projects/p/edx-platform/language/ms/)\n"
@@ -62,8 +62,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2125,152 +2123,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2929,6 +2781,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3231,10 +3087,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3337,6 +3189,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3619,6 +3475,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4560,6 +4430,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/nb/LC_MESSAGES/django.mo b/conf/locale/nb/LC_MESSAGES/django.mo
index a3080e227b..457642c140 100644
Binary files a/conf/locale/nb/LC_MESSAGES/django.mo and b/conf/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/nb/LC_MESSAGES/django.po b/conf/locale/nb/LC_MESSAGES/django.po
index ae0a4bf7d5..efb2fb6967 100644
--- a/conf/locale/nb/LC_MESSAGES/django.po
+++ b/conf/locale/nb/LC_MESSAGES/django.po
@@ -49,6 +49,7 @@
 # Alexander Lundervold <alexander.lundervold@gmail.com>, 2014
 # Anne, 2014
 # Espen Bye <espenbye@me.com>, 2014
+# Frode Arntsen <frode.arntsen@bibsys.no>, 2014
 # mymark <mark.stenersen@uit.no>, 2014
 # Pål Messenlien <paal@vangenplotz.no>, 2014
 # Pål Messenlien <paal@vangenplotz.no>, 2014
@@ -73,8 +74,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Pål Messenlien <paal@vangenplotz.no>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/edx-platform/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -111,13 +112,10 @@ msgstr "Problem"
 msgid "Advanced"
 msgstr ""
 
-#: cms/djangoapps/contentstore/views/helpers.py
-#: lms/djangoapps/class_dashboard/dashboard_data.py
-#: lms/djangoapps/class_dashboard/dashboard_data.py
 #: cms/templates/course_outline.html
 #: lms/templates/instructor/instructor_dashboard_2/metrics.html
 msgid "Section"
-msgstr ""
+msgstr "Seksjon:"
 
 #: cms/djangoapps/contentstore/views/helpers.py
 #: lms/djangoapps/class_dashboard/dashboard_data.py
@@ -133,14 +131,6 @@ msgstr "Del"
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "Kursbevis"
@@ -233,6 +223,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "Ingen"
 
@@ -2258,6 +2249,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "Om"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "Generelt"
@@ -2616,18 +2647,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "Feil"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2988,9 +3007,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -3801,6 +3821,8 @@ msgid "Loaded course {course_name}<br/>Errors:"
 msgstr ""
 
 #: lms/djangoapps/dashboard/sysadmin.py lms/djangoapps/dashboard/sysadmin.py
+#: cms/templates/course-create-rerun.html cms/templates/index.html
+#: lms/templates/shoppingcart/receipt.html
 msgid "Course Name"
 msgstr "Kursnavn"
 
@@ -4165,6 +4187,10 @@ msgstr "Datanedlasting"
 msgid "Analytics"
 msgstr "Analytics"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5095,87 +5121,54 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
+
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Beklager! Vår betalingsløsning aksepterte ikke din betaling.\n"
-"            Forklaringen er angitt som <span class=\"decision\">{decision}</span>,\n"
-"            og årsaken var <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            Du er ikke belastet. Vennligst forsøk igjen med en annen betalingsform.\n"
-"            Kontakt oss for betalingsreklaterte spørsmål på {email}.\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
+msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -5483,17 +5476,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5503,7 +5496,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5517,8 +5510,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6687,7 +6680,7 @@ msgstr "Kursnummer:"
 #: lms/templates/dashboard/_dashboard_status_verification.html
 #: lms/templates/verify_student/midcourse_reverify_dash.html
 msgid "Pending"
-msgstr ""
+msgstr "Venter"
 
 #: cms/templates/login.html cms/templates/register.html
 #: lms/templates/help_modal.html lms/templates/login.html
@@ -6719,12 +6712,12 @@ msgstr "Passord"
 #: cms/templates/manage_users.html
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: cms/templates/manage_users.html
 #: lms/templates/discussion/_underscore_templates.html
 msgid "Staff"
-msgstr ""
+msgstr "Personell"
 
 #: cms/templates/register.html cms/templates/widgets/header.html
 #: lms/templates/index.html
@@ -6735,12 +6728,12 @@ msgstr ""
 #: lms/templates/register.html lms/templates/signup_modal.html
 #: lms/templates/signup_modal.html
 msgid "Public Username"
-msgstr ""
+msgstr "Offentlig brukernavn"
 
 #: cms/templates/register.html
 #: lms/templates/dashboard/_dashboard_info_language.html
 msgid "Preferred Language"
-msgstr ""
+msgstr "Foretrukket språk"
 
 #. Translators: this is a verb describing the action of viewing more details
 #: cms/templates/studio_xblock_wrapper.html
@@ -6783,15 +6776,15 @@ msgid "Help"
 msgstr "Hjelp"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6828,7 +6821,7 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7254,11 +7247,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "Om"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7419,6 +7407,7 @@ msgstr "Ta med feilmeldinger, skritt som førte til problemet, osv."
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "Lever"
 
@@ -7723,6 +7712,11 @@ msgstr "Rådata:"
 msgid "Accepted"
 msgstr "Akseptert"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "Feil"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "Avvist"
@@ -8733,11 +8727,6 @@ msgstr "Se kursinnhold"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "Kurset er fullt"
@@ -8750,6 +8739,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9603,9 +9597,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9693,7 +9684,6 @@ msgstr "Vis arkivert kurs"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "Se kurset"
 
@@ -11491,18 +11481,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12842,6 +12820,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12897,19 +12918,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12917,15 +12938,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -13780,12 +13801,16 @@ msgid ""
 "An error occurred in Studio and the page could not be loaded. Please try "
 "again in a few moments."
 msgstr ""
+"En feil oppsto i Studio og siden kunne ikke vises. Vennligst prøv igjen litt"
+" senere."
 
 #: cms/templates/500.html
 msgid ""
 "We've logged the error and our staff is currently working to resolve this "
 "error as soon as possible."
 msgstr ""
+"Vi har logget en feil og vårt personell arbeider med å finne feilen så raskt"
+" som mulig."
 
 #: cms/templates/500.html
 msgid "If the problem persists, please email us at {email_link}."
@@ -13830,12 +13855,16 @@ msgid ""
 "the URL you went to was correct &mdash; e-mail programs will sometimes split"
 " it into two lines."
 msgstr ""
+"Beklager, aktivering var ikke mulig. Sjekk om URLen du gikk til var riktig "
+"&mdash; noen epost program kan dele linker over to linjer."
 
 #: cms/templates/activation_invalid.html
 msgid ""
 "If you still have issues, contact edX Support. In the meatime, you can also "
 "return to"
 msgstr ""
+"Om du fortsatt har problemer, kontakt edX support. I mellomtiden kan du gå "
+"tilbake til"
 
 #: cms/templates/activation_invalid.html
 msgid "Contact edX Support"
@@ -14448,6 +14477,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14460,6 +14498,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14518,10 +14561,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14536,6 +14580,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/nb/LC_MESSAGES/djangojs.mo b/conf/locale/nb/LC_MESSAGES/djangojs.mo
index 39ce875280..7685558fde 100644
Binary files a/conf/locale/nb/LC_MESSAGES/djangojs.mo and b/conf/locale/nb/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/nb/LC_MESSAGES/djangojs.po b/conf/locale/nb/LC_MESSAGES/djangojs.po
index 1c9c7ed9f9..8660b1ade0 100644
--- a/conf/locale/nb/LC_MESSAGES/djangojs.po
+++ b/conf/locale/nb/LC_MESSAGES/djangojs.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/edx-platform/language/nb/)\n"
@@ -71,8 +71,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2123,155 +2121,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "Tilgjengelig %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"Du har endringer som ikke er lagret i flere redigerbare felter. Dersom du "
-"setter i gang en prosess, vil de endringene som ikke er lagret gå tapt."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2930,6 +2779,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3241,10 +3094,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3349,6 +3198,10 @@ msgstr ""
 msgid "or"
 msgstr "eller"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "Kurset må ha en gitt startdato."
@@ -3636,6 +3489,20 @@ msgstr "Innstillinger"
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4586,6 +4453,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr "Legg til URLer for ytterligere versjoner"
diff --git a/conf/locale/ne/LC_MESSAGES/django.mo b/conf/locale/ne/LC_MESSAGES/django.mo
index fe260fc116..bcb4e7db2f 100644
Binary files a/conf/locale/ne/LC_MESSAGES/django.mo and b/conf/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ne/LC_MESSAGES/django.po b/conf/locale/ne/LC_MESSAGES/django.po
index 8e3f5e6011..5a3f4b58b6 100644
--- a/conf/locale/ne/LC_MESSAGES/django.po
+++ b/conf/locale/ne/LC_MESSAGES/django.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-03-12 12:54+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/edx-platform/language/ne/)\n"
@@ -105,14 +105,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -204,6 +196,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2212,6 +2205,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2570,23 +2604,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2948,9 +2965,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4116,6 +4134,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5017,15 +5039,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5033,37 +5067,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5304,17 +5326,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5324,7 +5346,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5338,8 +5360,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6525,15 +6547,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6570,7 +6592,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6988,11 +7010,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7153,6 +7170,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7455,6 +7473,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8463,11 +8486,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8480,6 +8498,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9331,9 +9354,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9421,7 +9441,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11219,18 +11238,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12567,6 +12574,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12622,19 +12672,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12642,15 +12692,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14173,6 +14223,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14185,6 +14244,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14243,10 +14307,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14261,6 +14326,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/ne/LC_MESSAGES/djangojs.mo b/conf/locale/ne/LC_MESSAGES/djangojs.mo
index 09e80c4f22..9fef0dbe7c 100644
Binary files a/conf/locale/ne/LC_MESSAGES/djangojs.mo and b/conf/locale/ne/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ne/LC_MESSAGES/djangojs.po b/conf/locale/ne/LC_MESSAGES/djangojs.po
index 692a5078b8..f462699b0c 100644
--- a/conf/locale/ne/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ne/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/edx-platform/language/ne/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/nl_NL/LC_MESSAGES/django.mo b/conf/locale/nl_NL/LC_MESSAGES/django.mo
index 8f18f17e83..a9b56de9eb 100644
Binary files a/conf/locale/nl_NL/LC_MESSAGES/django.mo and b/conf/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/nl_NL/LC_MESSAGES/django.po b/conf/locale/nl_NL/LC_MESSAGES/django.po
index fcbafcaa20..4fdeafc641 100644
--- a/conf/locale/nl_NL/LC_MESSAGES/django.po
+++ b/conf/locale/nl_NL/LC_MESSAGES/django.po
@@ -7,6 +7,7 @@
 # Anne <a.vangulick@hotmail.com>, 2014
 # Anton Vanhoucke <anton@fabrique.nl>, 2013
 # Anton Vanhoucke <anton@fabrique.nl>, 2013
+# devette <herman@de-vette.nl>, 2014
 # GlassParade <i.kazija@penta.nl>, 2014
 # #-#-#-#-#  django-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file.
@@ -25,7 +26,9 @@
 # Translators:
 # Anne <a.vangulick@hotmail.com>, 2014
 # HanMi, 2014
+# devette <herman@de-vette.nl>, 2014
 # GlassParade <i.kazija@penta.nl>, 2014
+# Marvin <marvin.binneveld@fxmedia.nl>, 2014
 # #-#-#-#-#  mako-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file
 # Copyright (C) 2014 edX
@@ -50,13 +53,14 @@
 # GlassParade <i.kazija@penta.nl>, 2014
 # Kaj Huisman <kaj.huisman@gmail.com>, 2014
 # marlasinger1470 <marcellaemmaneel@gmail.com>, 2014
+# Marvin <marvin.binneveld@fxmedia.nl>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
-"Last-Translator: HanMi\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-11-06 10:56+0000\n"
+"Last-Translator: Marvin <marvin.binneveld@fxmedia.nl>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/edx-platform/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -120,14 +124,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -219,6 +215,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "Geen"
 
@@ -2232,6 +2229,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "Over"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2590,23 +2627,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2968,9 +2988,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4132,6 +4153,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5033,15 +5058,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5049,37 +5086,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5320,17 +5345,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5340,7 +5365,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5354,8 +5379,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6538,15 +6563,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6583,7 +6608,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7001,11 +7026,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "Over"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7166,6 +7186,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7468,6 +7489,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8476,11 +8502,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8493,6 +8514,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9344,9 +9370,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9434,7 +9457,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11231,18 +11253,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12586,6 +12596,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12641,19 +12694,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12661,15 +12714,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14192,6 +14245,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14204,6 +14266,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14262,10 +14329,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14280,6 +14348,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/nl_NL/LC_MESSAGES/djangojs.mo b/conf/locale/nl_NL/LC_MESSAGES/djangojs.mo
index 72628d6552..0e6cce3959 100644
Binary files a/conf/locale/nl_NL/LC_MESSAGES/djangojs.mo and b/conf/locale/nl_NL/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/nl_NL/LC_MESSAGES/djangojs.po b/conf/locale/nl_NL/LC_MESSAGES/djangojs.po
index 633b3f3d06..289c71254c 100644
--- a/conf/locale/nl_NL/LC_MESSAGES/djangojs.po
+++ b/conf/locale/nl_NL/LC_MESSAGES/djangojs.po
@@ -35,8 +35,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
-"PO-Revision-Date: 2014-10-24 18:11+0000\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
+"PO-Revision-Date: 2014-11-06 10:57+0000\n"
 "Last-Translator: Anne <a.vangulick@hotmail.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/edx-platform/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"
@@ -68,8 +68,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2148,153 +2146,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "Beschikbaar %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Verberg"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Nu"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Klok"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Kies een tijd"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Middernacht"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Vandaag"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Kalender"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Gisteren"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Morgen"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2953,6 +2804,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3262,10 +3117,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3368,6 +3219,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3652,6 +3507,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4594,6 +4463,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/or/LC_MESSAGES/django.mo b/conf/locale/or/LC_MESSAGES/django.mo
index db5ede232a..cff4cb86c4 100644
Binary files a/conf/locale/or/LC_MESSAGES/django.mo and b/conf/locale/or/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/or/LC_MESSAGES/django.po b/conf/locale/or/LC_MESSAGES/django.po
index 9a3fabdd9b..4b1009c51e 100644
--- a/conf/locale/or/LC_MESSAGES/django.po
+++ b/conf/locale/or/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-05-19 19:18+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/edx-platform/language/or/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/or/LC_MESSAGES/djangojs.mo b/conf/locale/or/LC_MESSAGES/djangojs.mo
index 08aa03a72e..677602c57e 100644
Binary files a/conf/locale/or/LC_MESSAGES/djangojs.mo and b/conf/locale/or/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/or/LC_MESSAGES/djangojs.po b/conf/locale/or/LC_MESSAGES/djangojs.po
index 9cd09f7f25..da77506e7d 100644
--- a/conf/locale/or/LC_MESSAGES/djangojs.po
+++ b/conf/locale/or/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/edx-platform/language/or/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/pl/LC_MESSAGES/django.mo b/conf/locale/pl/LC_MESSAGES/django.mo
index 44fecc903d..50c9c823e0 100644
Binary files a/conf/locale/pl/LC_MESSAGES/django.mo and b/conf/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/pl/LC_MESSAGES/django.po b/conf/locale/pl/LC_MESSAGES/django.po
index ca9ff823b4..ba182a153d 100644
--- a/conf/locale/pl/LC_MESSAGES/django.po
+++ b/conf/locale/pl/LC_MESSAGES/django.po
@@ -23,6 +23,7 @@
 # This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
 # 
 # Translators:
+# Fundacja_Eduprojekt.org <maciej@eduprojekt.org>, 2014
 # Jaroslaw Lukawski <sekretariat@kmti.uz.zgora.pl>, 2014
 # Mateusz <blue90pl@gmail.com>, 2014
 # Sebastian <foobarbaz@gazeta.pl>, 2014
@@ -35,6 +36,7 @@
 # Translators:
 # rodzajowo <a.dubrawska@gmail.com>, 2014
 # Fundacja_Eduprojekt.org <maciej@eduprojekt.org>, 2014
+# Grzegorz <john.doe.gg@gmail.com>, 2014
 # Jaroslaw Lukawski <sekretariat@kmti.uz.zgora.pl>, 2014
 # Jaroslaw Lukawski <sekretariat@kmti.uz.zgora.pl>, 2014
 # Lazarus Zamenhof <inactive+lazarus_zamenhof@transifex.com>, 2014
@@ -53,6 +55,8 @@
 # This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
 # 
 # Translators:
+# Adam Banasiak <elserwis@gmail.com>, 2014
+# Grzegorz <john.doe.gg@gmail.com>, 2014
 # Jaroslaw Lukawski <sekretariat@kmti.uz.zgora.pl>, 2014
 # Jaroslaw Lukawski <sekretariat@kmti.uz.zgora.pl>, 2014
 # Mateusz <blue90pl@gmail.com>, 2014
@@ -73,6 +77,7 @@
 # 
 # Translators:
 # ecz1992, 2014
+# Fundacja_Eduprojekt.org <maciej@eduprojekt.org>, 2014
 # Jakub Kopczyk <kuba5566@gmail.com>, 2014
 # Jaroslaw Lukawski <sekretariat@kmti.uz.zgora.pl>, 2014
 # mateusz2238 <mateusz2238@outlook.com>, 2014
@@ -84,9 +89,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-10-19 20:30+0000\n"
-"Last-Translator: Jakub Kopczyk <kuba5566@gmail.com>\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-29 18:40+0000\n"
+"Last-Translator: Fundacja_Eduprojekt.org <maciej@eduprojekt.org>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/edx-platform/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -150,14 +155,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -249,6 +246,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2259,6 +2257,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2617,23 +2656,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2995,9 +3017,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4163,6 +4186,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5066,15 +5093,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5082,37 +5121,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5353,17 +5380,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5373,7 +5400,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5387,8 +5414,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6571,15 +6598,15 @@ msgid "Help"
 msgstr "Pomoc"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6616,7 +6643,7 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7034,11 +7061,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7199,6 +7221,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7501,6 +7524,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8511,11 +8539,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8528,6 +8551,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9379,9 +9407,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9469,7 +9494,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11269,18 +11293,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12617,6 +12629,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12672,19 +12727,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12692,15 +12747,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14223,6 +14278,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14235,6 +14299,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14293,10 +14362,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14311,6 +14381,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/pl/LC_MESSAGES/djangojs.mo b/conf/locale/pl/LC_MESSAGES/djangojs.mo
index db906bf244..84d6b31312 100644
Binary files a/conf/locale/pl/LC_MESSAGES/djangojs.mo and b/conf/locale/pl/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/pl/LC_MESSAGES/djangojs.po b/conf/locale/pl/LC_MESSAGES/djangojs.po
index d7bdf0e494..226c741a56 100644
--- a/conf/locale/pl/LC_MESSAGES/djangojs.po
+++ b/conf/locale/pl/LC_MESSAGES/djangojs.po
@@ -6,6 +6,7 @@
 # Translators:
 # Adam Łukasiak <adamus160@gmail.com>, 2014
 # Fundacja_Eduprojekt.org <maciej@eduprojekt.org>, 2014
+# Grzegorz <john.doe.gg@gmail.com>, 2014
 # Jakub Kopczyk <kuba5566@gmail.com>, 2014
 # Jaroslaw Lukawski <sekretariat@kmti.uz.zgora.pl>, 2014
 # Jaroslaw Lukawski <sekretariat@kmti.uz.zgora.pl>, 2014
@@ -20,6 +21,7 @@
 # This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
 # 
 # Translators:
+# Fundacja_Eduprojekt.org <maciej@eduprojekt.org>, 2014
 # kuba11p <jakubsw.p@gmail.com>, 2014
 # Jaroslaw Lukawski <sekretariat@kmti.uz.zgora.pl>, 2014
 # Jaroslaw Lukawski <sekretariat@kmti.uz.zgora.pl>, 2014
@@ -48,8 +50,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
-"PO-Revision-Date: 2014-10-26 13:31+0000\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
+"PO-Revision-Date: 2014-10-29 18:21+0000\n"
 "Last-Translator: Jakub Kopczyk <kuba5566@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/edx-platform/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -81,8 +83,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2182,155 +2182,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Styczeń|Luty|Marzec|Kwiecień|Maj|Czerwiec|Lipiec|Sierpień|Wrzesień|Październik|Listopad|Grudzień"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Pokaż"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Ukryj"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Niedziela|Poniedziałek|Wtorek|Środa|Czwartek|Piątek|Sobota"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Wczoraj"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Jutro"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2989,6 +2840,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3305,10 +3160,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3411,6 +3262,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3697,6 +3552,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4640,6 +4509,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/pt_BR/LC_MESSAGES/django.mo b/conf/locale/pt_BR/LC_MESSAGES/django.mo
index bf02227011..daf5efcb87 100644
Binary files a/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/conf/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/pt_BR/LC_MESSAGES/django.po b/conf/locale/pt_BR/LC_MESSAGES/django.po
index ce5994588f..610e8b3635 100644
--- a/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@
 # Álex Filipe <alexfilipe@outlook.com>, 2014
 # brk0_0, 2013
 # brunojm <brunojm@gmail.com>, 2014
-# edgarapmelo <edgarapmelo@gmail.com>, 2014
+# Edgar Aparecido Pereira de Melo <edgarapmelo@gmail.com>, 2014
 # Filipe Oliveira <contato@fmoliveira.com.br>, 2013
 # Francisco Cantarutti <francisco.cantarutti@sisqualis.com.br>, 2014
 # G.Ribas <gabriel.ribas1@hotmail.com>, 2014
@@ -47,7 +47,7 @@
 # Translators:
 # Álex Filipe <alexfilipe@outlook.com>, 2014
 # brk0_0, 2013
-# edgarapmelo <edgarapmelo@gmail.com>, 2014
+# Edgar Aparecido Pereira de Melo <edgarapmelo@gmail.com>, 2014
 # aivuk <e@vaz.io>, 2014
 # Filipe Oliveira <contato@fmoliveira.com.br>, 2013
 # Kayo Leone Dias Perim <kayo_2008_@hotmail.com>, 2014
@@ -74,11 +74,12 @@
 # brk0_0, 2013
 # brunojm <brunojm@gmail.com>, 2013
 # brunojm <brunojm@gmail.com>, 2013-2014
-# edgarapmelo <edgarapmelo@gmail.com>, 2014
+# Edgar Aparecido Pereira de Melo <edgarapmelo@gmail.com>, 2014
 # Everton Zanella Alvarenga <everton.alvarenga@okfn.org>, 2014
 # Filipe Oliveira <contato@fmoliveira.com.br>, 2013
 # Francisco Cantarutti <francisco.cantarutti@sisqualis.com.br>, 2014
 # G.Ribas <gabriel.ribas1@hotmail.com>, 2014
+# Gilson Leite Siqueira Junior <shaveslavers@gmail.com>, 2014
 # Gislene Kucker Arantes <gislene.trad@gmail.com>, 2014
 # javiercencig <javier@jecnet.com.br>, 2014
 # Kayo Leone Dias Perim <kayo_2008_@hotmail.com>, 2014
@@ -97,6 +98,7 @@
 # niels006 <niels006@gmail.com>, 2014
 # niels006 <niels006@gmail.com>, 2014
 # Paulo Castro, 2013
+# Pedro Guimarães Martins <pedrogmartins7@gmail.com>, 2014
 # Raphael Mendonça, 2014
 # Renata Barboza-Murray, 2013-2014
 # Ricardo Pietrobon <pietr007@gmail.com>, 2013-2014
@@ -117,6 +119,7 @@
 # brk0_0, 2013
 # brunojm <brunojm@gmail.com>, 2013
 # Daniel Linhares <danielinhares@gmail.com>, 2014
+# Fernando Ursine Braga Silva <fernando_ursine@yahoo.com>, 2014
 # Filipe Oliveira <contato@fmoliveira.com.br>, 2013
 # Francisco Cantarutti <francisco.cantarutti@sisqualis.com.br>, 2014
 # Kayo Leone Dias Perim <kayo_2008_@hotmail.com>, 2014
@@ -130,6 +133,7 @@
 # Marcos João Alves <noidmvp@gmail.com>, 2014
 # Marco Túlio Pires <mtrpires@outlook.com>, 2014
 # Mariana Baroni <maribaroni@gmail.com>, 2014
+# Mariana Moretti <mamoretti@gmail.com>, 2014
 # marianemurakami <mhmurakami@gmail.com>, 2014
 # niels006 <niels006@gmail.com>, 2014
 # niels006 <niels006@gmail.com>, 2014
@@ -162,8 +166,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: javiercencig <javier@jecnet.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/edx-platform/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -224,14 +228,6 @@ msgstr "Unidade"
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "Certificado do Código de Honra"
@@ -324,6 +320,7 @@ msgstr "Escola primária"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "Nenhum"
 
@@ -2458,6 +2455,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "Sobre"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "Geral"
@@ -2875,23 +2912,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr "Aviso"
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "Erro"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr "Não selecionado"
@@ -3269,9 +3289,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4550,6 +4571,10 @@ msgstr "Download de dados"
 msgid "Analytics"
 msgstr "Estatísticas"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
 msgstr "Indicadores"
@@ -5545,82 +5570,54 @@ msgstr ""
 "O valor cobrado pelo processador {0} {1} é diferente do custo total do "
 "pedido {2} {3}."
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\"> \n"
-"Desculpe, mas o nosso processador de pagamentos não aceitou o seu pagamento.\n"
-"A decisão informada foi <span class=\"decision\">{decision}</span>,\n"
-"e a razão, <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"O valor não foi cobrado. Por favor, tente uma forma diferente de pagamento.\n"
-"Para perguntas sobre o pagamento, entre em contato conosco no endereço {email}.\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"Desculpe, mas o nosso processador de pagamentos retornou uma mensagem contendo dados inconsistentes.\n"
-"Lamentamos, mas não foi possível verificar se a cobrança foi aprovada e, portanto, não podemos processar o seu pedido.\n"
-"A mensagem de erro específico foi: <span class=\"exception_msg\"> {msg} </span>.\n"
-"O seu cartão de crédito pode ter sido cobrado, mas não temos como verificar se isto realmente aconteceu. Por favor, entre em contato conosco para tratar de questões específicas relacionadas ao pagamento escrevendo para {email}.\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"Desculpe, mas devido a um erro, a sua compra foi cobrada com um valor diferente do total do pedido.\n"
-"A mensagem de erro específica foi: <span class=\"exception_msg\">{msg} </span>.\n"
-"Este valor provavelmente foi cobrado do seu cartão de crédito. Por favor, entre em contato conosco para tratar de questões específicas relacionadas ao pagamento escrevendo para {email}.\n"
-"</p>"
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"Desculpe, mas o nosso processador de pagamentos nos enviou uma mensagem dizendo que as informações enviadas não são consistentes.\n"
-"Portanto não podemos verificar se a cobrança foi ou não feita e portanto não podemos completar a sua compra.\n"
-"A mensagem de erro específica é: <span class=\"exception_msg\"> {msg}</span>.\n"
-"Seu cartão de crédito pode ter sido cobrado mas não temos como verificar se isso foi ou não o caso. Por favor nos contate com perguntas específicas sobre pagamento usando {email}.\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -5918,17 +5915,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5938,7 +5935,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5952,8 +5949,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -7228,16 +7225,16 @@ msgid "Help"
 msgstr "Ajuda"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
-msgstr "Atualize a sua inscrição para {} | Escolha o seu caminho"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "Registre-se {} | Escolha o curso"
+msgid "Enroll In {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr "Desculpe, ocorreu um erro durante o seu registro"
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -7273,8 +7270,8 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
-msgstr "Atualize a sua inscrição"
+msgid "Upgrade Your Enrollment"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Audit This Course"
@@ -7719,11 +7716,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "Sobre"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7897,6 +7889,7 @@ msgstr "Inclua mensagens de erro, passos que levaram ao problema, etc. "
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "Enviar"
 
@@ -8227,6 +8220,11 @@ msgstr "Dados brutos:"
 msgid "Accepted"
 msgstr "Aceito"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "Erro"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "Recusado"
@@ -9299,13 +9297,6 @@ msgstr "Visualizar material didático"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "Este curso está no seu <a href=\"{cart_link}\">carrinho</a>."
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"Adicionar {course.display_number_with_default} ao carrinho "
-"({currency_symbol}{cost})"
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "Não há mais vagas"
@@ -9318,6 +9309,13 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"Adicionar {course.display_number_with_default} ao carrinho "
+"({currency_symbol}{cost})"
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "Registre-se para {course.display_number_with_default}"
@@ -10256,9 +10254,6 @@ msgstr "Inscrito como:"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr "Verificado"
 
@@ -10350,7 +10345,6 @@ msgstr "Visualizar curso arquivado"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "Visualizar curso "
 
@@ -12277,18 +12271,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr "Distribuição de pontuação"
@@ -13758,6 +13740,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr "Edite o seu nome"
@@ -13820,19 +13845,19 @@ msgstr ""
 "dúvidas mais comuns sobre os nossos certificados{a_end}."
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
-msgstr "Você está atualizando o seu registro para:"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
-msgstr "Você está fazendo uma nova verificação para"
+msgid "You are re-verifying for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
-msgstr "Você está se inscrevendo para"
+msgid "You are enrolling in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -13840,16 +13865,16 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
-msgstr "Atualizando para:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
-msgstr "Nova verificação para:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
-msgstr "Inscrevendo-se como:"
+msgid "{span_start}Enrolling as:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
 msgid "Technical Requirements"
@@ -15492,6 +15517,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -15504,6 +15538,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -15562,10 +15601,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -15580,6 +15620,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo b/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo
index d5c1d4781b..b5064d8338 100644
Binary files a/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo and b/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/pt_BR/LC_MESSAGES/djangojs.po b/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
index aded4f5719..1dd212c7dd 100644
--- a/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
@@ -11,7 +11,7 @@
 # brunojm <brunojm@gmail.com>, 2014
 # brunojm <brunojm@gmail.com>, 2014
 # rqllira <contato@raquellira.com>, 2014
-# edgarapmelo <edgarapmelo@gmail.com>, 2014
+# Edgar Aparecido Pereira de Melo <edgarapmelo@gmail.com>, 2014
 # Francisco Cantarutti <francisco.cantarutti@sisqualis.com.br>, 2014
 # javiercencig <javier@jecnet.com.br>, 2014
 # Jefferson Floyd Conz <jefferson@conz.com.br>, 2014
@@ -29,6 +29,7 @@
 # niels006 <niels006@gmail.com>, 2014
 # niels006 <niels006@gmail.com>, 2014
 # Paulo Castro, 2013
+# Pedro Guimarães Martins <pedrogmartins7@gmail.com>, 2014
 # RenataBarboza, 2013
 # Renata Barboza-Murray, 2013-2014
 # Ricardo Pietrobon <pietr007@gmail.com>, 2013-2014
@@ -47,9 +48,10 @@
 # Bruno Horphoz <horphoz@gmail.com>, 2014
 # brunojm <brunojm@gmail.com>, 2014
 # Daniel Linhares <danielinhares@gmail.com>, 2014
-# edgarapmelo <edgarapmelo@gmail.com>, 2014
+# Edgar Aparecido Pereira de Melo <edgarapmelo@gmail.com>, 2014
 # aivuk <e@vaz.io>, 2014
 # Francisco Cantarutti <francisco.cantarutti@sisqualis.com.br>, 2014
+# Leonardo Flores Zambaldi <fzleonardo@gmail.com>, 2014
 # Leonardo Lehnemann Agostinho Martins <lehneman@gmail.com>, 2014
 # LucasPPires <lucaspylespires@hotmail.com>, 2014
 # Marco Túlio Pires <mtrpires@outlook.com>, 2014
@@ -65,6 +67,7 @@
 # 
 # Translators:
 # Francisco Cantarutti <francisco.cantarutti@sisqualis.com.br>, 2014
+# G <glaucogm@ufpr.br>, 2014
 # Leonardo Flores Zambaldi <fzleonardo@gmail.com>, 2014
 # lukassem <lucas_sem@hotmail.com>, 2014
 # Vitor Silva Martins Costa <costa.vsm@gmail.com>, 2014
@@ -74,7 +77,7 @@
 # This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
 # 
 # Translators:
-# edgarapmelo <edgarapmelo@gmail.com>, 2014
+# Edgar Aparecido Pereira de Melo <edgarapmelo@gmail.com>, 2014
 # aivuk <e@vaz.io>, 2014
 # Jefferson Floyd Conz <jefferson@conz.com.br>, 2014
 # Leonardo Lehnemann Agostinho Martins <lehneman@gmail.com>, 2014
@@ -86,8 +89,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
-"PO-Revision-Date: 2014-10-08 18:08+0000\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
+"PO-Revision-Date: 2014-11-05 14:53+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/edx-platform/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -118,8 +121,6 @@ msgstr "OK"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -2191,166 +2192,6 @@ msgstr "Responder"
 msgid "Tags:"
 msgstr "Marcações:"
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "%s disponíveis"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Esta é a lista de %s disponíveis. É possível escolher alguns dos itens "
-"selecionando-os na caixa abaixo e clicando na seta \"Escolher\" entre as "
-"duas caixas. "
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "Digite neste campo para filtrar a lista de %s disponíveis."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Filtrar"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Escolher todos"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Clique para escolher todos os %s de uma vez."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Escolher"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "Remover"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "%s escolhidos"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Esta é a lista de %s escolhidos. É possível excluir alguns selecionando-os "
-"na caixa abaixo e clicando na seta \"Excluir\" entre as duas caixas."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Remover todos"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Clique para remover todos os %s escolhidos de uma só vez."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(sel)s de %(cnt)s selecionado"
-msgstr[1] "%(sel)s de %(cnt)s selecionados"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"Há alterações não salvas nos campos editáveis individuais. Ao executar uma "
-"ação, as alterações não salvas serão perdidas. "
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Uma ação foi selecionada, mas as alterações nos campos individuais não foram"
-" salvas. Por favor, clique em OK para salvar. A ação deverá ser executada "
-"novamente. "
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"Uma ação foi selecionada, mas nenhuma alteração foi realizada nos campos "
-"individuais. Provavelmente, o botão Ir seja o mais indicado em vez do botão "
-"Salvar. "
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Janeiro|Fevereiro|Março|Abril|Maio|Junho|Julho|Agosto|Setembro|Outubro|Novembro|Dezembro"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "Dom|Seg|Ter|Qua|Qui|Sex|Sáb"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Exibir"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Ocultar"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Domingo|Segunda|Terça|Quarta|Quinta|Sexta|Sábado"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Agora"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Relógio"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Escolha um horário"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Meia-noite"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6 horas"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Meio-dia"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Hoje"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Calendário"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Ontem"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Amanhã"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "Abrir calculadora"
@@ -3077,6 +2918,10 @@ msgstr "Cabeçalho"
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr "Ocorreu um erro desconhecido."
@@ -3386,10 +3231,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3492,6 +3333,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3782,6 +3627,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4724,6 +4583,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/pt_PT/LC_MESSAGES/django.mo b/conf/locale/pt_PT/LC_MESSAGES/django.mo
index afe4abad41..653d1dd03e 100644
Binary files a/conf/locale/pt_PT/LC_MESSAGES/django.mo and b/conf/locale/pt_PT/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/pt_PT/LC_MESSAGES/django.po b/conf/locale/pt_PT/LC_MESSAGES/django.po
index c3f8091363..0574929b4c 100644
--- a/conf/locale/pt_PT/LC_MESSAGES/django.po
+++ b/conf/locale/pt_PT/LC_MESSAGES/django.po
@@ -57,8 +57,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-09-26 02:10+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Patrícia Alexandra Casaleiro Rodrigues <patriciaacrodrigues92@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/edx-platform/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -123,14 +123,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -222,6 +214,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2230,6 +2223,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2588,23 +2622,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2966,9 +2983,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4134,6 +4152,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5035,15 +5057,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5051,37 +5085,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5322,17 +5344,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5342,7 +5364,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5356,8 +5378,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6543,15 +6565,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6588,7 +6610,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7006,11 +7028,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7171,6 +7188,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7473,6 +7491,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8481,11 +8504,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8498,6 +8516,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9349,9 +9372,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9439,7 +9459,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11237,18 +11256,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12585,6 +12592,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12640,19 +12690,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12660,15 +12710,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14191,6 +14241,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14203,6 +14262,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14261,10 +14325,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14279,6 +14344,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/pt_PT/LC_MESSAGES/djangojs.mo b/conf/locale/pt_PT/LC_MESSAGES/djangojs.mo
index 75260a40b6..55f980b849 100644
Binary files a/conf/locale/pt_PT/LC_MESSAGES/djangojs.mo and b/conf/locale/pt_PT/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/pt_PT/LC_MESSAGES/djangojs.po b/conf/locale/pt_PT/LC_MESSAGES/djangojs.po
index 07ba6e853e..cf1fa450b1 100644
--- a/conf/locale/pt_PT/LC_MESSAGES/djangojs.po
+++ b/conf/locale/pt_PT/LC_MESSAGES/djangojs.po
@@ -36,7 +36,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-13 15:01+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/edx-platform/language/pt_PT/)\n"
@@ -69,8 +69,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2151,153 +2149,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2956,6 +2807,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3269,10 +3124,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr "Escolha um novo ficheiro"
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3377,6 +3228,10 @@ msgstr ""
 msgid "or"
 msgstr "ou"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "O curso deve ter uma data de início definida."
@@ -3676,6 +3531,20 @@ msgstr "Configurações"
 msgid "New %(component_type)s"
 msgstr "Novo %(component_type)s"
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4630,6 +4499,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/ro/LC_MESSAGES/django.mo b/conf/locale/ro/LC_MESSAGES/django.mo
index adab58aaab..c5e501547e 100644
Binary files a/conf/locale/ro/LC_MESSAGES/django.mo and b/conf/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ro/LC_MESSAGES/django.po b/conf/locale/ro/LC_MESSAGES/django.po
index 237d2186f2..e0ad7a3971 100644
--- a/conf/locale/ro/LC_MESSAGES/django.po
+++ b/conf/locale/ro/LC_MESSAGES/django.po
@@ -48,7 +48,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-09-24 08:01+0000\n"
 "Last-Translator: Dragos Ardeleanu <office@itc-media.com>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/edx-platform/language/ro/)\n"
@@ -114,14 +114,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -213,6 +205,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2223,6 +2216,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2581,23 +2615,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2959,9 +2976,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4127,6 +4145,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5030,15 +5052,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5046,37 +5080,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5317,17 +5339,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5337,7 +5359,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5351,8 +5373,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6538,15 +6560,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6583,7 +6605,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7001,11 +7023,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7166,6 +7183,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7468,6 +7486,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8478,11 +8501,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8495,6 +8513,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9346,9 +9369,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9436,7 +9456,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11236,18 +11255,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12584,6 +12591,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12639,19 +12689,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12659,15 +12709,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14190,6 +14240,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14202,6 +14261,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14260,10 +14324,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14278,6 +14343,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/ro/LC_MESSAGES/djangojs.mo b/conf/locale/ro/LC_MESSAGES/djangojs.mo
index 890101aef1..dfb3ba6918 100644
Binary files a/conf/locale/ro/LC_MESSAGES/djangojs.mo and b/conf/locale/ro/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ro/LC_MESSAGES/djangojs.po b/conf/locale/ro/LC_MESSAGES/djangojs.po
index 67efb6df1c..3f540515d3 100644
--- a/conf/locale/ro/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ro/LC_MESSAGES/djangojs.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/edx-platform/language/ro/)\n"
@@ -67,8 +67,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2168,154 +2166,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2974,6 +2824,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3290,10 +3144,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3396,6 +3246,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3682,6 +3536,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4625,6 +4493,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/ru/LC_MESSAGES/django.mo b/conf/locale/ru/LC_MESSAGES/django.mo
index e336579d4e..df89abe337 100644
Binary files a/conf/locale/ru/LC_MESSAGES/django.mo and b/conf/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ru/LC_MESSAGES/django.po b/conf/locale/ru/LC_MESSAGES/django.po
index e40d377105..9ec6835093 100644
--- a/conf/locale/ru/LC_MESSAGES/django.po
+++ b/conf/locale/ru/LC_MESSAGES/django.po
@@ -10,6 +10,7 @@
 # berseneva, 2013
 # Danil Moskovoy <tenrius@gmail.com>, 2013
 # Evgeniya <eugenia000@gmail.com>, 2013
+# Elena Freundorfer <e_freundorfer@gmx.de>, 2014
 # Евгений Козлов <eudjin@gmail.com>, 2014
 # Evgeniya <eugenia000@gmail.com>, 2013
 # Katerina <rosemaily@gmail.com>, 2014
@@ -28,6 +29,7 @@
 # webslavic <webslavic@yahoo.com>, 2014
 # Weyedide <weyedide@gmail.com>, 2014
 # Weyedide <weyedide@gmail.com>, 2014
+# tonybond <zippo2021@gmail.com>, 2014
 # Андрей Сандлер <setcursorpos@gmail.com>, 2013
 # #-#-#-#-#  django-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file.
@@ -135,8 +137,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Weyedide <weyedide@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/edx-platform/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -199,14 +201,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -298,6 +292,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2320,6 +2315,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "О нас"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2681,23 +2716,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "Ошибка"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -3057,9 +3075,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4224,6 +4243,10 @@ msgstr "Скачивание данных"
 msgid "Analytics"
 msgstr "Аналитика"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5126,15 +5149,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5142,37 +5177,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5413,17 +5436,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5433,7 +5456,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5447,8 +5470,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6635,15 +6658,15 @@ msgid "Help"
 msgstr "Помощь"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6680,7 +6703,7 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7098,11 +7121,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "О нас"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr "Новости"
@@ -7264,6 +7282,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "Отправить"
 
@@ -7570,6 +7589,11 @@ msgstr "Необработанные данные:"
 msgid "Accepted"
 msgstr "Принято"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "Ошибка"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "Отказано"
@@ -8483,7 +8507,7 @@ msgstr ""
 #: lms/templates/combinedopenended/openended/open_ended.html
 #: lms/templates/discussion/_thread_list_template.html
 msgid "Unanswered"
-msgstr ""
+msgstr "Без ответа"
 
 #: lms/templates/combinedopenended/openended/open_ended.html
 msgid "Skip Post-Assessment"
@@ -8580,13 +8604,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "Этот курс в Вашей <a href=\"{cart_link}\">корзине</a>."
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"Добавить {course.display_number_with_default} в корзину "
-"({currency_symbol}{cost})"
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "Набор на курс закончен"
@@ -8599,6 +8616,13 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"Добавить {course.display_number_with_default} в корзину "
+"({currency_symbol}{cost})"
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9458,9 +9482,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9548,7 +9569,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11352,18 +11372,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr "Активные студенты"
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr "Распределение баллов"
@@ -12704,6 +12712,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12759,19 +12810,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12779,15 +12830,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14310,6 +14361,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14322,6 +14382,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14380,10 +14445,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14398,6 +14464,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/ru/LC_MESSAGES/djangojs.mo b/conf/locale/ru/LC_MESSAGES/djangojs.mo
index 2b9b4c4100..dc5f93352a 100644
Binary files a/conf/locale/ru/LC_MESSAGES/djangojs.mo and b/conf/locale/ru/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ru/LC_MESSAGES/djangojs.po b/conf/locale/ru/LC_MESSAGES/djangojs.po
index 97edc787a5..2510e29ad9 100644
--- a/conf/locale/ru/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ru/LC_MESSAGES/djangojs.po
@@ -41,6 +41,7 @@
 # AndyZ <Andrey.Zakhvatov@gmail.com>, 2014
 # Андрей Сандлер <setcursorpos@gmail.com>, 2013
 # Evgeniya <eugenia000@gmail.com>, 2013
+# Elena Freundorfer <e_freundorfer@gmx.de>, 2014
 # Maksimenkova Olga <omaksimenkova@hse.ru>, 2014
 # Pavel Yushchenko <pavelyushchenko@gmail.com>, 2013
 # Ничик Дмитрий Валерьевич <dmi.nichik@gmail.com>, 2013
@@ -70,7 +71,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/edx-platform/language/ru/)\n"
@@ -103,8 +104,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2206,156 +2205,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "Введите значение в это поле, чтобы отфильтровать доступные %s."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Фильтр"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Кликните, чтобы выбрать все %s сразу."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Выбрать"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "Удалить"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Удалить все"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Вы выбрали действие, но ещё не сохранили внесённые изменения в отдельных "
-"полях. Пожалуйста, сохраните их, нажав ОК. Вам придётся выполнить действие "
-"вновь."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Показать"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Скрыть"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Воскресенье|Понедельник|Вторник|Среда|Четверг|Пятница|Суббота"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Сейчас"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Часы"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Выбрать время"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Полночь"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6:00"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Полдень"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Сегодня"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Календарь"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Вчера"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Завтра"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -3016,6 +2865,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3332,10 +3185,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3438,6 +3287,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3724,6 +3577,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4668,6 +4535,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr "Добавить ссылки на дополнительные версии"
diff --git a/conf/locale/si/LC_MESSAGES/django.mo b/conf/locale/si/LC_MESSAGES/django.mo
index 1ee00f063f..4f164be80f 100644
Binary files a/conf/locale/si/LC_MESSAGES/django.mo and b/conf/locale/si/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/si/LC_MESSAGES/django.po b/conf/locale/si/LC_MESSAGES/django.po
index e95dc5cce2..bc460d11df 100644
--- a/conf/locale/si/LC_MESSAGES/django.po
+++ b/conf/locale/si/LC_MESSAGES/django.po
@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-06 03:04+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Sinhala (http://www.transifex.com/projects/p/edx-platform/language/si/)\n"
@@ -107,14 +107,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -206,6 +198,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2214,6 +2207,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2572,23 +2606,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2950,9 +2967,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4118,6 +4136,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5019,15 +5041,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5035,37 +5069,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5306,17 +5328,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5326,7 +5348,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5340,8 +5362,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6527,15 +6549,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6572,7 +6594,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6990,11 +7012,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7155,6 +7172,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7457,6 +7475,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8465,11 +8488,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8482,6 +8500,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9333,9 +9356,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9423,7 +9443,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11221,18 +11240,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12569,6 +12576,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12624,19 +12674,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12644,15 +12694,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14175,6 +14225,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14187,6 +14246,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14245,10 +14309,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14263,6 +14328,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/si/LC_MESSAGES/djangojs.mo b/conf/locale/si/LC_MESSAGES/djangojs.mo
index f7d7240c8a..dd8f150d56 100644
Binary files a/conf/locale/si/LC_MESSAGES/djangojs.mo and b/conf/locale/si/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/si/LC_MESSAGES/djangojs.po b/conf/locale/si/LC_MESSAGES/djangojs.po
index 6e8e15f60d..855c42f06b 100644
--- a/conf/locale/si/LC_MESSAGES/djangojs.po
+++ b/conf/locale/si/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Sinhala (http://www.transifex.com/projects/p/edx-platform/language/si/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/sk/LC_MESSAGES/django.mo b/conf/locale/sk/LC_MESSAGES/django.mo
index 9e1e3f6716..ca2b952de1 100644
Binary files a/conf/locale/sk/LC_MESSAGES/django.mo and b/conf/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/sk/LC_MESSAGES/django.po b/conf/locale/sk/LC_MESSAGES/django.po
index 2d7fbab191..df626d4204 100644
--- a/conf/locale/sk/LC_MESSAGES/django.po
+++ b/conf/locale/sk/LC_MESSAGES/django.po
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-09-03 08:46+0000\n"
 "Last-Translator: Vladimír Záhradník <vladimir.zahradnik@gmail.com>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/edx-platform/language/sk/)\n"
@@ -111,14 +111,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -210,6 +202,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2220,6 +2213,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2578,23 +2612,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2953,9 +2970,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4121,6 +4139,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5024,15 +5046,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5040,37 +5074,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5311,17 +5333,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5331,7 +5353,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5345,8 +5367,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6532,15 +6554,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6577,7 +6599,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6995,11 +7017,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7160,6 +7177,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7462,6 +7480,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8472,11 +8495,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8489,6 +8507,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9340,9 +9363,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9430,7 +9450,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11230,18 +11249,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12578,6 +12585,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12633,19 +12683,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12653,15 +12703,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14184,6 +14234,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14196,6 +14255,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14254,10 +14318,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14272,6 +14337,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/sk/LC_MESSAGES/djangojs.mo b/conf/locale/sk/LC_MESSAGES/djangojs.mo
index 30ee47c724..4b27db1e55 100644
Binary files a/conf/locale/sk/LC_MESSAGES/djangojs.mo and b/conf/locale/sk/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/sk/LC_MESSAGES/djangojs.po b/conf/locale/sk/LC_MESSAGES/djangojs.po
index 34ea479179..7add348c3c 100644
--- a/conf/locale/sk/LC_MESSAGES/djangojs.po
+++ b/conf/locale/sk/LC_MESSAGES/djangojs.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-11 10:21+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/edx-platform/language/sk/)\n"
@@ -67,8 +67,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2168,154 +2166,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2974,6 +2824,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3290,10 +3144,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3396,6 +3246,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3682,6 +3536,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4625,6 +4493,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/sl/LC_MESSAGES/django.mo b/conf/locale/sl/LC_MESSAGES/django.mo
index a640a00b20..5758b9b9c5 100644
Binary files a/conf/locale/sl/LC_MESSAGES/django.mo and b/conf/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/sl/LC_MESSAGES/django.po b/conf/locale/sl/LC_MESSAGES/django.po
index 7203b76e4f..081ef59b9f 100644
--- a/conf/locale/sl/LC_MESSAGES/django.po
+++ b/conf/locale/sl/LC_MESSAGES/django.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-06 03:04+0000\n"
 "Last-Translator: Ned Batchelder <ned@edx.org>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/edx-platform/language/sl/)\n"
@@ -106,14 +106,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -205,6 +197,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2217,6 +2210,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2575,23 +2609,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2953,9 +2970,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4121,6 +4139,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5026,15 +5048,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5042,37 +5076,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5313,17 +5335,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5333,7 +5355,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5347,8 +5369,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6534,15 +6556,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6579,7 +6601,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6997,11 +7019,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7162,6 +7179,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7464,6 +7482,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8476,11 +8499,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8493,6 +8511,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9344,9 +9367,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9434,7 +9454,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11236,18 +11255,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12584,6 +12591,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12639,19 +12689,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12659,15 +12709,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14190,6 +14240,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14202,6 +14261,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14260,10 +14324,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14278,6 +14343,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/sl/LC_MESSAGES/djangojs.mo b/conf/locale/sl/LC_MESSAGES/djangojs.mo
index 4da9b5aacc..4a23f1efde 100644
Binary files a/conf/locale/sl/LC_MESSAGES/djangojs.mo and b/conf/locale/sl/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/sl/LC_MESSAGES/djangojs.po b/conf/locale/sl/LC_MESSAGES/djangojs.po
index 5e76b2efb9..3eca454b24 100644
--- a/conf/locale/sl/LC_MESSAGES/djangojs.po
+++ b/conf/locale/sl/LC_MESSAGES/djangojs.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/edx-platform/language/sl/)\n"
@@ -60,8 +60,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -2171,165 +2169,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "%s, ki so na voljo"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Seznam vseh %s, ki so na voljo. Lahko jih izberete tako, da jih označite v "
-"prostoru spodaj in nato kliknete puščico \"Izberi\" med dvema prostoroma. "
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "Pišite v ta prostor, da filtrirate seznam vseh %s."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Filter"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Izberite vse"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Kliknite, da izberete vse %s hkrati."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Izberi"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "Odstrani"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "Izbrani %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Seznam izbranih %s. Lahko jih odstranite tako, da kliknete na prostor spodaj"
-" in na to na puščico \"Odstrani\"."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Odstrani vse"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Kliknite, če želite odstraniti izbrane %s."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(sel) od %(cnt) izbranega"
-msgstr[1] "%(sel)s od %(cnt)s izbranih"
-msgstr[2] "%(sel)s od %(cnt)s izbranih"
-msgstr[3] "%(sel)s of %(cnt)s selected"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"V nekaterih vnosnih poljih imate neshranjene spremembe. Če nadaljujete z "
-"akcijo boste spremembe izgubili."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Izbrali ste akcijo, ampak niste shranili vseh sprememb. Prosimo, kliknite "
-"OK, če želite shraniti. Akcijo boste morali ponoviti še enkrat."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"Izbrali ste akcijo, ampak niste naredili nobene spremembe. Verjetno ste "
-"želeli klikniti gumb Pojdi namesto gumba Shrani."
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Januar|Februar|Marec|April|Maj|Junij|Julij|Avgust|September|Oktober|November|December"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "N|P|T|S|Č|P|S"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Prikaži"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Skrij"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Sobota|Ponedeljek|Torek|Sreda|Četrtek|Petel|Sobota"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Zdaj"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Ura"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Izberi čas"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Polnoč"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6:00"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Opoldne"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Danes"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Koledar"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Včeraj"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Jutri"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2988,6 +2827,10 @@ msgstr "Naslov"
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3311,10 +3154,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3417,6 +3256,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3705,6 +3548,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4649,6 +4506,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/sq/LC_MESSAGES/django.mo b/conf/locale/sq/LC_MESSAGES/django.mo
index c67d371b98..99254d0331 100644
Binary files a/conf/locale/sq/LC_MESSAGES/django.mo and b/conf/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/sq/LC_MESSAGES/django.po b/conf/locale/sq/LC_MESSAGES/django.po
index bd6d566193..58ed4232a4 100644
--- a/conf/locale/sq/LC_MESSAGES/django.po
+++ b/conf/locale/sq/LC_MESSAGES/django.po
@@ -44,8 +44,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-09-28 21:10+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Faton Nuha <faton11@live.com>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/edx-platform/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -103,14 +103,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -201,6 +193,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -322,7 +315,7 @@ msgstr ""
 
 #: common/djangoapps/student/views.py
 msgid "You must accept the terms of service."
-msgstr ""
+msgstr "Ju duhet të i pranoni rregullat e përdorimit."
 
 #: common/djangoapps/student/views.py
 msgid "Username must be minimum of two characters long"
@@ -2208,6 +2201,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "Rreth"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2566,23 +2599,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "Problem"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2944,9 +2960,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4116,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5017,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5033,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5304,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5324,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5338,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6534,15 +6555,15 @@ msgid "Help"
 msgstr "Ndihmë"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6579,7 +6600,7 @@ msgid "):"
 msgstr ");"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6999,11 +7020,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "Rreth"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr "Lajmet"
@@ -7166,6 +7182,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "Paraqit"
 
@@ -7468,6 +7485,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "Problem"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8476,11 +8498,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8493,6 +8510,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "Regjistrohu për {course.display_number_with_default}"
@@ -9344,9 +9366,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9434,7 +9453,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "Shiko kursin"
 
@@ -11234,18 +11252,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12584,6 +12590,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12639,19 +12688,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12659,15 +12708,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -13729,7 +13778,7 @@ msgstr ""
 
 #: cms/templates/container.html
 msgid "View Live Version"
-msgstr ""
+msgstr "Shiko verzionin drejtëpërdrejt"
 
 #: cms/templates/container.html
 msgid "Preview Changes"
@@ -14195,6 +14244,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14207,6 +14265,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14265,10 +14328,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14283,6 +14347,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/sq/LC_MESSAGES/djangojs.mo b/conf/locale/sq/LC_MESSAGES/djangojs.mo
index 7eb2dcf7f8..ff30c4cb40 100644
Binary files a/conf/locale/sq/LC_MESSAGES/djangojs.mo and b/conf/locale/sq/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/sq/LC_MESSAGES/djangojs.po b/conf/locale/sq/LC_MESSAGES/djangojs.po
index 2b41762fd0..59446cddf6 100644
--- a/conf/locale/sq/LC_MESSAGES/djangojs.po
+++ b/conf/locale/sq/LC_MESSAGES/djangojs.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/edx-platform/language/sq/)\n"
@@ -63,8 +63,6 @@ msgstr "Në rregull"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "Anulo"
 
@@ -2135,153 +2133,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr "Fshije"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Fshij të gjitha"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "S|M|T|W|T|F|S"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Shfaq"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Fsheh"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "E diel |E hënë|E martë|E mërkur|E enjte|E premte|E shtunë"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Tani"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Ora"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Zgjidh një kohë"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Mesnatë"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Sot"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Kalendar"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Dje"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Nesër"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "Hap kalkulatorin"
@@ -2940,6 +2791,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3251,10 +3106,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr "ose"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3652,6 +3507,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4592,6 +4461,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr "Fshije"
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/sr/LC_MESSAGES/django.mo b/conf/locale/sr/LC_MESSAGES/django.mo
index 73dc10b6cd..386ba2b256 100644
Binary files a/conf/locale/sr/LC_MESSAGES/django.mo and b/conf/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/sr/LC_MESSAGES/django.po b/conf/locale/sr/LC_MESSAGES/django.po
index a44d04263a..1caee48dcc 100644
--- a/conf/locale/sr/LC_MESSAGES/django.po
+++ b/conf/locale/sr/LC_MESSAGES/django.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-06 03:04+0000\n"
 "Last-Translator: \n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/edx-platform/language/sr/)\n"
@@ -106,14 +106,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -205,6 +197,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2215,6 +2208,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2573,23 +2607,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2951,9 +2968,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4119,6 +4137,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5022,15 +5044,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5038,37 +5072,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5309,17 +5331,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5329,7 +5351,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5343,8 +5365,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6530,15 +6552,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6575,7 +6597,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6993,11 +7015,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7158,6 +7175,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7460,6 +7478,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8470,11 +8493,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8487,6 +8505,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9338,9 +9361,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9428,7 +9448,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11228,18 +11247,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12576,6 +12583,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12631,19 +12681,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12651,15 +12701,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14182,6 +14232,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14194,6 +14253,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14252,10 +14316,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14270,6 +14335,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/sr/LC_MESSAGES/djangojs.mo b/conf/locale/sr/LC_MESSAGES/djangojs.mo
index 4310746e29..1f622e311e 100644
Binary files a/conf/locale/sr/LC_MESSAGES/djangojs.mo and b/conf/locale/sr/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/sr/LC_MESSAGES/djangojs.po b/conf/locale/sr/LC_MESSAGES/djangojs.po
index 192d1a5678..479f834074 100644
--- a/conf/locale/sr/LC_MESSAGES/djangojs.po
+++ b/conf/locale/sr/LC_MESSAGES/djangojs.po
@@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/edx-platform/language/sr/)\n"
@@ -63,8 +63,6 @@ msgstr "OK"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2164,155 +2162,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Januar|Februar|Mart|April|Maj|Jun|Jul|Avgust|Septembar|Oktobar|Novembar|Decembar"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "NED|PON|UTO|SRE|ČET|PET|SUB"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Nedelja|Ponedeljak|Utorak|Sreda|Četvrtak|Petak|Subota"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Ponoć"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Podne"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Danas"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Kalendar"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Juče"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Sutra"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2971,6 +2820,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3287,10 +3140,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3393,6 +3242,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3679,6 +3532,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4622,6 +4489,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/sv/LC_MESSAGES/django.mo b/conf/locale/sv/LC_MESSAGES/django.mo
index 38df087473..0adc13fe11 100644
Binary files a/conf/locale/sv/LC_MESSAGES/django.mo and b/conf/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/sv/LC_MESSAGES/django.po b/conf/locale/sv/LC_MESSAGES/django.po
index 1b25b7539d..f3505c49cf 100644
--- a/conf/locale/sv/LC_MESSAGES/django.po
+++ b/conf/locale/sv/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-02-06 03:04+0000\n"
 "Last-Translator: \n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/edx-platform/language/sv/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/sv/LC_MESSAGES/djangojs.mo b/conf/locale/sv/LC_MESSAGES/djangojs.mo
index ac8bd5520f..aa87790078 100644
Binary files a/conf/locale/sv/LC_MESSAGES/djangojs.mo and b/conf/locale/sv/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/sv/LC_MESSAGES/djangojs.po b/conf/locale/sv/LC_MESSAGES/djangojs.po
index d3121cd563..1e85a4d903 100644
--- a/conf/locale/sv/LC_MESSAGES/djangojs.po
+++ b/conf/locale/sv/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/edx-platform/language/sv/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/sw/LC_MESSAGES/django.mo b/conf/locale/sw/LC_MESSAGES/django.mo
index 6887462713..c670449e72 100644
Binary files a/conf/locale/sw/LC_MESSAGES/django.mo and b/conf/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/sw/LC_MESSAGES/django.po b/conf/locale/sw/LC_MESSAGES/django.po
index f3dd07a8ae..34ee3eb6b6 100644
--- a/conf/locale/sw/LC_MESSAGES/django.po
+++ b/conf/locale/sw/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-09-09 14:43+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Swahili (http://www.transifex.com/projects/p/edx-platform/language/sw/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/sw/LC_MESSAGES/djangojs.mo b/conf/locale/sw/LC_MESSAGES/djangojs.mo
index b82d16b184..a2f4d363b2 100644
Binary files a/conf/locale/sw/LC_MESSAGES/djangojs.mo and b/conf/locale/sw/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/sw/LC_MESSAGES/djangojs.po b/conf/locale/sw/LC_MESSAGES/djangojs.po
index 18857a9c66..c7b9dce1eb 100644
--- a/conf/locale/sw/LC_MESSAGES/djangojs.po
+++ b/conf/locale/sw/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Swahili (http://www.transifex.com/projects/p/edx-platform/language/sw/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/ta/LC_MESSAGES/django.mo b/conf/locale/ta/LC_MESSAGES/django.mo
index 42d14c2793..c38724e2a0 100644
Binary files a/conf/locale/ta/LC_MESSAGES/django.mo and b/conf/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ta/LC_MESSAGES/django.po b/conf/locale/ta/LC_MESSAGES/django.po
index 5c02e8d07e..ba5dad3960 100644
--- a/conf/locale/ta/LC_MESSAGES/django.po
+++ b/conf/locale/ta/LC_MESSAGES/django.po
@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-08-14 21:21+0000\n"
 "Last-Translator: Nadar Solomon Sunder <solomonsunder@gmail.com>\n"
 "Language-Team: Tamil (http://www.transifex.com/projects/p/edx-platform/language/ta/)\n"
@@ -107,14 +107,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -206,6 +198,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2214,6 +2207,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2572,23 +2606,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2950,9 +2967,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4118,6 +4136,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5019,15 +5041,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5035,37 +5069,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5306,17 +5328,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5326,7 +5348,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5340,8 +5362,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6527,15 +6549,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6572,7 +6594,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6990,11 +7012,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7155,6 +7172,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7457,6 +7475,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8465,11 +8488,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8482,6 +8500,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9333,9 +9356,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9423,7 +9443,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11221,18 +11240,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12569,6 +12576,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12624,19 +12674,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12644,15 +12694,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14175,6 +14225,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14187,6 +14246,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14245,10 +14309,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14263,6 +14328,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/ta/LC_MESSAGES/djangojs.mo b/conf/locale/ta/LC_MESSAGES/djangojs.mo
index 4ae3ad99e8..9be4b71e39 100644
Binary files a/conf/locale/ta/LC_MESSAGES/djangojs.mo and b/conf/locale/ta/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ta/LC_MESSAGES/djangojs.po b/conf/locale/ta/LC_MESSAGES/djangojs.po
index 234d4e5c8f..cf59cddc0b 100644
--- a/conf/locale/ta/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ta/LC_MESSAGES/djangojs.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Tamil (http://www.transifex.com/projects/p/edx-platform/language/ta/)\n"
@@ -60,8 +60,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2142,153 +2140,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2947,6 +2798,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3256,10 +3111,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3362,6 +3213,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3646,6 +3501,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4588,6 +4457,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/te/LC_MESSAGES/django.mo b/conf/locale/te/LC_MESSAGES/django.mo
index 341ac89809..98d0ce1998 100644
Binary files a/conf/locale/te/LC_MESSAGES/django.mo and b/conf/locale/te/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/te/LC_MESSAGES/django.po b/conf/locale/te/LC_MESSAGES/django.po
index ae92488951..72083ae16c 100644
--- a/conf/locale/te/LC_MESSAGES/django.po
+++ b/conf/locale/te/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-07-14 12:42+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/edx-platform/language/te/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/te/LC_MESSAGES/djangojs.mo b/conf/locale/te/LC_MESSAGES/djangojs.mo
index 326e92c73e..6e92474023 100644
Binary files a/conf/locale/te/LC_MESSAGES/djangojs.mo and b/conf/locale/te/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/te/LC_MESSAGES/djangojs.po b/conf/locale/te/LC_MESSAGES/djangojs.po
index e897fd0f17..2581b7577f 100644
--- a/conf/locale/te/LC_MESSAGES/djangojs.po
+++ b/conf/locale/te/LC_MESSAGES/djangojs.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/edx-platform/language/te/)\n"
@@ -59,8 +59,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2141,153 +2139,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2946,6 +2797,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3255,10 +3110,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3361,6 +3212,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3645,6 +3500,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4587,6 +4456,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/th/LC_MESSAGES/django.mo b/conf/locale/th/LC_MESSAGES/django.mo
index 66c4c71977..e45e5c5202 100644
Binary files a/conf/locale/th/LC_MESSAGES/django.mo and b/conf/locale/th/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/th/LC_MESSAGES/django.po b/conf/locale/th/LC_MESSAGES/django.po
index 18bbf9f66c..b26e7ecf98 100644
--- a/conf/locale/th/LC_MESSAGES/django.po
+++ b/conf/locale/th/LC_MESSAGES/django.po
@@ -22,6 +22,7 @@
 # 
 # Translators:
 # J.14 <jithinchman@gmail.com>, 2014
+# neelawat <neelawat@gmail.com>, 2014
 # peemmaruj <peemmaruj@gmail.com>, 2014
 # Sorathan Chaturapruek <tummykung@gmail.com>, 2014
 # Sorathan Chaturapruek <tummykung@gmail.com>, 2014
@@ -56,7 +57,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-09-07 07:40+0000\n"
 "Last-Translator: Monthol <monthol.karnjanolarn@gmail.com>\n"
 "Language-Team: Thai (http://www.transifex.com/projects/p/edx-platform/language/th/)\n"
@@ -122,14 +123,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -221,6 +214,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2227,6 +2221,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2585,23 +2620,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2963,9 +2981,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4131,6 +4150,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5030,15 +5053,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5046,37 +5081,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5317,17 +5340,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5337,7 +5360,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5351,8 +5374,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6538,15 +6561,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6583,7 +6606,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -7001,11 +7024,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7166,6 +7184,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7468,6 +7487,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8474,11 +8498,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8491,6 +8510,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9342,9 +9366,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9432,7 +9453,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11228,18 +11248,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12576,6 +12584,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12631,19 +12682,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12651,15 +12702,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14184,6 +14235,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14196,6 +14256,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14254,10 +14319,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14272,6 +14338,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/th/LC_MESSAGES/djangojs.mo b/conf/locale/th/LC_MESSAGES/djangojs.mo
index 37b8e0ccd6..9cde3dfd0e 100644
Binary files a/conf/locale/th/LC_MESSAGES/djangojs.mo and b/conf/locale/th/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/th/LC_MESSAGES/djangojs.po b/conf/locale/th/LC_MESSAGES/djangojs.po
index 2f5bdbfe79..dd397e2e09 100644
--- a/conf/locale/th/LC_MESSAGES/djangojs.po
+++ b/conf/locale/th/LC_MESSAGES/djangojs.po
@@ -31,8 +31,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
-"PO-Revision-Date: 2014-10-08 18:08+0000\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
+"PO-Revision-Date: 2014-11-07 14:09+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Thai (http://www.transifex.com/projects/p/edx-platform/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -64,8 +64,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2127,152 +2125,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2931,6 +2783,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3233,10 +3089,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3339,6 +3191,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3621,6 +3477,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4562,6 +4432,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/tr_TR/LC_MESSAGES/django.mo b/conf/locale/tr_TR/LC_MESSAGES/django.mo
index 3f9c16f4f4..3808e4358a 100644
Binary files a/conf/locale/tr_TR/LC_MESSAGES/django.mo and b/conf/locale/tr_TR/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/tr_TR/LC_MESSAGES/django.po b/conf/locale/tr_TR/LC_MESSAGES/django.po
index aef68a32af..3e96e5945e 100644
--- a/conf/locale/tr_TR/LC_MESSAGES/django.po
+++ b/conf/locale/tr_TR/LC_MESSAGES/django.po
@@ -53,6 +53,7 @@
 # This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
 # 
 # Translators:
+# Azmi Ozgen <azmican73@gmail.com>, 2014
 # baris <brscvs@gmail.com>, 2013
 # Burak Özalp <realburq@gmail.com>, 2013
 # Emrah Emirtekin <eemirtekin@gmail.com>, 2014
@@ -85,8 +86,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: Hakan Şenel <hgsenel@gmail.com>\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/edx-platform/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -145,14 +146,6 @@ msgstr "Birim"
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "Onur Kodu Sertifikası"
@@ -245,6 +238,7 @@ msgstr "Temel/İlkokul"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -2275,6 +2269,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "Hakkında"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "Genel"
@@ -2633,18 +2667,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "Hata"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -3021,9 +3043,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4221,6 +4244,10 @@ msgstr "Veri İndir"
 msgid "Analytics"
 msgstr "Analitikler"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
 msgstr "Ölçümler"
@@ -5161,83 +5188,54 @@ msgstr ""
 "İşlemci tarafından hesaplanan {0} {1}, {2} {3} siparişinin toplam "
 "maliyetinden farklı."
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"Af edersiniz! Ödeme işlemcimiz ödemenizi kabul etmedi.\n"
-"Döndürdükleri karar <span class=\"decision\">{decision}</span>,\n"
-"ve vardıkları sonuç <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"Paranızı almadık. Lütfen diğer bir ödeme türünü seçiniz.\n"
-"Ödemeyle ilgili sorularınızla ilgili olarak {email} adresi üzerinden bizimle bağlantıya geçin.\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"Af edersiniz! Ödeme işlemcimiz tutarsız bilgi bulunan ödeme teyidi gönderdi!\n"
-"Ödemenin hesaplarınızdan alındığını teyit edemiyor ve siparişinizde ilerleme kaydedemiyoruz.\n"
-"Spesifik hata mesajı:  <span class=\"exception_msg\">{msg}</span>.\n"
-"Kredi kartınızdan ücret çekilmiş olabilir. Ödemeyle ilgili sorularınız için {email} adresinden bizimle temasa geçiniz.\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"Afedersiniz! Bir hata nedeniyle ödemeniz sipariş toplamında farklı bir rakamla gerçekleşti!\n"
-"Spesifik hata mesaji: <span class=\"exception_msg\">{msg}</span>.\n"
-"Kredi kartınızdan büyük bir olasılıkla ücret çekildi. Ödeme konusunda {email} adresi üzerinden bizimle temasa geçin.\n"
-"</p>"
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"Af edersiniz. Ödeme işlemcimiz ödemenizle ilgili bozuk bir veri gönderdi, bu nedenle\n"
-"ödeme işlemcisinden gelip gelmediğini anlayamadık.\n"
-"Spesifik hata mesajı: <span class=\"exception_msg\">{msg}</span>.\n"
-"Ödemenin kredi kartınızdan alınıp alınmadığı konusunda bir bilgimiz bulunmuyor.\n"
-"Kredi kartınızdan büyük bir olasılıkla ücret tahsil edil. Ödemeyle ilgili spesifik sorularınız için bizimle {email} adresi üzerinden bağlantı kurabilirsiniz.\n"
-"</p>"
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -5530,17 +5528,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5550,7 +5548,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5564,8 +5562,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6831,16 +6829,16 @@ msgid "Help"
 msgstr "Yardım"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
-msgstr "{} için Kaydınızı Yükseltin | Hedefinizi Seçiniz"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "{} için kaydolun | Yolunuzu Seçin"
+msgid "Enroll In {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr "Üzgünüz, sizi kaydederken bir hata oluştu."
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -6876,8 +6874,8 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
-msgstr "Kaydınızı Yükseltiniz"
+msgid "Upgrade Your Enrollment"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Audit This Course"
@@ -7307,11 +7305,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "Hakkında"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7486,6 +7479,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "Yükle"
 
@@ -7810,6 +7804,11 @@ msgstr "Ham veri:"
 msgid "Accepted"
 msgstr "Kabul Edildi"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "Hata"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "Reddedildi"
@@ -8861,12 +8860,6 @@ msgstr "Ders Yazılımlarını Görün"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "<a href=\"{cart_link}\">sipariş kutunuz</a> içinde bu ders var."
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"Ekle {course.display_number_with_default} sepete  ({currency_symbol}{cost})"
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "Ders Dolu"
@@ -8879,6 +8872,12 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"Ekle {course.display_number_with_default} sepete  ({currency_symbol}{cost})"
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "Kayıt ol {course.display_number_with_default}"
@@ -9800,9 +9799,6 @@ msgstr "Kaydolunan isim:"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9894,7 +9890,6 @@ msgstr "Arşivlenmiş Kursları Görüntüle"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "Kursa Gözat"
 
@@ -11728,18 +11723,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -13169,6 +13152,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr "İsminizi Düzeltiniz"
@@ -13231,19 +13257,19 @@ msgstr ""
 "sayfamızı {a_end} ziyaret edebilisiniz."
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
-msgstr "Kaydınızı yükseltiyorum"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
-msgstr "Yeniden onaylıyorsunuz, şunun için"
+msgid "You are re-verifying for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
-msgstr "Şunun için kayıt oluyorsunuz"
+msgid "You are enrolling in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -13251,16 +13277,16 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
-msgstr "Yükseltiyorum:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
-msgstr "Yeniden doğrulayın şunun için:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
-msgstr "Olarak kaydoluyor:"
+msgid "{span_start}Enrolling as:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
 msgid "Technical Requirements"
@@ -14920,6 +14946,15 @@ msgstr ""
 "bir deyişle, GNU Zip'le sıkıştırılmış .tar dosyasıdır). Dışa aktardığınız "
 "dosyaları yeniden içe aktarabilirsiniz."
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr "Dersimin İçeriğini Dışarı Aktar"
@@ -14932,6 +14967,11 @@ msgstr "Ders İçeriğini Dışarı Aktar"
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr "Dersim {em_end} veri {em_start} ile dışarı aktarıldı."
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr "Ders İçeriği (Bütün Bölümler, Alt-Bölümler ve Birimler)"
@@ -14994,15 +15034,12 @@ msgstr "Hangi içerik dışa aktarıldı?"
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
-"Sadece ders içeriği ve yapısı (bölümler, altbölümler ve birimlerle birlikte)"
-" dışa aktarılır. Diğer veriler, örneğin notlandırma bilgileri, tartışma "
-"forum verileri, ders ayarları ve ders takım bilgileri, dışarı "
-"aktarılmamaktadır."
 
 #: cms/templates/export.html
 msgid "Opening the downloaded file"
@@ -15019,6 +15056,10 @@ msgstr ""
 "Çıkarılan veriler içinde ders.xml dosyası ve ders içeriğini barındıran alt "
 "dizinler olacaktır."
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr "Dersi Git'e Aktar"
diff --git a/conf/locale/tr_TR/LC_MESSAGES/djangojs.mo b/conf/locale/tr_TR/LC_MESSAGES/djangojs.mo
index f94ba69d7e..fdadd13a66 100644
Binary files a/conf/locale/tr_TR/LC_MESSAGES/djangojs.mo and b/conf/locale/tr_TR/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/tr_TR/LC_MESSAGES/djangojs.po b/conf/locale/tr_TR/LC_MESSAGES/djangojs.po
index 332b65b094..fd03ac866b 100644
--- a/conf/locale/tr_TR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/tr_TR/LC_MESSAGES/djangojs.po
@@ -28,6 +28,7 @@
 # Translators:
 # baris <brscvs@gmail.com>, 2013
 # Burak Özalp <realburq@gmail.com>, 2013
+# bitisik_da <cyigitsahin@outlook.com>, 2014
 # Hakan Şenel <hgsenel@gmail.com>, 2014
 # Hakan Şenel <hgsenel@gmail.com>, 2014
 # Kerim Kaan <ben@kerimkaan.com>, 2013
@@ -53,8 +54,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
-"PO-Revision-Date: 2014-10-08 18:08+0000\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
+"PO-Revision-Date: 2014-11-04 22:01+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/edx-platform/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -85,8 +86,6 @@ msgstr "Tamam"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "İptal"
 
@@ -2154,162 +2153,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "Kullanılabilir %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Ulaşılabileceklerin listesi %s budur. İki kutu arasındaki Seç okuna "
-"tıklayarak içlerinden seçebilirsiniz."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "Uygun seçenek listesini %s filtremek için bu kutuya yazın"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Filtrele"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Hepsini seç"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Tüm %s leri bir anda seçmek için tıklayın."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Seç"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "Çıkart"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "Seçilmiş %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Ulaşılabileceklerin listesi %s'dir. İki kutu arasındaki Sil okuna tıklayarak"
-" içlerinden istediklerinizi silebilirsiniz."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Hepsini çıkart"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Tüm seçili %s leri  çıkartmak için tıklayınız."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(sel)s lerin %(cnt)s i seçilmiş"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"Değiştirilebilir alanlarda kaydetmediğiniz değişiklikler var. Eğer devam "
-"ederseniz, kaydedilmeyen değişiklerinizi kaybedeceksiniz."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Bir komutu seçtiniz, ancak değişikliklerinizi kaydetmediniz. Lütfen Tamama "
-"tıklayınız. İşleminizi yeniden yapmanız gerekebilir."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-"Bir komut seçtiniz, ancak alanlarda herhangi bir değişiklik yapmadınız. "
-"Kaydet butonu yerine Git butonunu arıyor olmalısınız."
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Ocak|Şubat|Mart|Nisan|Mayıs|Haziran|Temmuz|Ağustos|Eylül|Ekim|Kasım|Aralık"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "P|P|S|Ç|P|C|C"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Göster"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Gizle"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Pazar|Pazartesi|Salı|Çarşamba|Perşembe|Cuma|Cumartesi"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Şimdi"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Saat"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Bir zaman seçin "
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Gece yarısı"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6:00"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Öğle"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Bugün"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Takvim"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Dün"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Yarın"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "Hesap Makinesini Aç"
@@ -3014,6 +2857,10 @@ msgstr "Başlık"
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3319,10 +3166,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3427,6 +3270,10 @@ msgstr ""
 msgid "or"
 msgstr "veya"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "Ders atanmış bir başlangıç tarihi içermeli."
@@ -3712,6 +3559,20 @@ msgstr "Ayarlar"
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4663,6 +4524,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/uk/LC_MESSAGES/django.mo b/conf/locale/uk/LC_MESSAGES/django.mo
index d2ee6e7895..7516e487a2 100644
Binary files a/conf/locale/uk/LC_MESSAGES/django.mo and b/conf/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/uk/LC_MESSAGES/django.po b/conf/locale/uk/LC_MESSAGES/django.po
index 7db40b61f9..be01faed5c 100644
--- a/conf/locale/uk/LC_MESSAGES/django.po
+++ b/conf/locale/uk/LC_MESSAGES/django.po
@@ -59,8 +59,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: IvanPrimachenko <jastudent1@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/edx-platform/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -125,14 +125,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -224,6 +216,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2234,6 +2227,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2592,23 +2626,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2970,9 +2987,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4138,6 +4156,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5041,15 +5063,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5057,37 +5091,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5328,17 +5350,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5348,7 +5370,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5362,8 +5384,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6549,15 +6571,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6594,7 +6616,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6726,7 +6748,7 @@ msgstr ""
 
 #: lms/templates/dashboard.html
 msgid "Dashboard"
-msgstr ""
+msgstr "Панель курсів"
 
 #: lms/templates/dashboard.html lms/templates/dashboard.html
 #: lms/templates/dashboard/_dashboard_info_language.html
@@ -7012,11 +7034,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7177,6 +7194,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7479,6 +7497,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8489,11 +8512,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8506,6 +8524,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9357,9 +9380,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9447,7 +9467,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11247,18 +11266,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12595,6 +12602,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12650,19 +12700,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12670,15 +12720,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14201,6 +14251,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14213,6 +14272,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14271,10 +14335,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14289,6 +14354,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/uk/LC_MESSAGES/djangojs.mo b/conf/locale/uk/LC_MESSAGES/djangojs.mo
index b33c3ddae2..67447baa34 100644
Binary files a/conf/locale/uk/LC_MESSAGES/djangojs.mo and b/conf/locale/uk/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/uk/LC_MESSAGES/djangojs.po b/conf/locale/uk/LC_MESSAGES/djangojs.po
index db2b3e1bf4..fb02bddb12 100644
--- a/conf/locale/uk/LC_MESSAGES/djangojs.po
+++ b/conf/locale/uk/LC_MESSAGES/djangojs.po
@@ -30,6 +30,7 @@
 # 
 # Translators:
 # IvanPrimachenko <jastudent1@gmail.com>, 2014
+# olexiim <olexiim@gmail.com>, 2014
 # Tetiana Korshun, 2014
 # #-#-#-#-#  underscore-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file
@@ -42,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-14 15:11+0000\n"
 "Last-Translator: Tetiana Korshun\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/edx-platform/language/uk/)\n"
@@ -75,8 +76,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2176,154 +2175,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2982,6 +2833,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3298,10 +3153,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3404,6 +3255,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3690,6 +3545,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4633,6 +4502,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/ur/LC_MESSAGES/django.mo b/conf/locale/ur/LC_MESSAGES/django.mo
index 490abe5ca3..cb0a22acba 100644
Binary files a/conf/locale/ur/LC_MESSAGES/django.mo and b/conf/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ur/LC_MESSAGES/django.po b/conf/locale/ur/LC_MESSAGES/django.po
index 1091f81020..769a471496 100644
--- a/conf/locale/ur/LC_MESSAGES/django.po
+++ b/conf/locale/ur/LC_MESSAGES/django.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-04-07 13:46+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/edx-platform/language/ur/)\n"
@@ -104,14 +104,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -203,6 +195,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2211,6 +2204,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2569,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2947,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4115,6 +4133,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5016,15 +5038,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5032,37 +5066,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5303,17 +5325,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5323,7 +5345,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5337,8 +5359,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6524,15 +6546,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6569,7 +6591,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6987,11 +7009,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7152,6 +7169,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7454,6 +7472,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8462,11 +8485,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8479,6 +8497,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9330,9 +9353,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9420,7 +9440,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11218,18 +11237,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12566,6 +12573,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12621,19 +12671,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12641,15 +12691,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14172,6 +14222,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14184,6 +14243,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14242,10 +14306,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14260,6 +14325,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/ur/LC_MESSAGES/djangojs.mo b/conf/locale/ur/LC_MESSAGES/djangojs.mo
index 195cc599e8..4771a34a94 100644
Binary files a/conf/locale/ur/LC_MESSAGES/djangojs.mo and b/conf/locale/ur/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ur/LC_MESSAGES/djangojs.po b/conf/locale/ur/LC_MESSAGES/djangojs.po
index cf83e988ce..a7cd60bcb7 100644
--- a/conf/locale/ur/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ur/LC_MESSAGES/djangojs.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/edx-platform/language/ur/)\n"
@@ -61,8 +61,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2143,153 +2141,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2948,6 +2799,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3257,10 +3112,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3363,6 +3214,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3647,6 +3502,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4589,6 +4458,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/uz/LC_MESSAGES/django.mo b/conf/locale/uz/LC_MESSAGES/django.mo
index 8b1ea7b062..239f72f03f 100644
Binary files a/conf/locale/uz/LC_MESSAGES/django.mo and b/conf/locale/uz/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/uz/LC_MESSAGES/django.po b/conf/locale/uz/LC_MESSAGES/django.po
index 00e7cd5eff..f31d04b22c 100644
--- a/conf/locale/uz/LC_MESSAGES/django.po
+++ b/conf/locale/uz/LC_MESSAGES/django.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-07-23 19:41+0000\n"
 "Last-Translator: Hamza Foziljonov <hamza.foziljonov@gmail.com>\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/edx-platform/language/uz/)\n"
@@ -105,14 +105,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -204,6 +196,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2210,6 +2203,47 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr ""
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2568,23 +2602,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2946,9 +2963,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4114,6 +4132,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5013,15 +5035,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5029,37 +5063,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5300,17 +5322,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5320,7 +5342,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5334,8 +5356,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6521,15 +6543,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6566,7 +6588,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6984,11 +7006,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr ""
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7149,6 +7166,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7451,6 +7469,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8457,11 +8480,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8474,6 +8492,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9325,9 +9348,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9415,7 +9435,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11211,18 +11230,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12559,6 +12566,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12614,19 +12664,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12634,15 +12684,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14165,6 +14215,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14177,6 +14236,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14235,10 +14299,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14253,6 +14318,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/uz/LC_MESSAGES/djangojs.mo b/conf/locale/uz/LC_MESSAGES/djangojs.mo
index e24dcbcdbe..d369472ff2 100644
Binary files a/conf/locale/uz/LC_MESSAGES/djangojs.mo and b/conf/locale/uz/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/uz/LC_MESSAGES/djangojs.po b/conf/locale/uz/LC_MESSAGES/djangojs.po
index 6a53dc4b51..cb967d8809 100644
--- a/conf/locale/uz/LC_MESSAGES/djangojs.po
+++ b/conf/locale/uz/LC_MESSAGES/djangojs.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/edx-platform/language/uz/)\n"
@@ -60,8 +60,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 #: cms/templates/js/add-xblock-component-menu-problem.underscore
 #: cms/templates/js/add-xblock-component-menu.underscore
 #: cms/templates/js/course_info_handouts.underscore
@@ -2123,152 +2121,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2927,6 +2779,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3229,10 +3085,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3335,6 +3187,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3617,6 +3473,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4558,6 +4428,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/vi/LC_MESSAGES/django.mo b/conf/locale/vi/LC_MESSAGES/django.mo
index 98865efd90..2f789fc90d 100644
Binary files a/conf/locale/vi/LC_MESSAGES/django.mo and b/conf/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/vi/LC_MESSAGES/django.po b/conf/locale/vi/LC_MESSAGES/django.po
index e8bd83758f..db52198202 100644
--- a/conf/locale/vi/LC_MESSAGES/django.po
+++ b/conf/locale/vi/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@
 # Ha Ngoc Chung <ngocchung75@gmail.com>, 2013
 # Nguyen Quang Huy <huynq23091@gmail.com>, 2013
 # hoad, 2013
-# HoaD, 2013
+# HoaD, 2013-2014
 # Hoàng Văn Quân, 2014
 # Hoang Ha <halink0803@gmail.com>, 2014
 # Hoàng Văn Quân, 2014
@@ -24,6 +24,7 @@
 # Anh Phan <vietnamesel10n@gmail.com>, 2013
 # Sarina Canelake <sarina@edx.org>, 2014
 # Hung The Hung <hoangthehung92@gmail.com>, 2013
+# vngocdiep <vngocdiep98@gmail.com>, 2014
 # #-#-#-#-#  django-studio.po (edx-platform)  #-#-#-#-#
 # edX translation file.
 # Copyright (C) 2014 EdX
@@ -118,8 +119,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-09-29 02:20+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: NGUYEN HOANG AN <neyugn2909@gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/edx-platform/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -185,14 +186,6 @@ msgstr "Đơn vị"
 msgid "You cannot create two cohorts with the same name"
 msgstr "Không thể tạo hai nhóm có cùng một tên."
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "Giấy Chứng Nhận Cam Kết Danh Dự"
@@ -285,6 +278,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2317,6 +2311,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "Về edX"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "Chung"
@@ -2680,23 +2714,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "Lỗi"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -3061,9 +3078,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4240,6 +4258,10 @@ msgstr ""
 "#-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#\n"
 "Phân Tích Truy Cập"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 msgid "Metrics"
 msgstr "Số liệu"
@@ -5166,15 +5188,27 @@ msgstr ""
 "Số tiền tính bởi bộ xử lý {0} {1} khác với tổng chi phí của đơn đặt hàng {2}"
 " {3}."
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5182,37 +5216,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5469,17 +5491,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5489,7 +5511,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5503,8 +5525,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6770,16 +6792,16 @@ msgid "Help"
 msgstr "Trợ Giúp"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
-msgstr "javascript:;Nâng cấp đăng ký cho {} | Chọn Hệ Khóa Học"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "Đăng ký {} | Chọn Hệ Khóa Học"
+msgid "Enroll In {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr "Rât tiếc, lỗi khi đăng ký cho bạn"
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -6823,8 +6845,8 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
-msgstr "Hủy Đăng Ký"
+msgid "Upgrade Your Enrollment"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Audit This Course"
@@ -7275,11 +7297,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr "Thông Tin Về Công Ty"
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "Về edX"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr "Tin Tức"
@@ -7456,6 +7473,7 @@ msgstr "Bao gồm các thông báo lỗi, các bước dẫn đến vấn đề
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "Gửi"
 
@@ -7783,6 +7801,11 @@ msgstr "Dữ liệu thô:"
 msgid "Accepted"
 msgstr "Được chấp thuận"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "Lỗi"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "Bị từ chối"
@@ -8820,13 +8843,6 @@ msgstr "Xem Chương Trình Học"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "Khoá học này nằm trong <a href=\"{cart_link}\">giỏ hàng của bạn</a>."
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"Thêm {course.display_number_with_default} vào Giỏ Hàng "
-"({currency_symbol}{cost})"
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "Khóa học đã đầy"
@@ -8839,6 +8855,13 @@ msgstr "Chỉ có thể ghi danh vào khóa học này qua thư mời."
 msgid "Enrollment is Closed"
 msgstr " Đã Đóng Ghi Danh."
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"Thêm {course.display_number_with_default} vào Giỏ Hàng "
+"({currency_symbol}{cost})"
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "Đăng ký {course.display_number_with_default}"
@@ -9734,9 +9757,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9824,7 +9844,6 @@ msgstr "Xem Lưu Trữ Khóa Học"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "Xem Khóa Học"
 
@@ -11624,18 +11643,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12977,6 +12984,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -13034,19 +13084,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -13054,15 +13104,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14596,6 +14646,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14608,6 +14667,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14666,10 +14730,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14684,6 +14749,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/vi/LC_MESSAGES/djangojs.mo b/conf/locale/vi/LC_MESSAGES/djangojs.mo
index 02807a1a23..ca5af1f224 100644
Binary files a/conf/locale/vi/LC_MESSAGES/djangojs.mo and b/conf/locale/vi/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/vi/LC_MESSAGES/djangojs.po b/conf/locale/vi/LC_MESSAGES/djangojs.po
index 4339bc49f8..1ad755b58e 100644
--- a/conf/locale/vi/LC_MESSAGES/djangojs.po
+++ b/conf/locale/vi/LC_MESSAGES/djangojs.po
@@ -10,7 +10,7 @@
 # Ha Ngoc Chung <ngocchung75@gmail.com>, 2013
 # Nguyen Quang Huy <huynq23091@gmail.com>, 2013-2014
 # hoad, 2013
-# HoaD, 2013
+# HoaD, 2013-2014
 # Hoang Ha <halink0803@gmail.com>, 2014
 # Minh Tue Vo <mvo@edx.org>, 2014
 # Ha Ngoc Chung <ngocchung75@gmail.com>, 2013
@@ -61,7 +61,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-18 07:50+0000\n"
 "Last-Translator: Doan Viet Hung <viethung.doan@gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/edx-platform/language/vi/)\n"
@@ -93,8 +93,6 @@ msgstr "OK"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
@@ -2132,161 +2130,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "Có sẵn %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-"Đây là danh sách %s có sẵn. Bạn có thể lựa chọn bằng cách chọn chúng trong "
-"hộp dưới đây rồi nhấn vào mũi tên \"Chọn\" giữa hai hộp."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "Gõ vào ô này để lọc ra danh sách %s có sẵn."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "Lọc"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "Chọn tất cả"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "Nhấn vào đây để chọn tất cả %s cùng một lúc."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "Chọn"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "Loại bỏ"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "%s đã được chọn"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-"Đây là danh sách %s đã lựa chọn. Bạn có thể loại bỏ một số bằng cách chọn "
-"chúng ở ô bên dưới và sau đó nhấp vào mũi tên \"Loại Bỏ\" giữa hai hộp."
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "Loại bỏ tất cả"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "Nhấn để loại bỏ tất cả %s đã chọn cùng một lúc."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(sel)s của %(cnt)s đã chọn"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-"Bạn chưa lưu thay đổi trong các mục chỉnh sửa cá nhân. Nếu bạn chạy một tác "
-"vụ, những thay đổi  chưa lưu sẽ bị mất."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-"Bạn đã chọn một tác vụ, nhưng bạn chưa lưu những thay đổi của bạn trong mục "
-"cá nhân. Hãy nhấn OK để lưu. Bạn sẽ cần chạy lại tác vụ."
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-"Tháng 1|Tháng 2|Tháng 3|Tháng 4|Tháng 5|Tháng 6|Tháng 7|Tháng 8|Tháng "
-"9|Tháng 10|Tháng 11|Tháng 12"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "CN|T2|T3|T4|T5|T6|T7"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "Hiện"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "Ẩn"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "Chủ Nhật|Thứ 2|Thứ 3|Thứ 4|Thứ 5|Thứ 6|Thứ 7"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "Bây giờ"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "Đồng hồ"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "Chọn thời gian"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "Nửa đêm"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "6h sáng"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "Giữa trưa"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "Hôm nay"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "Lịch"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "Hôm qua"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "Ngày mai"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2944,6 +2787,10 @@ msgstr "Tiêu đề"
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3248,10 +3095,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3356,6 +3199,10 @@ msgstr ""
 msgid "or"
 msgstr "hoặc"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "Khoá học phải ấn định ngày bắt đầu."
@@ -3641,6 +3488,20 @@ msgstr "Thiết lập"
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -3695,27 +3556,28 @@ msgstr ""
 
 #: cms/static/js/views/pages/container_subviews.js
 msgid "Publishing&hellip;"
-msgstr ""
+msgstr "Xuất bản&hellip;"
 
 #: cms/static/js/views/pages/container_subviews.js
 #: cms/static/js/views/pages/container_subviews.js
-#: cms/templates/js/publish-xblock.underscore
 msgid "Discard Changes"
-msgstr ""
+msgstr "Xóa Thay Đổi"
 
 #: cms/static/js/views/pages/container_subviews.js
 msgid ""
 "Are you sure you want to revert to the last published version of the unit? "
 "You cannot undo this action."
 msgstr ""
+"Bạn chắc chắn muốn trở lại phiên bản trước của bài học? Bạn sẽ không thể "
+"hoàn tác bước này."
 
 #: cms/static/js/views/pages/container_subviews.js
 msgid "Discarding Changes&hellip;"
-msgstr ""
+msgstr "Xóa Thay đổi&hellip;"
 
 #: cms/static/js/views/pages/container_subviews.js
 msgid "Hiding from Students&hellip;"
-msgstr ""
+msgstr "Ẩn đổi với Học viên&hellip;"
 
 #: cms/static/js/views/pages/container_subviews.js
 msgid "Explicitly Hiding from Students&hellip;"
@@ -3728,7 +3590,7 @@ msgstr ""
 #: cms/static/js/views/pages/container_subviews.js
 #: cms/static/js/views/pages/container_subviews.js
 msgid "Make Visible to Students"
-msgstr ""
+msgstr "Hiện đối với Học Viên"
 
 #: cms/static/js/views/pages/container_subviews.js
 msgid ""
@@ -4586,6 +4448,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.mo b/conf/locale/zh_CN/LC_MESSAGES/django.mo
index f3bd9db8ec..eb0678262b 100644
Binary files a/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/conf/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.po b/conf/locale/zh_CN/LC_MESSAGES/django.po
index c33fb959c8..3f3ae7a717 100644
--- a/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -203,8 +203,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: wuqiong <wuqiong417@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/edx-platform/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -260,14 +260,6 @@ msgstr "单元"
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "诚信准则证书"
@@ -358,6 +350,7 @@ msgstr "小学"
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr "无"
 
@@ -2365,6 +2358,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "关于我们"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr "一般"
@@ -2723,18 +2756,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "错误"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -3101,9 +3122,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4271,6 +4293,10 @@ msgstr "数据下载"
 msgid "Analytics"
 msgstr "分析"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
 msgstr "度量"
@@ -5183,86 +5209,54 @@ msgid ""
 " of the order {2} {3}."
 msgstr "付款处理器收取的总金额 {0} {1} 与订单总金额 {2} {3} 不一致。"
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
+
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
 "\n"
-"<p class=\"error_msg\">\n"
-"抱歉! 支付系统处理没有受理你的缴费申请。\n"
-"答复是： <span class=\"decision\">{decision}</span>，\n"
-"原因为 <span class=\"reason\">{reason_code}:{reason_msg}</span>。\n"
-"您尚未缴费，请尝试其他支付形式。\n"
-"相关问题请联系 {email}。\n"
-"</p> \n"
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
 "            "
+msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"抱歉! 支付系统返回的支付确认数据不一致。\n"
-"无法确认支付成功并进一步处理您的订单，我们深表歉意。\n"
-"具体的错误信息为：<span class=\"exception_msg\">{msg}</span>\n"
-"您的信用卡可能已经被扣费了。相关问题请联系{email}。\n"
-"</p>\n"
-"                "
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"抱歉！实际扣费金额与订单总额不符！\n"
-"具体的错误信息为: <span class=\"exception_msg\">{msg}</span>。\n"
-"您的信用卡可能已被扣费。相关问题请联系{email}。\n"
-"</p>\n"
-"                "
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-"\n"
-"<p class=\"error_msg\">\n"
-"抱歉! 支付系统返回信息受损，无法正确解析系统返回结果。\n"
-"具体的错误信息为： <span class=\"exception_msg\">{msg}</span>。\n"
-"无法验证扣费成功，也不能进一步处理您的订单，对此我们深表歉意。\n"
-"您的信用卡可能已被扣费。相关问题请联系 {email}。\n"
-"</p>\n"
-"                "
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -5555,17 +5549,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5575,7 +5569,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5589,8 +5583,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6809,16 +6803,16 @@ msgid "Help"
 msgstr "帮助"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
-msgstr "更新您的注册到 {} | 选择您的学习轨道"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "注册到 {} | 选择学习轨道"
+msgid "Enroll In {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr "对不起，当尝试注册时发生错误"
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -6856,8 +6850,8 @@ msgid "):"
 msgstr ")："
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
-msgstr "更新您的登记"
+msgid "Upgrade Your Enrollment"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Audit This Course"
@@ -7278,11 +7272,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "关于我们"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7447,6 +7436,7 @@ msgstr "附上错误消息以及导致错误的步骤等"
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "提交"
 
@@ -7758,6 +7748,11 @@ msgstr "原始数据："
 msgid "Accepted"
 msgstr "通过"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "错误"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "拒绝"
@@ -8777,12 +8772,6 @@ msgstr "进入课程页面"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "这个课程已经进入您的 <a href=\"{cart_link}\">购物车</a>。"
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"添加 {course.display_number_with_default} 到购物车 ({currency_symbol}{cost})"
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "该课程已满"
@@ -8795,6 +8784,12 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"添加 {course.display_number_with_default} 到购物车 ({currency_symbol}{cost})"
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "注册{course.display_number_with_default}"
@@ -9657,9 +9652,6 @@ msgstr "登记为："
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr "已验证"
 
@@ -9749,7 +9741,6 @@ msgstr "查看存档的课程"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "查看课程"
 
@@ -11569,18 +11560,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr "成绩分布"
@@ -12934,6 +12913,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr "编辑你的名字"
@@ -12989,19 +13011,19 @@ msgid ""
 msgstr "请阅读 {a_start}我们FAQs中关于认证的问题与评论{a_end}."
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
-msgstr "更新您的注册信息于"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
-msgstr "您正在重新审核"
+msgid "You are re-verifying for {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
-msgstr "你注册到"
+msgid "You are enrolling in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -13009,16 +13031,16 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
-msgstr "升级成："
+msgid "{span_start}Upgrading to:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
-msgstr "重审中"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
-msgstr "注册为:"
+msgid "{span_start}Enrolling as:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
 msgid "Technical Requirements"
@@ -14549,6 +14571,15 @@ msgstr ""
 "您可以导出课程并在Studio之外编辑它们。导出的文件是.tar.gz类型的文件 (使用GNU "
 "Zip压缩格式的.tar文件)，包含课程结构和内容。您也可以再次导入这些导出的课程。"
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr "导出我的课程内容"
@@ -14561,6 +14592,11 @@ msgstr "导出课程内容"
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr "随课程{em_start} 导出 {em_end} 数据："
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr "课程内容 (所有章节，小节和单元)"
@@ -14619,11 +14655,12 @@ msgstr "哪些内容被导出了？"
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
-msgstr "只有课程内容和结构(包括章，节，单元)被导出了。其它数据，包括学生数据，分数信息，讨论数据，课程设置的课程团队信息将不会被导出。"
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
+msgstr ""
 
 #: cms/templates/export.html
 msgid "Opening the downloaded file"
@@ -14637,6 +14674,10 @@ msgid ""
 " content."
 msgstr "使用档案工具解压.tar.gz中的文件。解压后的数据包含coursex.xml，还有一些子目录，存放了课程内容。"
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr "导出课程到Git"
diff --git a/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo b/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo
index f0da88df64..8a9d1a34de 100644
Binary files a/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo and b/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
index bc66a57d88..e5de55fe86 100644
--- a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
+++ b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
@@ -90,7 +90,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/edx-platform/language/zh_CN/)\n"
@@ -122,8 +122,6 @@ msgstr "是的"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "取消"
 
@@ -2130,151 +2128,6 @@ msgstr "回复"
 msgid "Tags:"
 msgstr "标签："
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "可用 %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr "这是可用%s的列表。您可以在下面的方框中进行选择，然后点击两个方框中间的“选择”箭头。"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "在方框中输入信息以过滤可用%s列表。"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "过滤"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "全部选择"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "全选%s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "选择"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "移除"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "%s被选中"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr "这是被选中的%s的列表。您可以在下面的方框中选择需要移除的项，然后点击两个方框中间的“移除”箭头。"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "全部移除"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "点击以一次移除全部所选的%s"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(cnt)s的%(sel)s被选中"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr "在个别可编辑的字段有未保存的更改。如果您执行操作，这些未保存的更改将丢失。"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr "您已经选择一个操作，但是并未保存对字段进行的更改。请点击“确定”来保存。您需要再次运行该操作。"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr "您已经选择了一个操作并且未对单独的字段做任何更改。您可“继续”而无需执行“保存”。"
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr "一月|二月|三月|四月|五月|六月|七月|八月|九月|十月|十一月|十二月"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "日|一|二|三|四|五|六"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "显示"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "隐藏"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "星期日|星期一|星期二|星期三|星期四|星期五|星期六"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "现在"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "时钟"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "选择时间"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "午夜"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "上午六点"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "中午"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "今天"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "日历"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "昨天"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "明天"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "打开计算器"
@@ -2943,6 +2796,10 @@ msgstr "标题"
 msgid "You have been logged out of your edX account. "
 msgstr "您已从您的 edX  账户登出。"
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr "未知错误。"
@@ -3245,10 +3102,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3351,6 +3204,10 @@ msgstr "只有 <%= fileTypes %> 格式的文件可以上传。请选择一个以
 msgid "or"
 msgstr "或者"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "课程必须指定开始日期。"
@@ -3632,6 +3489,20 @@ msgstr "设置"
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4573,6 +4444,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/zh_HK/LC_MESSAGES/django.mo b/conf/locale/zh_HK/LC_MESSAGES/django.mo
index 3cb60afa45..a05e58fab1 100644
Binary files a/conf/locale/zh_HK/LC_MESSAGES/django.mo and b/conf/locale/zh_HK/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/zh_HK/LC_MESSAGES/django.po b/conf/locale/zh_HK/LC_MESSAGES/django.po
index bfe17c51d3..59bcea54db 100644
--- a/conf/locale/zh_HK/LC_MESSAGES/django.po
+++ b/conf/locale/zh_HK/LC_MESSAGES/django.po
@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
 "PO-Revision-Date: 2014-08-25 20:21+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/edx-platform/language/zh_HK/)\n"
@@ -107,14 +107,6 @@ msgstr ""
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr ""
@@ -206,6 +198,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2212,6 +2205,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "關於"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2570,23 +2603,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr ""
-
-#. #-#-#-#-#  django-partial.po (edx-platform)  #-#-#-#-#
-#. Translators: This message will be added to the front of messages of type
-#. error,
-#. e.g. "Error: required field is missing".
-#: common/lib/xmodule/xmodule/split_test_module.py
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr ""
@@ -2948,9 +2964,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4112,6 +4129,10 @@ msgstr ""
 msgid "Analytics"
 msgstr ""
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5010,15 +5031,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr ""
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5026,37 +5059,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5297,17 +5318,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5317,7 +5338,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5331,8 +5352,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6515,15 +6536,15 @@ msgid "Help"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
+msgid "Enroll In {} | Choose Your Track"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
+msgid "Sorry, there was an error when trying to enroll you"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6560,7 +6581,7 @@ msgid "):"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
+msgid "Upgrade Your Enrollment"
 msgstr ""
 
 #: common/templates/course_modes/choose.html
@@ -6978,11 +6999,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "關於"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7143,6 +7159,7 @@ msgstr ""
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr ""
 
@@ -7445,6 +7462,11 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr ""
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr ""
@@ -8451,11 +8473,6 @@ msgstr ""
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr ""
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8468,6 +8485,11 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr ""
@@ -9319,9 +9341,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9409,7 +9428,6 @@ msgstr ""
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr ""
 
@@ -11205,18 +11223,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr ""
@@ -12553,6 +12559,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr ""
@@ -12608,19 +12657,19 @@ msgid ""
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
+msgid "You are enrolling in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12628,15 +12677,15 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Re-verifying for:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
+msgid "{span_start}Enrolling as:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
@@ -14159,6 +14208,15 @@ msgid ""
 "you've exported."
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr ""
@@ -14171,6 +14229,11 @@ msgstr ""
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr ""
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr ""
@@ -14229,10 +14292,11 @@ msgstr ""
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
 msgstr ""
 
 #: cms/templates/export.html
@@ -14247,6 +14311,10 @@ msgid ""
 " content."
 msgstr ""
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/zh_HK/LC_MESSAGES/djangojs.mo b/conf/locale/zh_HK/LC_MESSAGES/djangojs.mo
index b7fc0a3450..60b4f3900d 100644
Binary files a/conf/locale/zh_HK/LC_MESSAGES/djangojs.mo and b/conf/locale/zh_HK/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/zh_HK/LC_MESSAGES/djangojs.po b/conf/locale/zh_HK/LC_MESSAGES/djangojs.po
index 4a0bd53c65..7712fd9367 100644
--- a/conf/locale/zh_HK/LC_MESSAGES/djangojs.po
+++ b/conf/locale/zh_HK/LC_MESSAGES/djangojs.po
@@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-08 18:08+0000\n"
 "Last-Translator: Sarina Canelake <sarina@edx.org>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/edx-platform/language/zh_HK/)\n"
@@ -62,8 +62,6 @@ msgstr ""
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "取消"
 
@@ -2111,151 +2109,6 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr ""
-
-#: cms/templates/js/video/metadata-translations-item.underscore
-msgid "Remove"
-msgstr "移除"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr ""
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr ""
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr ""
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr ""
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "日|一|二|三|四|五|六"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr ""
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr ""
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "週日|週一|週二|週三|週四|週五|週六"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr ""
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr ""
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr ""
@@ -2913,6 +2766,10 @@ msgstr ""
 msgid "You have been logged out of your edX account. "
 msgstr ""
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr ""
@@ -3215,10 +3072,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3321,6 +3174,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr ""
@@ -3603,6 +3460,20 @@ msgstr ""
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4544,6 +4415,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr "移除"
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/conf/locale/zh_TW/LC_MESSAGES/django.mo b/conf/locale/zh_TW/LC_MESSAGES/django.mo
index 8f8f0b93ec..1e9af1e5fb 100644
Binary files a/conf/locale/zh_TW/LC_MESSAGES/django.mo and b/conf/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/zh_TW/LC_MESSAGES/django.po b/conf/locale/zh_TW/LC_MESSAGES/django.po
index dd5bc83939..66c0820c2c 100644
--- a/conf/locale/zh_TW/LC_MESSAGES/django.po
+++ b/conf/locale/zh_TW/LC_MESSAGES/django.po
@@ -106,8 +106,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:50-0400\n"
-"PO-Revision-Date: 2014-08-25 20:21+0000\n"
+"POT-Creation-Date: 2014-11-10 09:08-0500\n"
+"PO-Revision-Date: 2014-10-27 15:11+0000\n"
 "Last-Translator: LIU,SHU-HAO <jeremy55662004@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/edx-platform/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -166,14 +166,6 @@ msgstr "單元"
 msgid "You cannot create two cohorts with the same name"
 msgstr ""
 
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be numeric"
-msgstr ""
-
-#: common/djangoapps/course_groups/views.py
-msgid "Requested page must be greater than zero"
-msgstr ""
-
 #: common/djangoapps/course_modes/models.py
 msgid "Honor Code Certificate"
 msgstr "榮譽證書"
@@ -252,11 +244,11 @@ msgstr "副學士學位"
 
 #: common/djangoapps/student/models.py
 msgid "Secondary/high school"
-msgstr ""
+msgstr "高中"
 
 #: common/djangoapps/student/models.py
 msgid "Junior secondary/junior high/middle school"
-msgstr ""
+msgstr "國中"
 
 #: common/djangoapps/student/models.py
 msgid "Elementary/primary school"
@@ -264,6 +256,7 @@ msgstr ""
 
 #. Translators: 'None' refers to the student's level of education
 #: common/djangoapps/student/models.py
+#: common/lib/xmodule/xmodule/course_module.py
 msgid "None"
 msgstr ""
 
@@ -2269,6 +2262,46 @@ msgstr ""
 msgid "Invitation Only"
 msgstr ""
 
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Name"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Name of SurveyForm to display as a pre-course survey to the user."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Pre-Course Survey Required"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Specify whether students must complete a survey before they can view your "
+"course content. If you set this value to true, you must add a name for the "
+"survey to the Course Survey Name setting above."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Course Visibility In Catalog"
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid ""
+"Defines the access permissions for showing the course in the course catalog."
+" This can be set to one of three values: 'both' (show in catalog and allow "
+"access to about page), 'about' (only allow access to about page), 'none' (do"
+" not show in catalog and do not allow access to an about page)."
+msgstr ""
+
+#: common/lib/xmodule/xmodule/course_module.py
+msgid "Both"
+msgstr ""
+
+#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
+#: lms/templates/footer.html
+msgid "About"
+msgstr "關於"
+
 #: common/lib/xmodule/xmodule/course_module.py
 msgid "General"
 msgstr ""
@@ -2629,18 +2662,6 @@ msgstr ""
 msgid "Group ID {group_id}"
 msgstr ""
 
-#. Translators: This message will be added to the front of messages of type
-#. warning,
-#. e.g. "Warning: this component has not been configured yet".
-#: common/lib/xmodule/xmodule/split_test_module.py
-msgid "Warning"
-msgstr "警告"
-
-#: lms/templates/name_changes.html lms/templates/name_changes.html
-#: lms/templates/sysadmin_dashboard_gitlogs.html
-msgid "Error"
-msgstr "錯誤"
-
 #: common/lib/xmodule/xmodule/split_test_module.py
 msgid "Not Selected"
 msgstr "未選取"
@@ -3007,9 +3028,10 @@ msgstr ""
 
 #: common/lib/xmodule/xmodule/modulestore/inheritance.py
 msgid ""
-"Enter true or false. If true, problems default to displaying a 'Reset' "
-"button. This value may be overriden in each problem's settings. Existing "
-"problems whose reset setting have not been changed are affected."
+"Enter true or false. If true, problems in the course default to always "
+"displaying a 'Reset' button. You can override this in each problem's "
+"settings. All existing problems are affected when this course-wide setting "
+"is changed."
 msgstr ""
 
 #. Translators: "Self" is used to denote an openended response that is self-
@@ -4165,6 +4187,10 @@ msgstr "資料下載"
 msgid "Analytics"
 msgstr "分析"
 
+#: lms/djangoapps/instructor/views/instructor_dashboard.py
+msgid "Demographic data is now available in {dashboard_link}."
+msgstr ""
+
 #: lms/djangoapps/instructor/views/instructor_dashboard.py
 #: lms/templates/courseware/instructor_dashboard.html
 msgid "Metrics"
@@ -5071,15 +5097,27 @@ msgid ""
 " of the order {2} {3}."
 msgstr "處理器收取的金額 {0} {1} 與訂單中的總消費 {2} {3} 不一致。"
 
+#: lms/djangoapps/shoppingcart/processors/CyberSource.py
+msgid ""
+"\n"
+"        <p class=\"error_msg\">\n"
+"        Sorry! Our payment processor did not accept your payment.\n"
+"        The decision they returned was <span class=\"decision\">{decision}</span>,\n"
+"        and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
+"        You were not charged. Please try a different form of payment.\n"
+"        Contact us with payment-related questions at {email}.\n"
+"        </p>\n"
+"        "
+msgstr ""
+
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
 "            <p class=\"error_msg\">\n"
-"            Sorry! Our payment processor did not accept your payment.\n"
-"            The decision they returned was <span class=\"decision\">{decision}</span>,\n"
-"            and the reason was <span class=\"reason\">{reason_code}:{reason_msg}</span>.\n"
-"            You were not charged. Please try a different form of payment.\n"
-"            Contact us with payment-related questions at {email}.\n"
+"            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
 "            </p>\n"
 "            "
 msgstr ""
@@ -5087,37 +5125,25 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
 msgid ""
 "\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Due to an error your purchase was charged for a different amount than the order total!\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
-msgstr ""
-
-#: lms/djangoapps/shoppingcart/processors/CyberSource.py
-msgid ""
-"\n"
-"                <p class=\"error_msg\">\n"
-"                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
-"                unable to validate that the message actually came from the payment processor.\n"
-"                The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
-"                We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
-"                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
-"                </p>\n"
-"                "
+"            <p class=\"error_msg\">\n"
+"            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are\n"
+"            unable to validate that the message actually came from the payment processor.\n"
+"            The specific error message is: <span class=\"exception_msg\">{msg}</span>.\n"
+"            We apologize that we cannot verify whether the charge went through and take further action on your order.\n"
+"            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.\n"
+"            </p>\n"
+"            "
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -5358,17 +5384,17 @@ msgstr ""
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Our payment processor sent us back a payment confirmation that had "
-"inconsistent data!  We apologize that we cannot verify whether the charge "
-"went through and take further action on your order.  The specific error "
-"message is: {msg}  Your credit card may possibly have been charged.  Contact"
-" us with payment-specific questions at {email}."
+"inconsistent data! We apologize that we cannot verify whether the charge "
+"went through and take further action on your order. The specific error "
+"message is: {msg} Your credit card may possibly have been charged.  Contact "
+"us with payment-specific questions at {email}."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
 "Sorry! Due to an error your purchase was charged for a different amount than"
-" the order total!  The specific error message is: {msg}.  Your credit card "
-"has probably been charged. Contact us with payment-specific questions at "
+" the order total! The specific error message is: {msg}. Your credit card has"
+" probably been charged. Contact us with payment-specific questions at "
 "{email}."
 msgstr ""
 
@@ -5378,7 +5404,7 @@ msgid ""
 " charge, so we are unable to validate that the message actually came from "
 "the payment processor. The specific error message is: {msg}. We apologize "
 "that we cannot verify whether the charge went through and take further "
-"action on your order. Your credit card may possibly have been charged.  "
+"action on your order. Your credit card may possibly have been charged. "
 "Contact us with payment-specific questions at {email}."
 msgstr ""
 
@@ -5392,8 +5418,8 @@ msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
 msgid ""
-"Sorry!  Your payment could not be processed because an unexpected exception "
-"occurred.  Please contact us at {email} for assistance."
+"Sorry! Your payment could not be processed because an unexpected exception "
+"occurred. Please contact us at {email} for assistance."
 msgstr ""
 
 #: lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -6601,16 +6627,16 @@ msgid "Help"
 msgstr "幫助"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration for {} | Choose Your Track"
-msgstr "更新您的註冊到 {} |  選擇您的追蹤"
+msgid "Upgrade Your Enrollment for {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Register for {} | Choose Your Track"
-msgstr "註冊 for {} | 選擇您的追蹤"
+msgid "Enroll In {} | Choose Your Track"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
-msgid "Sorry, there was an error when trying to register you"
-msgstr "很抱歉，當要為您註冊時發生錯誤。"
+msgid "Sorry, there was an error when trying to enroll you"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Now choose your course track:"
@@ -6646,8 +6672,8 @@ msgid "):"
 msgstr "):"
 
 #: common/templates/course_modes/choose.html
-msgid "Upgrade Your Registration"
-msgstr "更新您的註冊"
+msgid "Upgrade Your Enrollment"
+msgstr ""
 
 #: common/templates/course_modes/choose.html
 msgid "Audit This Course"
@@ -7066,11 +7092,6 @@ msgstr ""
 msgid "About & Company Info"
 msgstr ""
 
-#: lms/templates/footer-edx-new.html lms/templates/footer-legacy.html
-#: lms/templates/footer.html
-msgid "About"
-msgstr "關於"
-
 #: lms/templates/footer-edx-new.html lms/templates/footer.html
 msgid "News"
 msgstr ""
@@ -7234,6 +7255,7 @@ msgstr "附上錯誤消息以及導致錯誤的步驟等"
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/instructor/staff_grading.html
 #: lms/templates/peer_grading/peer_grading_problem.html
+#: lms/templates/survey/survey.html
 msgid "Submit"
 msgstr "提交"
 
@@ -7544,6 +7566,11 @@ msgstr "原始資料："
 msgid "Accepted"
 msgstr "接受"
 
+#: lms/templates/name_changes.html lms/templates/name_changes.html
+#: lms/templates/sysadmin_dashboard_gitlogs.html
+msgid "Error"
+msgstr "錯誤"
+
 #: lms/templates/name_changes.html
 msgid "Rejected"
 msgstr "拒絕"
@@ -8563,12 +8590,6 @@ msgstr "檢視課程"
 msgid "This course is in your <a href=\"{cart_link}\">cart</a>."
 msgstr "這個課程在您的 <a href=\"{cart_link}\">cart</a>."
 
-#: lms/templates/courseware/course_about.html
-msgid ""
-"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-msgstr ""
-"新增 {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
-
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr ""
@@ -8581,6 +8602,12 @@ msgstr ""
 msgid "Enrollment is Closed"
 msgstr ""
 
+#: lms/templates/courseware/course_about.html
+msgid ""
+"Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+msgstr ""
+"新增 {course.display_number_with_default} to Cart ({currency_symbol}{cost})"
+
 #: lms/templates/courseware/course_about.html
 msgid "Register for {course.display_number_with_default}"
 msgstr "註冊{course.display_number_with_default}"
@@ -9436,9 +9463,6 @@ msgstr "登記為："
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/instructor/instructor_dashboard_2/course_info.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
-#: lms/templates/verify_student/_verification_header.html
 msgid "Verified"
 msgstr ""
 
@@ -9526,7 +9550,6 @@ msgstr "查看已存檔的課程"
 
 #: lms/templates/dashboard/_dashboard_course_listing.html
 #: lms/templates/dashboard/_dashboard_course_listing.html
-#: lms/templates/shoppingcart/receipt.html
 msgid "View Course"
 msgstr "檢視課程"
 
@@ -11325,18 +11348,6 @@ msgstr ""
 msgid "Send me a copy of the invoice"
 msgstr ""
 
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid "Active Students"
-msgstr ""
-
-#: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
-msgid ""
-"The count of students who interacted at least once by opening pages, playing"
-" videos, posting in discussions, submitting problems, or completing other "
-"activities. The date range includes all activities from midnight on the "
-"start date (inclusive) though midnight on the end date (exclusive)."
-msgstr ""
-
 #: lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
 msgid "Score Distribution"
 msgstr "成績分布"
@@ -12692,6 +12703,49 @@ msgstr ""
 msgid "Student Profile"
 msgstr ""
 
+#: lms/templates/survey/survey.html
+msgid "User Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Pre-Course Survey"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"You can begin your course as soon as you complete the following form. "
+"Required fields are marked with an asterisk (*)."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "You are missing the following required fields:"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Cancel and Return to Dashboard"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Why do I need to complete this information?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"We use the information you provide to improve our course for both current "
+"and future students. The more we know about your specific needs, the better "
+"we can make your course experience."
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid "Who can I contact if I have questions?"
+msgstr ""
+
+#: lms/templates/survey/survey.html
+msgid ""
+"If you have any questions about this course or this form, you can contact <a"
+" href=\"{mail_to_link}\"\">{mail_to_link}</a>."
+msgstr ""
+
 #: lms/templates/verify_student/_modal_editname.html
 msgid "Edit Your Name"
 msgstr "編輯您的姓名"
@@ -12749,19 +12803,19 @@ msgstr ""
 "certificates{a_end}."
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are upgrading your registration for"
+msgid "You are upgrading your enrollment for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are re-verifying for"
+msgid "You are re-verifying for {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "You are registering for"
-msgstr "您正在註冊為"
+msgid "You are enrolling in {organization}'s {course_name}"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Congrats! You are now registered to audit"
+msgid "Congrats! You are now enrolled in {organization}'s {course_name}"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
@@ -12769,16 +12823,16 @@ msgid "Professional Education"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Upgrading to:"
-msgstr "升級成："
-
-#: lms/templates/verify_student/_verification_header.html
-msgid "Re-verifying for:"
+msgid "{span_start}Upgrading to:{span_end} Verified"
 msgstr ""
 
 #: lms/templates/verify_student/_verification_header.html
-msgid "Registering as: "
-msgstr "註冊："
+msgid "{span_start}Re-verifying for:{span_end} Verified"
+msgstr ""
+
+#: lms/templates/verify_student/_verification_header.html
+msgid "{span_start}Enrolling as:{span_end} Verified"
+msgstr ""
 
 #: lms/templates/verify_student/_verification_support.html
 msgid "Technical Requirements"
@@ -14307,6 +14361,15 @@ msgstr ""
 "您可以在Studio之外匯出課程並且編輯它們。匯出的檔案會是一個 .tar.gz 的檔案 (即 .tar 檔案再以 GNU Zip "
 "壓縮)，其中包含的課程結構以及內容。您也可以重新匯入已經匯出的課程。"
 
+#: cms/templates/export.html
+msgid ""
+"{em_start}Caution:{em_end} When you export a course, information such as "
+"MATLAB API keys, LTI passports, annotation secret token strings, and "
+"annotation storage URLs are included in the exported data. If you share your"
+" exported files, you may also be sharing sensitive or license-specific "
+"information."
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Export My Course Content"
 msgstr "匯出我的課程內容"
@@ -14319,6 +14382,11 @@ msgstr "匯出課程內容"
 msgid "Data {em_start}exported with{em_end} your course:"
 msgstr "資料 {em_start} 匯出 {em_end} 您的課程："
 
+#: cms/templates/export.html
+msgid ""
+"Values from Advanced Settings, including MATLAB API keys and LTI passports"
+msgstr ""
+
 #: cms/templates/export.html
 msgid "Course Content (all Sections, Sub-sections, and Units)"
 msgstr "課程內容 (所有章節、小節以及單元)"
@@ -14379,11 +14447,12 @@ msgstr "什麼內容被匯出?"
 
 #: cms/templates/export.html
 msgid ""
-"Only the course content and structure (including sections, subsections, and "
-"units) are exported. Other data, including student data, grading "
-"information, discussion forum data, course settings, and course team "
-"information, is not exported."
-msgstr "只有課程內容和架構(包括章節、小節、單元)被匯出。其他的資料，包括學生資料、評分資訊、討論區資料、課程設定或者課程團隊資訊將不會被匯出。"
+"The course content and structure (including sections, subsections, and "
+"units) are exported. Values from Advanced Settings, including MATLAB API "
+"keys and LTI passports, are also exported. Other data, including student "
+"data, grading information, discussion forum data, course settings, and "
+"course team information, is not exported."
+msgstr ""
 
 #: cms/templates/export.html
 msgid "Opening the downloaded file"
@@ -14399,6 +14468,10 @@ msgstr ""
 "使用一個壓縮程式從 .tar.gz 檔案提取資料。\n"
 "提取後的資料包括課程的 .xml 檔案，還有一些存放課程內容的子目錄。"
 
+#: cms/templates/export.html
+msgid "Learn more about exporting a course"
+msgstr ""
+
 #: cms/templates/export_git.html
 msgid "Export Course to Git"
 msgstr ""
diff --git a/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo b/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo
index 27e1b0b011..8589287e62 100644
Binary files a/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo and b/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/zh_TW/LC_MESSAGES/djangojs.po b/conf/locale/zh_TW/LC_MESSAGES/djangojs.po
index 2be9e8c07b..752145b779 100644
--- a/conf/locale/zh_TW/LC_MESSAGES/djangojs.po
+++ b/conf/locale/zh_TW/LC_MESSAGES/djangojs.po
@@ -69,7 +69,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-10-27 10:49-0400\n"
+"POT-Creation-Date: 2014-11-10 09:06-0500\n"
 "PO-Revision-Date: 2014-10-15 15:41+0000\n"
 "Last-Translator: Xaver Y.R. Chen <yrchen@atcity.org>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/edx-platform/language/zh_TW/)\n"
@@ -101,8 +101,6 @@ msgstr "好的"
 #: cms/static/js/views/modals/course_outline_modals.js
 #: cms/static/js/views/utils/view_utils.js
 #: common/lib/xmodule/xmodule/js/src/html/edit.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
 msgid "Cancel"
 msgstr "取消"
 
@@ -2117,151 +2115,6 @@ msgstr "回覆"
 msgid "Tags:"
 msgstr "標籤︰"
 
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Available %s"
-msgstr "可用 %s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of available %s. You may choose some by selecting them in "
-"the box below and then clicking the \"Choose\" arrow between the two boxes."
-msgstr "這是可用%s的列表。您可以在下面的方框中進行選擇，然後點擊兩個方框中間的“選擇”箭頭。"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Type into this box to filter down the list of available %s."
-msgstr "在方框中輸入資訊以過濾可用的%s列表。"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Filter"
-msgstr "過濾"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose all"
-msgstr "全部選擇"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to choose all %s at once."
-msgstr "單擊以選擇全部的%s"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Choose"
-msgstr "選擇"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove"
-msgstr "移除"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Chosen %s"
-msgstr "%s被選中"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid ""
-"This is the list of chosen %s. You may remove some by selecting them in the "
-"box below and then clicking the \"Remove\" arrow between the two boxes."
-msgstr "這是被選中的%s的列表。您可以在下面的方框中選擇需要移除的項，然後點擊兩個方框中間的“移除”箭頭。"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Remove all"
-msgstr "全部移除"
-
-#: lms/static/admin/js/SelectFilter2.js
-msgid "Click to remove all chosen %s at once."
-msgstr "單擊以一次移除全部所選的%s"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid "%(sel)s of %(cnt)s selected"
-msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(cnt)s的%(sel)s已被選擇"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have unsaved changes on individual editable fields. If you run an "
-"action, your unsaved changes will be lost."
-msgstr "您在單獨可編輯的欄位有未儲存的變更。如果您執行操作，這些未儲存的變更將會遺失。"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, but you haven't saved your changes to "
-"individual fields yet. Please click OK to save. You'll need to re-run the "
-"action."
-msgstr "您已經選擇一個操作，但是並未儲存對欄位進行的變更。請點擊“確定”來儲存。您需要再次執行該操作。"
-
-#: lms/static/admin/js/actions.js lms/static/admin/js/actions.min.js
-msgid ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button."
-msgstr "您已經選擇了一個操作並且未對欄位做任何更改。您可能是想使用“繼續”按鈕而不是“儲存”按鈕。"
-
-#. Translators: the names of months, keep the pipe (|) separators.
-#: lms/static/admin/js/calendar.js lms/static/admin/js/dateparse.js
-msgid ""
-"January|February|March|April|May|June|July|August|September|October|November|December"
-msgstr "一月|二月|三月|四月|五月|六月|七月|八月|九月|十月|十一月|十二月"
-
-#. Translators: abbreviations for days of the week, keep the pipe (|)
-#. separators.
-#: lms/static/admin/js/calendar.js
-msgid "S|M|T|W|T|F|S"
-msgstr "日|一|二|三|四|五|六"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.js.c
-#: lms/static/admin/js/collapse.min.js
-msgid "Show"
-msgstr "顯示"
-
-#: lms/static/admin/js/collapse.js lms/static/admin/js/collapse.min.js
-msgid "Hide"
-msgstr "隱藏"
-
-#. Translators: the names of days, keep the pipe (|) separators.
-#: lms/static/admin/js/dateparse.js
-msgid "Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday"
-msgstr "星期日|星期一|星期二|星期三|星期四|星期五|星期六"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Now"
-msgstr "現在"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Clock"
-msgstr "時鐘"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Choose a time"
-msgstr "選擇時間"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Midnight"
-msgstr "午夜"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "6 a.m."
-msgstr "上午六點"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Noon"
-msgstr "中午"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Today"
-msgstr "今天"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Calendar"
-msgstr "日曆"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Yesterday"
-msgstr "昨天"
-
-#: lms/static/admin/js/admin/DateTimeShortcuts.js
-msgid "Tomorrow"
-msgstr "明天"
-
 #: lms/static/coffee/src/calculator.js
 msgid "Open Calculator"
 msgstr "開啟計算機"
@@ -2921,6 +2774,10 @@ msgstr "標題"
 msgid "You have been logged out of your edX account. "
 msgstr "您已經從edX帳號登出。"
 
+#: lms/static/js/course_survey.js
+msgid "There has been an error processing your survey."
+msgstr ""
+
 #: lms/static/js/staff_debug_actions.js
 msgid "Unknown Error Occurred."
 msgstr "未知錯誤發生。"
@@ -3223,10 +3080,6 @@ msgstr ""
 msgid "Choose new file"
 msgstr ""
 
-#: cms/static/js/factories/import.js
-msgid "Your import is in progress; navigating away will abort it."
-msgstr ""
-
 #: cms/static/js/factories/manage_users.js
 msgid "A valid email address is required"
 msgstr ""
@@ -3329,6 +3182,10 @@ msgstr "只有 <%= fileTypes %> 檔案可以上傳，請選擇 <%= fileExtension
 msgid "or"
 msgstr "或者"
 
+#: cms/static/js/models/xblock_validation.js
+msgid "This component has validation issues."
+msgstr ""
+
 #: cms/static/js/models/settings/course_details.js
 msgid "The course must have an assigned start date."
 msgstr "課程必須有指定的開始日期。"
@@ -3611,6 +3468,20 @@ msgstr "設定"
 msgid "New %(component_type)s"
 msgstr ""
 
+#. Translators: This message will be added to the front of messages of type
+#. warning,
+#. e.g. "Warning: this component has not been configured yet".
+#: cms/static/js/views/xblock_validation.js
+msgid "Warning"
+msgstr ""
+
+#. Translators: This message will be added to the front of messages of type
+#. error,
+#. e.g. "Error: required field is missing".
+#: cms/static/js/views/xblock_validation.js
+msgid "Error"
+msgstr ""
+
 #: cms/static/js/views/components/add_xblock.js
 #: cms/static/js/views/utils/xblock_utils.js
 msgid "Adding&hellip;"
@@ -4552,6 +4423,10 @@ msgstr ""
 msgid "New Group Configuration"
 msgstr ""
 
+#: cms/templates/js/video/metadata-translations-item.underscore
+msgid "Remove"
+msgstr ""
+
 #: cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
 msgid "Add URLs for additional versions"
 msgstr ""
diff --git a/docs/README.rst b/docs/README.rst
new file mode 100644
index 0000000000..120469da10
--- /dev/null
+++ b/docs/README.rst
@@ -0,0 +1,48 @@
+###################
+EdX Documentation
+###################
+
+The following documentation projects have been moved to the `edx-documentation`_ repository as of November 3, 2014:
+
+* course_authors
+* data
+* install_operations
+* mobile
+* OLX
+* ORA-2
+* release_notes
+* students
+
+API documentation that includes docstrings from code files is stored in the
+repository of that module.  All other documentation projects are stored in edx-
+documentation.
+
+By moving documentation to its own repository, we will be better able to
+develop workflows, manage versioning, create translations, and automate
+testing, without complicating ongoing development of the edX Platform.
+
+.. _edx_documentation: https://github.com/edx/edx-documentation
+
+******************************
+View Published Documentation
+******************************
+
+EdX documentation is published through Read the Docs. Links to all published
+documentation are available through `docs.edx.org`_.
+
+.. _docs.edx.org: http://docs.edx.org
+
+******************************
+Submit Documentation Issues
+******************************
+
+We welcome input from the community on any documentation issues.  You can
+submit issues to the Documentation project in the `Open edX JIRA board`_.
+
+You will need to `create a free JIRA account`_ account before you can submit your first
+ticket.
+
+.. _create a free JIRA account: https://openedx.atlassian.net/admin/users/sign-up
+.. _Open edX JIRA board: https://openedx.atlassian.net
+
+You can also email docs@edx.org.
diff --git a/docs/en_us/ORA2/Makefile b/docs/en_us/ORA2/Makefile
deleted file mode 100644
index 7a4baa06c4..0000000000
--- a/docs/en_us/ORA2/Makefile
+++ /dev/null
@@ -1,183 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-PAPER         ?=
-BUILDDIR      ?= build
-
-# User-friendly check for sphinx-build
-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
-endif
-
-Q_FLAG        =
-
-ifeq ($(quiet), true)
-Q_FLAG = -Q
-endif
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = $(Q_FLAG) -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  xml        to make Docutils-native XML files"
-	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/getting_started.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/getting_started.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/getting_started"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/getting_started"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-latexpdfja:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through platex and dvipdfmx..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-xml:
-	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
-	@echo
-	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
-
-pseudoxml:
-	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
-	@echo
-	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/docs/en_us/ORA2/source/Images/PA_AllScores.png b/docs/en_us/ORA2/source/Images/PA_AllScores.png
deleted file mode 100644
index ebb0a78846..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_AllScores.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_All_XML-LMS_small.png b/docs/en_us/ORA2/source/Images/PA_All_XML-LMS_small.png
deleted file mode 100644
index ee18066507..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_All_XML-LMS_small.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_AsmtWithResponse.png b/docs/en_us/ORA2/source/Images/PA_AsmtWithResponse.png
deleted file mode 100644
index 6d40eb58c5..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_AsmtWithResponse.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_AsmtWithResponse_Students.png b/docs/en_us/ORA2/source/Images/PA_AsmtWithResponse_Students.png
deleted file mode 100644
index ddf89f71ee..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_AsmtWithResponse_Students.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_CommentsField.png b/docs/en_us/ORA2/source/Images/PA_CommentsField.png
deleted file mode 100644
index 63426f0948..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_CommentsField.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_Comments_Criterion.png b/docs/en_us/ORA2/source/Images/PA_Comments_Criterion.png
deleted file mode 100644
index fe66b083dd..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_Comments_Criterion.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_CourseStaffInfo_Collapsed.png b/docs/en_us/ORA2/source/Images/PA_CourseStaffInfo_Collapsed.png
deleted file mode 100644
index 9a66e4ce0b..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_CourseStaffInfo_Collapsed.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_CourseStaffInfo_Expanded.png b/docs/en_us/ORA2/source/Images/PA_CourseStaffInfo_Expanded.png
deleted file mode 100644
index a871f6aab7..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_CourseStaffInfo_Expanded.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_Crit_Option_Names.png b/docs/en_us/ORA2/source/Images/PA_Crit_Option_Names.png
deleted file mode 100644
index ddf8beb933..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_Crit_Option_Names.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_CriterionName.png b/docs/en_us/ORA2/source/Images/PA_CriterionName.png
deleted file mode 100644
index f533bc0a27..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_CriterionName.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_HTML-PA_LMS.png b/docs/en_us/ORA2/source/Images/PA_HTML-PA_LMS.png
deleted file mode 100644
index 8d859ef961..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_HTML-PA_LMS.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_HTMLComponent.png b/docs/en_us/ORA2/source/Images/PA_HTMLComponent.png
deleted file mode 100644
index f9db668ef7..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_HTMLComponent.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_LMS-PARubric.png b/docs/en_us/ORA2/source/Images/PA_LMS-PARubric.png
deleted file mode 100644
index f8214af437..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_LMS-PARubric.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_ModifyAdvancedSettings.png b/docs/en_us/ORA2/source/Images/PA_ModifyAdvancedSettings.png
deleted file mode 100644
index b3facf26ea..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_ModifyAdvancedSettings.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_Prompt_XML-LMS.png b/docs/en_us/ORA2/source/Images/PA_Prompt_XML-LMS.png
deleted file mode 100644
index 3d3210828a..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_Prompt_XML-LMS.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_Question_XML-LMS.png b/docs/en_us/ORA2/source/Images/PA_Question_XML-LMS.png
deleted file mode 100644
index d38cd83832..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_Question_XML-LMS.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_RubricSample_XML-LMS.png b/docs/en_us/ORA2/source/Images/PA_RubricSample_XML-LMS.png
deleted file mode 100644
index 84dc15e130..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_RubricSample_XML-LMS.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_Rubric_LMS.png b/docs/en_us/ORA2/source/Images/PA_Rubric_LMS.png
deleted file mode 100644
index a4d0ed5c09..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_Rubric_LMS.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_S_QandRfield.png b/docs/en_us/ORA2/source/Images/PA_S_QandRfield.png
deleted file mode 100644
index 34f88ced39..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_S_QandRfield.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_S_ReviewResponse.png b/docs/en_us/ORA2/source/Images/PA_S_ReviewResponse.png
deleted file mode 100644
index 2d2d442d4b..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_S_ReviewResponse.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_SpecificStudent.png b/docs/en_us/ORA2/source/Images/PA_SpecificStudent.png
deleted file mode 100644
index 045d57bfad..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_SpecificStudent.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_Steps_LMS.png b/docs/en_us/ORA2/source/Images/PA_Steps_LMS.png
deleted file mode 100644
index ba3b350188..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_Steps_LMS.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_Students_CommentBoxes.png b/docs/en_us/ORA2/source/Images/PA_Students_CommentBoxes.png
deleted file mode 100644
index aef2f9618f..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_Students_CommentBoxes.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_XML_LMS_All.png b/docs/en_us/ORA2/source/Images/PA_XML_LMS_All.png
deleted file mode 100644
index 47ca10d122..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_XML_LMS_All.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_anon_ids.png b/docs/en_us/ORA2/source/Images/PA_anon_ids.png
deleted file mode 100644
index 5501261b75..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_anon_ids.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/Images/PA_enrolled_profiles.png b/docs/en_us/ORA2/source/Images/PA_enrolled_profiles.png
deleted file mode 100644
index 4339a207e9..0000000000
Binary files a/docs/en_us/ORA2/source/Images/PA_enrolled_profiles.png and /dev/null differ
diff --git a/docs/en_us/ORA2/source/PeerAssessment.rst b/docs/en_us/ORA2/source/PeerAssessment.rst
deleted file mode 100644
index 32b3019926..0000000000
--- a/docs/en_us/ORA2/source/PeerAssessment.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. _Peer Assessments:
-
-########################
-Peer Assessments
-########################
-
-This documentation has moved! Please click `Creating Peer Assessments <http://edx.readthedocs.org/projects/edx-open-response-assessments/en/latest/>`_ to see the latest information about peer assessments.
diff --git a/docs/en_us/ORA2/source/PeerAssessment_Students.rst b/docs/en_us/ORA2/source/PeerAssessment_Students.rst
deleted file mode 100644
index d77fe27d84..0000000000
--- a/docs/en_us/ORA2/source/PeerAssessment_Students.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. _PA for Students:
-
-#############################
-Peer Assessments for Students
-#############################
-
-This documentation has moved! Please click `Peer Assessments for Students <http://edx.readthedocs.org/projects/edx-open-response-assessments/en/latest/PeerAssessment_Students.html>`_ to see the latest peer assessment information for students.
\ No newline at end of file
diff --git a/docs/en_us/ORA2/source/conf.py b/docs/en_us/ORA2/source/conf.py
deleted file mode 100644
index 585d201258..0000000000
--- a/docs/en_us/ORA2/source/conf.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-import sys, os
-
-# on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-
-
-
-
-
-
-
-sys.path.append(os.path.abspath('../../../'))
-sys.path.append(os.path.abspath('../../'))
-
-#from docs.shared.conf import *
-
-sys.path.insert(0, os.path.abspath('.'))
-
-master_doc = 'index'
-
-# Add any paths that contain templates here, relative to this directory.
-#templates_path.append('source/_templates')
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path.append('source/_static')
-
-
-# General information about the project.
-project = u'Creating a Peer Assessment'
-copyright = u'2014, edX'
-
-# The short X.Y version.
-version = ''
-# The full version, including alpha/beta/rc tags.
-release = ''
diff --git a/docs/en_us/ORA2/source/index.rst b/docs/en_us/ORA2/source/index.rst
deleted file mode 100755
index 199a531b54..0000000000
--- a/docs/en_us/ORA2/source/index.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. Getting_Started documentation master file, created by
-   sphinx-quickstart on Tue Apr 16 11:19:12 2013.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-
-Creating Peer Assessments
-========================================
-
-This documentation has moved! Please click `Creating Peer Assessments <http://edx.readthedocs.org/projects/edx-open-response-assessments/en/latest/>`_ to see the latest information about peer assessments.
\ No newline at end of file
diff --git a/docs/en_us/ORA2/source/read_me.rst b/docs/en_us/ORA2/source/read_me.rst
deleted file mode 100644
index a78c5e51a3..0000000000
--- a/docs/en_us/ORA2/source/read_me.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-*******
-Read Me
-*******
-
-The edX *Building a Course with edX Studio* documentation is created
-using RST_ files and Sphinx_. You, the user community, can help update and revise
-this documentation project on GitHub::
-
-  https://github.com/edx/edx-platform/tree/master/docs/course_authors/source
-
-To suggest a revision, fork the project, make changes in your fork, and submit
-a pull request back to the original project: this is known as the `GitHub Flow`_.
-All pull requests need approval from edX. For more information, contact edX at docs@edx.org.
-
-.. _Sphinx: http://sphinx-doc.org/
-.. _LaTeX: http://www.latex-project.org/
-.. _`GitHub Flow`: https://github.com/blog/1557-github-flow-in-the-browser
-.. _RST: http://docutils.sourceforge.net/rst.html
\ No newline at end of file
diff --git a/docs/en_us/course_authors/Makefile b/docs/en_us/course_authors/Makefile
deleted file mode 100644
index 7a4baa06c4..0000000000
--- a/docs/en_us/course_authors/Makefile
+++ /dev/null
@@ -1,183 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-PAPER         ?=
-BUILDDIR      ?= build
-
-# User-friendly check for sphinx-build
-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
-endif
-
-Q_FLAG        =
-
-ifeq ($(quiet), true)
-Q_FLAG = -Q
-endif
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = $(Q_FLAG) -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  xml        to make Docutils-native XML files"
-	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/getting_started.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/getting_started.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/getting_started"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/getting_started"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-latexpdfja:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through platex and dvipdfmx..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-xml:
-	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
-	@echo
-	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
-
-pseudoxml:
-	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
-	@echo
-	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/docs/en_us/course_authors/source/Format Cheat Sheet.rstnouse b/docs/en_us/course_authors/source/Format Cheat Sheet.rstnouse
deleted file mode 100644
index f49b1a73bd..0000000000
--- a/docs/en_us/course_authors/source/Format Cheat Sheet.rstnouse	
+++ /dev/null
@@ -1,152 +0,0 @@
-##################
-Format cheat sheet
-##################
-
-Title: # above and below (as lines 1 and 3 above)
-
-*********
-Heading 1
-*********
-
-=========
-Heading 2
-=========
-
-Heading 3
-*********
-
-Heading 4
-=========
-
-Heading 5
-^^^^^^^^^
-
-************
-Image Format
-************
-
-Image format, uses images as a reference from the soure/image file
-
-       .. image:: images/image029.png
-       : width: 800
-
-       .. image:: images/image009.png
-       :width: 800  
-
-****************
-Code Formatting
-****************
-
-To set text in a "Code format"
-        ::
--or-
-
-.. code-block:: xml
-
-(text in code-block:: xml is in different colors)
-
-****************
-Table Formatting
-****************
-
-With a header row
-
-.. list-table::
-   :widths: 15 15 70
-   :header-rows: 1
- 
-   * - First Name
-     - Last Name
-     - Residence
-   * - Elizabeth
-     - Bennett
-     - Longbourne
-   * - Fitzwilliam
-     - Darcy
-     - Pemberley
-
--- or --
-
-With a bolded first column
-
-.. list-table::
-   :widths: 15 15 70
-   :stub-columns: 1
- 
-   * - First Name
-     - Elizabeth
-     - Fitzwilliam
-   * - Last Name
-     - Bennett
-     - Darcy
-   * - Residence
-     - Longboure
-     - Pemberley
-
-*******************
-Cross-References
-*******************
-
-For references to edX101 pages:
-
-        `Writing Exercises <https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/courseware/a45de3baa8a9468cbfb1a301fdcd7e86/d15cfeaff0af4dd7be4765cd0988d172/1>`_ has more in-depth discussion about problem types, and some general pedagogical considerations for adapting to the online format and a `Gallery of Response Types <https://edge.edx.org/accounts/login?next=/courses/edX/edX101/How_to_Create_an_edX_Course/courseware/a45de3baa8a9468cbfb1a301fdcd7e86/3ba055e760d04f389150a75edfecb844/1>`_
-
-To cross reference between sections of a document
-
-At the paragraph you are cross referencing:
-
-        . _Set-Grade-Brackets:
-
-To make the cross reference in text:
-
-        see :ref:`Set Grade Brackets<Set-Grade-Brackets>`
-
-To cross-reference a topic, but use your own text instead of the topic title,
-use the :ref: directive, but enter your own text followed by the topic anchor in
-angle brackets:
-
-        If you want to add a graded tool or exercise, add the tool as a
-        :ref:`custom JavaScript problem<Custom JavaScript>` or an :ref:`LTI
-        component<LTI Component>`.
-
-        (In this sentence, the text appears as "custom JavaScript problem" and
-        "LTI component", and the linked-to topic titles are "Custom JavaScript
-        Problem" and "LTI Component".)
-
-External page reference
-
-        see `Create a Problem <http://site.Create_Problem.html>`_ 
-
-      
-*******
-Tables
-*******
-
-Example of a table with a cell that includes a bulleted list. The balnk lines before and after are critical.
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``correct_map``
-     - dict
-     - For each problem ID value listed by ``answers``, provides:
-       
-       * ``correctness``: string; 'correct', 'incorrect'
-       * ``hint``: string; Gives optional hint. Nulls allowed. 
-       * ``hintmode``: string; None, 'on_request', 'always'. Nulls allowed. 
-       * ``msg``: string; Gives extra message response.
-       * ``npoints``: integer; Points awarded for this ``answer_id``. Nulls allowed.
-       * ``queuestate``: dict; None when not queued, else ``{key:'', time:''}``
-         where ``key`` is a secret string dump of a DateTime object in the form
-         '%Y%m%d%H%M%S'. Nulls allowed. 
-
-   * - ``grade``
-     - integer
-     - Current grade value. 
-   * - ``max_grade``
-     - integer
-     - Maximum possible grade value.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/Images/AIScoredResponse.gif b/docs/en_us/course_authors/source/Images/AIScoredResponse.gif
deleted file mode 100644
index cdffaa4574..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AIScoredResponse.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AIScoredResponse.png b/docs/en_us/course_authors/source/Images/AIScoredResponse.png
deleted file mode 100644
index b5866f55ce..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AIScoredResponse.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AI_ScoredResponse.gif b/docs/en_us/course_authors/source/Images/AI_ScoredResponse.gif
deleted file mode 100644
index cdffaa4574..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AI_ScoredResponse.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AI_ScoredResponse.png b/docs/en_us/course_authors/source/Images/AI_ScoredResponse.png
deleted file mode 100644
index b5866f55ce..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AI_ScoredResponse.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AddNewComponent.gif b/docs/en_us/course_authors/source/Images/AddNewComponent.gif
deleted file mode 100644
index cb3b65eecd..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AddNewComponent.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AddNewComponent.png b/docs/en_us/course_authors/source/Images/AddNewComponent.png
deleted file mode 100644
index 2218ec3b1a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AddNewComponent.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AdditionalFeedback.gif b/docs/en_us/course_authors/source/Images/AdditionalFeedback.gif
deleted file mode 100644
index a6895b0434..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AdditionalFeedback.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AdditionalFeedback.png b/docs/en_us/course_authors/source/Images/AdditionalFeedback.png
deleted file mode 100644
index e298cad398..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AdditionalFeedback.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AdvSettings_After.png b/docs/en_us/course_authors/source/Images/AdvSettings_After.png
deleted file mode 100644
index 521bdcd810..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AdvSettings_After.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AdvSettings_Before.png b/docs/en_us/course_authors/source/Images/AdvSettings_Before.png
deleted file mode 100644
index 2b09a22254..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AdvSettings_Before.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AdvancedComponent.gif b/docs/en_us/course_authors/source/Images/AdvancedComponent.gif
deleted file mode 100644
index c12f46c7da..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AdvancedComponent.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AdvancedComponent.png b/docs/en_us/course_authors/source/Images/AdvancedComponent.png
deleted file mode 100644
index 02f5eeb4b0..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AdvancedComponent.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AdvancedModulesEmpty.gif b/docs/en_us/course_authors/source/Images/AdvancedModulesEmpty.gif
deleted file mode 100644
index 2b007e9b22..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AdvancedModulesEmpty.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AdvancedModulesEmpty.png b/docs/en_us/course_authors/source/Images/AdvancedModulesEmpty.png
deleted file mode 100644
index 996ff1842a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AdvancedModulesEmpty.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AnatomyOfExercise1.gif b/docs/en_us/course_authors/source/Images/AnatomyOfExercise1.gif
deleted file mode 100644
index d5456f1783..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AnatomyOfExercise1.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AnatomyOfExercise1.png b/docs/en_us/course_authors/source/Images/AnatomyOfExercise1.png
deleted file mode 100644
index 02e1e585a2..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AnatomyOfExercise1.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AnatomyOfExercise2.gif b/docs/en_us/course_authors/source/Images/AnatomyOfExercise2.gif
deleted file mode 100644
index bf5097dd9c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AnatomyOfExercise2.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AnatomyOfExercise2.png b/docs/en_us/course_authors/source/Images/AnatomyOfExercise2.png
deleted file mode 100644
index 34870905d5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AnatomyOfExercise2.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AnatomyOfExercise3.gif b/docs/en_us/course_authors/source/Images/AnatomyOfExercise3.gif
deleted file mode 100644
index 557789f9da..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AnatomyOfExercise3.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AnatomyOfExercise3.png b/docs/en_us/course_authors/source/Images/AnatomyOfExercise3.png
deleted file mode 100644
index 9821248577..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AnatomyOfExercise3.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AnatomyofaProblem_Feedback.gif b/docs/en_us/course_authors/source/Images/AnatomyofaProblem_Feedback.gif
deleted file mode 100644
index b033fe5076..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AnatomyofaProblem_Feedback.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AnatomyofaProblem_Feedback.png b/docs/en_us/course_authors/source/Images/AnatomyofaProblem_Feedback.png
deleted file mode 100644
index 6b5fcada5c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AnatomyofaProblem_Feedback.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AnnotationExample.gif b/docs/en_us/course_authors/source/Images/AnnotationExample.gif
deleted file mode 100644
index e5c2ed41ca..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AnnotationExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/AnnotationExample.png b/docs/en_us/course_authors/source/Images/AnnotationExample.png
deleted file mode 100644
index 2947caa4ea..0000000000
Binary files a/docs/en_us/course_authors/source/Images/AnnotationExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Beta_tester_email.png b/docs/en_us/course_authors/source/Images/Beta_tester_email.png
deleted file mode 100644
index c046ba2bea..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Beta_tester_email.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Bulk_email_history.png b/docs/en_us/course_authors/source/Images/Bulk_email_history.png
deleted file mode 100644
index faad02c876..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Bulk_email_history.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Bulk_email_list.png b/docs/en_us/course_authors/source/Images/Bulk_email_list.png
deleted file mode 100644
index f514ccb6dd..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Bulk_email_list.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Bulk_email_pending.png b/docs/en_us/course_authors/source/Images/Bulk_email_pending.png
deleted file mode 100644
index 0de73a56c5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Bulk_email_pending.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Bulk_email_sent.png b/docs/en_us/course_authors/source/Images/Bulk_email_sent.png
deleted file mode 100644
index 27e401792f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Bulk_email_sent.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Bulk_email_states.png b/docs/en_us/course_authors/source/Images/Bulk_email_states.png
deleted file mode 100644
index 45b621cad0..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Bulk_email_states.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/CITL_AssmtTypes.gif b/docs/en_us/course_authors/source/Images/CITL_AssmtTypes.gif
deleted file mode 100644
index ad29006608..0000000000
Binary files a/docs/en_us/course_authors/source/Images/CITL_AssmtTypes.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/CITL_AssmtTypes.png b/docs/en_us/course_authors/source/Images/CITL_AssmtTypes.png
deleted file mode 100644
index 4f421b9cf3..0000000000
Binary files a/docs/en_us/course_authors/source/Images/CITL_AssmtTypes.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/CITL_SA_Rubric.gif b/docs/en_us/course_authors/source/Images/CITL_SA_Rubric.gif
deleted file mode 100644
index 69a009f50f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/CITL_SA_Rubric.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/CITL_SA_Rubric.png b/docs/en_us/course_authors/source/Images/CITL_SA_Rubric.png
deleted file mode 100644
index a8f6ff4270..0000000000
Binary files a/docs/en_us/course_authors/source/Images/CITL_SA_Rubric.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/CITLsample.gif b/docs/en_us/course_authors/source/Images/CITLsample.gif
deleted file mode 100644
index 58de41f0b3..0000000000
Binary files a/docs/en_us/course_authors/source/Images/CITLsample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/CITLsample.png b/docs/en_us/course_authors/source/Images/CITLsample.png
deleted file mode 100644
index 61ba6843ef..0000000000
Binary files a/docs/en_us/course_authors/source/Images/CITLsample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/CheckboxExample.gif b/docs/en_us/course_authors/source/Images/CheckboxExample.gif
deleted file mode 100644
index fe5e7e0ccf..0000000000
Binary files a/docs/en_us/course_authors/source/Images/CheckboxExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/CheckboxExample.png b/docs/en_us/course_authors/source/Images/CheckboxExample.png
deleted file mode 100644
index 564380b298..0000000000
Binary files a/docs/en_us/course_authors/source/Images/CheckboxExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ChemicalEquationExample.png b/docs/en_us/course_authors/source/Images/ChemicalEquationExample.png
deleted file mode 100644
index bd0310d8ac..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ChemicalEquationExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/CircuitSchematicExample.gif b/docs/en_us/course_authors/source/Images/CircuitSchematicExample.gif
deleted file mode 100644
index 29419fcabe..0000000000
Binary files a/docs/en_us/course_authors/source/Images/CircuitSchematicExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/CircuitSchematicExample.png b/docs/en_us/course_authors/source/Images/CircuitSchematicExample.png
deleted file mode 100644
index e51fe2cf0c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/CircuitSchematicExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/CircuitSchematicExample_short.png b/docs/en_us/course_authors/source/Images/CircuitSchematicExample_short.png
deleted file mode 100644
index 8c8ff27370..0000000000
Binary files a/docs/en_us/course_authors/source/Images/CircuitSchematicExample_short.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ComponentNames_CourseRibbon.gif b/docs/en_us/course_authors/source/Images/ComponentNames_CourseRibbon.gif
deleted file mode 100644
index 1eb71228b1..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ComponentNames_CourseRibbon.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ComponentNames_CourseRibbon.png b/docs/en_us/course_authors/source/Images/ComponentNames_CourseRibbon.png
deleted file mode 100644
index 7515fd1342..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ComponentNames_CourseRibbon.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Configure_cohort_topic.png b/docs/en_us/course_authors/source/Images/Configure_cohort_topic.png
deleted file mode 100644
index b4e2e9cfc6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Configure_cohort_topic.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Course_Enrollment_Email.png b/docs/en_us/course_authors/source/Images/Course_Enrollment_Email.png
deleted file mode 100644
index cff5a8959e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Course_Enrollment_Email.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Course_Info_Comparison.png b/docs/en_us/course_authors/source/Images/Course_Info_Comparison.png
deleted file mode 100644
index 23c34ab93c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Course_Info_Comparison.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Course_Outline.png b/docs/en_us/course_authors/source/Images/Course_Outline.png
deleted file mode 100644
index 8fb640a667..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Course_Outline.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Course_Outline_LMS.png b/docs/en_us/course_authors/source/Images/Course_Outline_LMS.png
deleted file mode 100644
index ac56a09137..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Course_Outline_LMS.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/CustomPythonExample.png b/docs/en_us/course_authors/source/Images/CustomPythonExample.png
deleted file mode 100644
index 4eb70c6032..0000000000
Binary files a/docs/en_us/course_authors/source/Images/CustomPythonExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Disc_Create_Edit.png b/docs/en_us/course_authors/source/Images/Disc_Create_Edit.png
deleted file mode 100644
index df461a182e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Disc_Create_Edit.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Disc_DisplayName.png b/docs/en_us/course_authors/source/Images/Disc_DisplayName.png
deleted file mode 100644
index 620d16f32a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Disc_DisplayName.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/DiscussionComponentEditor.png b/docs/en_us/course_authors/source/Images/DiscussionComponentEditor.png
deleted file mode 100644
index d5a3002510..0000000000
Binary files a/docs/en_us/course_authors/source/Images/DiscussionComponentEditor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/DiscussionComponent_LMS.png b/docs/en_us/course_authors/source/Images/DiscussionComponent_LMS.png
deleted file mode 100644
index 6f7c5660cb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/DiscussionComponent_LMS.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/DiscussionComponent_LMS_Ribbon.png b/docs/en_us/course_authors/source/Images/DiscussionComponent_LMS_Ribbon.png
deleted file mode 100644
index d1596975c8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/DiscussionComponent_LMS_Ribbon.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_Add_cohort_topics.png b/docs/en_us/course_authors/source/Images/Discussion_Add_cohort_topics.png
deleted file mode 100644
index b5a3e2f529..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_Add_cohort_topics.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_Add_initial.png b/docs/en_us/course_authors/source/Images/Discussion_Add_initial.png
deleted file mode 100644
index 77c80a70b9..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_Add_initial.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_Add_name.png b/docs/en_us/course_authors/source/Images/Discussion_Add_name.png
deleted file mode 100644
index d4d4e91e05..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_Add_name.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_Add_paste.png b/docs/en_us/course_authors/source/Images/Discussion_Add_paste.png
deleted file mode 100644
index 0def93dc8e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_Add_paste.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_More_menu.png b/docs/en_us/course_authors/source/Images/Discussion_More_menu.png
deleted file mode 100644
index 297c72bd56..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_More_menu.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_add_response.png b/docs/en_us/course_authors/source/Images/Discussion_add_response.png
deleted file mode 100644
index c2929defcd..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_add_response.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_answer_question.png b/docs/en_us/course_authors/source/Images/Discussion_answer_question.png
deleted file mode 100644
index f9a3256f4c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_answer_question.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_answers_in_list.png b/docs/en_us/course_authors/source/Images/Discussion_answers_in_list.png
deleted file mode 100644
index 9d8819bf62..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_answers_in_list.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_blackout_formatted.png b/docs/en_us/course_authors/source/Images/Discussion_blackout_formatted.png
deleted file mode 100644
index 1561ab253b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_blackout_formatted.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_blackout_unformatted.png b/docs/en_us/course_authors/source/Images/Discussion_blackout_unformatted.png
deleted file mode 100644
index ee24334166..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_blackout_unformatted.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_category_subcategory.png b/docs/en_us/course_authors/source/Images/Discussion_category_subcategory.png
deleted file mode 100644
index cdefb21978..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_category_subcategory.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_colorcoding.png b/docs/en_us/course_authors/source/Images/Discussion_colorcoding.png
deleted file mode 100644
index 04ef536214..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_colorcoding.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_content_specific.png b/docs/en_us/course_authors/source/Images/Discussion_content_specific.png
deleted file mode 100644
index 70dd080f9b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_content_specific.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_content_specific_post.png b/docs/en_us/course_authors/source/Images/Discussion_content_specific_post.png
deleted file mode 100644
index d3e8a3c840..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_content_specific_post.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_course_wide.png b/docs/en_us/course_authors/source/Images/Discussion_course_wide.png
deleted file mode 100644
index 668704dd0c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_course_wide.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_course_wide_post.png b/docs/en_us/course_authors/source/Images/Discussion_course_wide_post.png
deleted file mode 100644
index 2595ed885a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_course_wide_post.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_expand.png b/docs/en_us/course_authors/source/Images/Discussion_expand.png
deleted file mode 100644
index 912bfdb3cd..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_expand.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_filterfollowing.png b/docs/en_us/course_authors/source/Images/Discussion_filterfollowing.png
deleted file mode 100644
index 9e8056ccb7..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_filterfollowing.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_filters.png b/docs/en_us/course_authors/source/Images/Discussion_filters.png
deleted file mode 100644
index 289132c0c5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_filters.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_follow.png b/docs/en_us/course_authors/source/Images/Discussion_follow.png
deleted file mode 100644
index f6448c58fe..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_follow.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_mouseover.png b/docs/en_us/course_authors/source/Images/Discussion_mouseover.png
deleted file mode 100644
index 05e6558f37..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_mouseover.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_options_mouseover.png b/docs/en_us/course_authors/source/Images/Discussion_options_mouseover.png
deleted file mode 100644
index 4a8cdaaafb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_options_mouseover.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_reportmisuse.png b/docs/en_us/course_authors/source/Images/Discussion_reportmisuse.png
deleted file mode 100644
index 8d8e09ee47..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_reportmisuse.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_sortvotes.png b/docs/en_us/course_authors/source/Images/Discussion_sortvotes.png
deleted file mode 100644
index 293cf46605..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_sortvotes.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Discussion_vote.png b/docs/en_us/course_authors/source/Images/Discussion_vote.png
deleted file mode 100644
index 453960684d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Discussion_vote.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Distribution_Education.png b/docs/en_us/course_authors/source/Images/Distribution_Education.png
deleted file mode 100644
index cd98408b41..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Distribution_Education.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Distribution_Gender.png b/docs/en_us/course_authors/source/Images/Distribution_Gender.png
deleted file mode 100644
index 4876c3e475..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Distribution_Gender.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/DoneGrading.gif b/docs/en_us/course_authors/source/Images/DoneGrading.gif
deleted file mode 100644
index 8e0d5e20c5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/DoneGrading.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/DoneGrading.png b/docs/en_us/course_authors/source/Images/DoneGrading.png
deleted file mode 100644
index 1c0c3e6534..0000000000
Binary files a/docs/en_us/course_authors/source/Images/DoneGrading.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/DragAndDropExample.gif b/docs/en_us/course_authors/source/Images/DragAndDropExample.gif
deleted file mode 100644
index 5814669ae5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/DragAndDropExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/DragAndDropExample.png b/docs/en_us/course_authors/source/Images/DragAndDropExample.png
deleted file mode 100644
index 13054449f9..0000000000
Binary files a/docs/en_us/course_authors/source/Images/DragAndDropExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/DragAndDropProblem.png b/docs/en_us/course_authors/source/Images/DragAndDropProblem.png
deleted file mode 100644
index 3f19765b75..0000000000
Binary files a/docs/en_us/course_authors/source/Images/DragAndDropProblem.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/DragAndDrop_BlueLine.gif b/docs/en_us/course_authors/source/Images/DragAndDrop_BlueLine.gif
deleted file mode 100644
index 48fea0dff1..0000000000
Binary files a/docs/en_us/course_authors/source/Images/DragAndDrop_BlueLine.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/DragAndDrop_BlueLine.png b/docs/en_us/course_authors/source/Images/DragAndDrop_BlueLine.png
deleted file mode 100644
index e8c77559ad..0000000000
Binary files a/docs/en_us/course_authors/source/Images/DragAndDrop_BlueLine.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/DropdownExample.gif b/docs/en_us/course_authors/source/Images/DropdownExample.gif
deleted file mode 100644
index f60a7d4386..0000000000
Binary files a/docs/en_us/course_authors/source/Images/DropdownExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/DropdownExample.png b/docs/en_us/course_authors/source/Images/DropdownExample.png
deleted file mode 100644
index a02d48d1ab..0000000000
Binary files a/docs/en_us/course_authors/source/Images/DropdownExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/EditDiscussionComponent.png b/docs/en_us/course_authors/source/Images/EditDiscussionComponent.png
deleted file mode 100644
index 6c3eb51a8c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/EditDiscussionComponent.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Enable_cohorts.png b/docs/en_us/course_authors/source/Images/Enable_cohorts.png
deleted file mode 100644
index 533d3f3089..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Enable_cohorts.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Endorse_Discussion.png b/docs/en_us/course_authors/source/Images/Endorse_Discussion.png
deleted file mode 100644
index 88f86f3507..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Endorse_Discussion.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ExampleORA.gif b/docs/en_us/course_authors/source/Images/ExampleORA.gif
deleted file mode 100644
index 47b0f75902..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ExampleORA.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ExampleORA.png b/docs/en_us/course_authors/source/Images/ExampleORA.png
deleted file mode 100644
index 196e76deb2..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ExampleORA.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ExampleORA_File.gif b/docs/en_us/course_authors/source/Images/ExampleORA_File.gif
deleted file mode 100644
index 621fa00872..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ExampleORA_File.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ExampleORA_File.png b/docs/en_us/course_authors/source/Images/ExampleORA_File.png
deleted file mode 100644
index f3d8d306a7..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ExampleORA_File.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/FeedbackNotAvailable.gif b/docs/en_us/course_authors/source/Images/FeedbackNotAvailable.gif
deleted file mode 100644
index 048374dcd9..0000000000
Binary files a/docs/en_us/course_authors/source/Images/FeedbackNotAvailable.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/FeedbackNotAvailable.png b/docs/en_us/course_authors/source/Images/FeedbackNotAvailable.png
deleted file mode 100644
index d9f100c87e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/FeedbackNotAvailable.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/FetchingNextSubmission.gif b/docs/en_us/course_authors/source/Images/FetchingNextSubmission.gif
deleted file mode 100644
index 7a1e648739..0000000000
Binary files a/docs/en_us/course_authors/source/Images/FetchingNextSubmission.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/FetchingNextSubmission.png b/docs/en_us/course_authors/source/Images/FetchingNextSubmission.png
deleted file mode 100644
index f9d42f8b7e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/FetchingNextSubmission.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/FollowingQuestion.png b/docs/en_us/course_authors/source/Images/FollowingQuestion.png
deleted file mode 100644
index baf43227be..0000000000
Binary files a/docs/en_us/course_authors/source/Images/FollowingQuestion.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/GeneExplorer.png b/docs/en_us/course_authors/source/Images/GeneExplorer.png
deleted file mode 100644
index edeb255dd6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/GeneExplorer.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/GoogleHangout_WithPeople.png b/docs/en_us/course_authors/source/Images/GoogleHangout_WithPeople.png
deleted file mode 100644
index cc2f707d66..0000000000
Binary files a/docs/en_us/course_authors/source/Images/GoogleHangout_WithPeople.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Grade_Report.png b/docs/en_us/course_authors/source/Images/Grade_Report.png
deleted file mode 100644
index 609a5a6522..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Grade_Report.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Grade_Report_example.png b/docs/en_us/course_authors/source/Images/Grade_Report_example.png
deleted file mode 100644
index f3d77241c3..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Grade_Report_example.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Grading_Configuration.png b/docs/en_us/course_authors/source/Images/Grading_Configuration.png
deleted file mode 100644
index a035073f5b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Grading_Configuration.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Grading_Configuration_Studio.png b/docs/en_us/course_authors/source/Images/Grading_Configuration_Studio.png
deleted file mode 100644
index 41068662fa..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Grading_Configuration_Studio.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTMLComponent_Edit.png b/docs/en_us/course_authors/source/Images/HTMLComponent_Edit.png
deleted file mode 100644
index 785c3a139d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTMLComponent_Edit.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTMLComponent_VisualView_LMS.gif b/docs/en_us/course_authors/source/Images/HTMLComponent_VisualView_LMS.gif
deleted file mode 100644
index d82a2ccf64..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTMLComponent_VisualView_LMS.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTMLComponent_VisualView_LMS.png b/docs/en_us/course_authors/source/Images/HTMLComponent_VisualView_LMS.png
deleted file mode 100644
index 9189495fbe..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTMLComponent_VisualView_LMS.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTMLEditor.gif b/docs/en_us/course_authors/source/Images/HTMLEditor.gif
deleted file mode 100644
index 7c89771673..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTMLEditor.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTMLEditor.png b/docs/en_us/course_authors/source/Images/HTMLEditor.png
deleted file mode 100644
index 5865825f8a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTMLEditor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTMLEditor_HTML.gif b/docs/en_us/course_authors/source/Images/HTMLEditor_HTML.gif
deleted file mode 100644
index c3f8bb5f0b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTMLEditor_HTML.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTMLEditor_HTML.png b/docs/en_us/course_authors/source/Images/HTMLEditor_HTML.png
deleted file mode 100644
index a3a6592350..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTMLEditor_HTML.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTMLEditor_Visual.gif b/docs/en_us/course_authors/source/Images/HTMLEditor_Visual.gif
deleted file mode 100644
index a11cd84a5e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTMLEditor_Visual.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTMLEditor_Visual.png b/docs/en_us/course_authors/source/Images/HTMLEditor_Visual.png
deleted file mode 100644
index c8e72efc0a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTMLEditor_Visual.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTMLEditor_empty.png b/docs/en_us/course_authors/source/Images/HTMLEditor_empty.png
deleted file mode 100644
index 3c11f86515..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTMLEditor_empty.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Component_Type.png b/docs/en_us/course_authors/source/Images/HTML_Component_Type.png
deleted file mode 100644
index 8e11e14e7d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Component_Type.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_HTMLView.gif b/docs/en_us/course_authors/source/Images/HTML_HTMLView.gif
deleted file mode 100644
index aaf220c312..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_HTMLView.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_HTMLView.png b/docs/en_us/course_authors/source/Images/HTML_HTMLView.png
deleted file mode 100644
index 9e00c293df..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_HTMLView.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_CourseUnit.gif b/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_CourseUnit.gif
deleted file mode 100644
index 082d2cf8c9..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_CourseUnit.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_CourseUnit.png b/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_CourseUnit.png
deleted file mode 100644
index 0da2e9be1e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_CourseUnit.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_DBox.gif b/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_DBox.gif
deleted file mode 100644
index ba03a70383..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_DBox.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_DBox.png b/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_DBox.png
deleted file mode 100644
index 8586167d01..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_DBox.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_File.gif b/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_File.gif
deleted file mode 100644
index 257ab3c43f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_File.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_File.png b/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_File.png
deleted file mode 100644
index bdc0af8e0d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_File.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_Website.gif b/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_Website.gif
deleted file mode 100644
index 39883ac705..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_Website.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_Website.png b/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_Website.png
deleted file mode 100644
index 647e29aa40..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Insert-EditLink_Website.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Insert-Edit_Image.png b/docs/en_us/course_authors/source/Images/HTML_Insert-Edit_Image.png
deleted file mode 100644
index 21dadeb052..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Insert-Edit_Image.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Insert-Edit_Image_Advanced.png b/docs/en_us/course_authors/source/Images/HTML_Insert-Edit_Image_Advanced.png
deleted file mode 100644
index c7164f5bd5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Insert-Edit_Image_Advanced.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_LaTeX.png b/docs/en_us/course_authors/source/Images/HTML_LaTeX.png
deleted file mode 100644
index ffbeba163b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_LaTeX.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_LaTeXEditor.gif b/docs/en_us/course_authors/source/Images/HTML_LaTeXEditor.gif
deleted file mode 100644
index 643b8ddb45..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_LaTeXEditor.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_LaTeXEditor.png b/docs/en_us/course_authors/source/Images/HTML_LaTeXEditor.png
deleted file mode 100644
index 2f449a03cc..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_LaTeXEditor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_LaTeX_CompEditor.png b/docs/en_us/course_authors/source/Images/HTML_LaTeX_CompEditor.png
deleted file mode 100644
index 716f7bd9d9..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_LaTeX_CompEditor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_LaTeX_LMS.gif b/docs/en_us/course_authors/source/Images/HTML_LaTeX_LMS.gif
deleted file mode 100644
index efadda5c7b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_LaTeX_LMS.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_LaTeX_LMS.png b/docs/en_us/course_authors/source/Images/HTML_LaTeX_LMS.png
deleted file mode 100644
index 7804f67ef4..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_LaTeX_LMS.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Link_File.gif b/docs/en_us/course_authors/source/Images/HTML_Link_File.gif
deleted file mode 100644
index 956f47b9a2..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Link_File.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_Link_File.png b/docs/en_us/course_authors/source/Images/HTML_Link_File.png
deleted file mode 100644
index bbe5da370b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_Link_File.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_VisualView.gif b/docs/en_us/course_authors/source/Images/HTML_VisualView.gif
deleted file mode 100644
index c0a92704ac..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_VisualView.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_VisualView.png b/docs/en_us/course_authors/source/Images/HTML_VisualView.png
deleted file mode 100644
index cde156a8b2..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_VisualView.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_VisualView_Toolbar.gif b/docs/en_us/course_authors/source/Images/HTML_VisualView_Toolbar.gif
deleted file mode 100644
index 2c54344ac0..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_VisualView_Toolbar.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_VisualView_Toolbar.png b/docs/en_us/course_authors/source/Images/HTML_VisualView_Toolbar.png
deleted file mode 100644
index 3c51696d3c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_VisualView_Toolbar.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_source_code.png b/docs/en_us/course_authors/source/Images/HTML_source_code.png
deleted file mode 100644
index 37482daac6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_source_code.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/HTML_source_code_search.png b/docs/en_us/course_authors/source/Images/HTML_source_code_search.png
deleted file mode 100644
index afa63e8124..0000000000
Binary files a/docs/en_us/course_authors/source/Images/HTML_source_code_search.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/IFrame_1.png b/docs/en_us/course_authors/source/Images/IFrame_1.png
deleted file mode 100644
index 514f9bacef..0000000000
Binary files a/docs/en_us/course_authors/source/Images/IFrame_1.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/IFrame_2.png b/docs/en_us/course_authors/source/Images/IFrame_2.png
deleted file mode 100644
index f7c0a4c0d5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/IFrame_2.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/IFrame_3.png b/docs/en_us/course_authors/source/Images/IFrame_3.png
deleted file mode 100644
index 9f7f4e6b2b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/IFrame_3.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/IFrame_4.png b/docs/en_us/course_authors/source/Images/IFrame_4.png
deleted file mode 100644
index f6f709807c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/IFrame_4.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Image305.png b/docs/en_us/course_authors/source/Images/Image305.png
deleted file mode 100644
index 71c94f1993..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Image305.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ImageMappedInputExample.gif b/docs/en_us/course_authors/source/Images/ImageMappedInputExample.gif
deleted file mode 100644
index e90f2df167..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ImageMappedInputExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ImageMappedInputExample.png b/docs/en_us/course_authors/source/Images/ImageMappedInputExample.png
deleted file mode 100644
index e1d35906fa..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ImageMappedInputExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/InsertEditLinkDBox.gif b/docs/en_us/course_authors/source/Images/InsertEditLinkDBox.gif
deleted file mode 100644
index dd80ab2f3a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/InsertEditLinkDBox.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/InsertEditLinkDBox.png b/docs/en_us/course_authors/source/Images/InsertEditLinkDBox.png
deleted file mode 100644
index 97b45c9d89..0000000000
Binary files a/docs/en_us/course_authors/source/Images/InsertEditLinkDBox.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Instructor_Dash_Course_Info.png b/docs/en_us/course_authors/source/Images/Instructor_Dash_Course_Info.png
deleted file mode 100644
index d6a304656a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Instructor_Dash_Course_Info.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/JavaScriptInputExample.gif b/docs/en_us/course_authors/source/Images/JavaScriptInputExample.gif
deleted file mode 100644
index 3848660898..0000000000
Binary files a/docs/en_us/course_authors/source/Images/JavaScriptInputExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/JavaScriptInputExample.png b/docs/en_us/course_authors/source/Images/JavaScriptInputExample.png
deleted file mode 100644
index 1c9220de00..0000000000
Binary files a/docs/en_us/course_authors/source/Images/JavaScriptInputExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/LTIExample.png b/docs/en_us/course_authors/source/Images/LTIExample.png
deleted file mode 100644
index 70c9ca2c57..0000000000
Binary files a/docs/en_us/course_authors/source/Images/LTIExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/LTIPolicyKey.gif b/docs/en_us/course_authors/source/Images/LTIPolicyKey.gif
deleted file mode 100644
index e485fc3888..0000000000
Binary files a/docs/en_us/course_authors/source/Images/LTIPolicyKey.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/LTIPolicyKey.png b/docs/en_us/course_authors/source/Images/LTIPolicyKey.png
deleted file mode 100644
index 33ae6e5f0e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/LTIPolicyKey.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Live_Course_Instructor_Dashboard.png b/docs/en_us/course_authors/source/Images/Live_Course_Instructor_Dashboard.png
deleted file mode 100644
index 32c6d239fc..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Live_Course_Instructor_Dashboard.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Live_Course_Staff_View.png b/docs/en_us/course_authors/source/Images/Live_Course_Staff_View.png
deleted file mode 100644
index 6539823323..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Live_Course_Staff_View.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Live_Course_Student_View.png b/docs/en_us/course_authors/source/Images/Live_Course_Student_View.png
deleted file mode 100644
index 5ba0e9dd9e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Live_Course_Student_View.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Live_Studio_from_LMS_Unit.png b/docs/en_us/course_authors/source/Images/Live_Studio_from_LMS_Unit.png
deleted file mode 100644
index 08df0889e8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Live_Studio_from_LMS_Unit.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Math1.gif b/docs/en_us/course_authors/source/Images/Math1.gif
deleted file mode 100644
index 6b02b4fd76..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Math1.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Math1.png b/docs/en_us/course_authors/source/Images/Math1.png
deleted file mode 100644
index e54585e25b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Math1.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Math2.gif b/docs/en_us/course_authors/source/Images/Math2.gif
deleted file mode 100644
index b251505593..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Math2.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Math2.png b/docs/en_us/course_authors/source/Images/Math2.png
deleted file mode 100644
index b0346a8226..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Math2.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Math3.gif b/docs/en_us/course_authors/source/Images/Math3.gif
deleted file mode 100644
index b0f2a92b1a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Math3.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Math3.png b/docs/en_us/course_authors/source/Images/Math3.png
deleted file mode 100644
index de3cb96405..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Math3.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Math4.gif b/docs/en_us/course_authors/source/Images/Math4.gif
deleted file mode 100644
index 5b9fcf966e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Math4.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Math4.png b/docs/en_us/course_authors/source/Images/Math4.png
deleted file mode 100644
index df9f7881fa..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Math4.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Math5.gif b/docs/en_us/course_authors/source/Images/Math5.gif
deleted file mode 100644
index ee99729a35..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Math5.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Math5.png b/docs/en_us/course_authors/source/Images/Math5.png
deleted file mode 100644
index c9e85b50d7..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Math5.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MathExpressionInputExample.gif b/docs/en_us/course_authors/source/Images/MathExpressionInputExample.gif
deleted file mode 100644
index b50a5d4bc7..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MathExpressionInputExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MathExpressionInputExample.png b/docs/en_us/course_authors/source/Images/MathExpressionInputExample.png
deleted file mode 100644
index 6585f1f57b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MathExpressionInputExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MathJax_HTML.gif b/docs/en_us/course_authors/source/Images/MathJax_HTML.gif
deleted file mode 100644
index 4d97c7734b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MathJax_HTML.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MathJax_HTML.png b/docs/en_us/course_authors/source/Images/MathJax_HTML.png
deleted file mode 100644
index a3dc4018d8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MathJax_HTML.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MathJax_Problem.gif b/docs/en_us/course_authors/source/Images/MathJax_Problem.gif
deleted file mode 100644
index 63a8801864..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MathJax_Problem.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MathJax_Problem.png b/docs/en_us/course_authors/source/Images/MathJax_Problem.png
deleted file mode 100644
index 2d4b675f4e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MathJax_Problem.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MoleculeViewer.png b/docs/en_us/course_authors/source/Images/MoleculeViewer.png
deleted file mode 100644
index 438a7be033..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MoleculeViewer.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Molecule_Editor.gif b/docs/en_us/course_authors/source/Images/Molecule_Editor.gif
deleted file mode 100644
index b5d3913349..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Molecule_Editor.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Molecule_Editor.png b/docs/en_us/course_authors/source/Images/Molecule_Editor.png
deleted file mode 100644
index d81a018d85..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Molecule_Editor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MultipleChoiceExample.gif b/docs/en_us/course_authors/source/Images/MultipleChoiceExample.gif
deleted file mode 100644
index ca14a82232..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MultipleChoiceExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MultipleChoiceExample.png b/docs/en_us/course_authors/source/Images/MultipleChoiceExample.png
deleted file mode 100644
index 92e5f648ce..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MultipleChoiceExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MultipleChoice_AdvancedEditor.gif b/docs/en_us/course_authors/source/Images/MultipleChoice_AdvancedEditor.gif
deleted file mode 100644
index cc5e156043..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MultipleChoice_AdvancedEditor.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MultipleChoice_AdvancedEditor.png b/docs/en_us/course_authors/source/Images/MultipleChoice_AdvancedEditor.png
deleted file mode 100644
index cc0ca0a8a3..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MultipleChoice_AdvancedEditor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MultipleChoice_NumericalInput.gif b/docs/en_us/course_authors/source/Images/MultipleChoice_NumericalInput.gif
deleted file mode 100644
index 15627e25df..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MultipleChoice_NumericalInput.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MultipleChoice_NumericalInput.png b/docs/en_us/course_authors/source/Images/MultipleChoice_NumericalInput.png
deleted file mode 100644
index c8c37a889f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MultipleChoice_NumericalInput.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MultipleChoice_SimpleEditor.gif b/docs/en_us/course_authors/source/Images/MultipleChoice_SimpleEditor.gif
deleted file mode 100644
index 79029e0126..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MultipleChoice_SimpleEditor.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/MultipleChoice_SimpleEditor.png b/docs/en_us/course_authors/source/Images/MultipleChoice_SimpleEditor.png
deleted file mode 100644
index 93eae5ab32..0000000000
Binary files a/docs/en_us/course_authors/source/Images/MultipleChoice_SimpleEditor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Multiple_auto_cohort_groups.png b/docs/en_us/course_authors/source/Images/Multiple_auto_cohort_groups.png
deleted file mode 100644
index 5ce8fd9c14..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Multiple_auto_cohort_groups.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/NewCategory_Discussion.png b/docs/en_us/course_authors/source/Images/NewCategory_Discussion.png
deleted file mode 100644
index e8cdac719b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/NewCategory_Discussion.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/NewComponent_HTML.gif b/docs/en_us/course_authors/source/Images/NewComponent_HTML.gif
deleted file mode 100644
index 477632c323..0000000000
Binary files a/docs/en_us/course_authors/source/Images/NewComponent_HTML.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/NewComponent_HTML.png b/docs/en_us/course_authors/source/Images/NewComponent_HTML.png
deleted file mode 100644
index 60f914fb19..0000000000
Binary files a/docs/en_us/course_authors/source/Images/NewComponent_HTML.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/NoMoreSubmissions.gif b/docs/en_us/course_authors/source/Images/NoMoreSubmissions.gif
deleted file mode 100644
index 32007b4213..0000000000
Binary files a/docs/en_us/course_authors/source/Images/NoMoreSubmissions.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/NoMoreSubmissions.png b/docs/en_us/course_authors/source/Images/NoMoreSubmissions.png
deleted file mode 100644
index 5bc4f1c4da..0000000000
Binary files a/docs/en_us/course_authors/source/Images/NoMoreSubmissions.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/NumericalInputExample.gif b/docs/en_us/course_authors/source/Images/NumericalInputExample.gif
deleted file mode 100644
index d0aefdaa8b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/NumericalInputExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/NumericalInputExample.png b/docs/en_us/course_authors/source/Images/NumericalInputExample.png
deleted file mode 100644
index e23b3af15a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/NumericalInputExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/NumericalInput_Complex.png b/docs/en_us/course_authors/source/Images/NumericalInput_Complex.png
deleted file mode 100644
index d8a30d1039..0000000000
Binary files a/docs/en_us/course_authors/source/Images/NumericalInput_Complex.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORAComponentEditor.gif b/docs/en_us/course_authors/source/Images/ORAComponentEditor.gif
deleted file mode 100644
index 7954c9b08b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORAComponentEditor.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORAComponentEditor.png b/docs/en_us/course_authors/source/Images/ORAComponentEditor.png
deleted file mode 100644
index 815fae1ada..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORAComponentEditor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_Component.gif b/docs/en_us/course_authors/source/Images/ORA_Component.gif
deleted file mode 100644
index 3a52b3389c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_Component.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_Component.png b/docs/en_us/course_authors/source/Images/ORA_Component.png
deleted file mode 100644
index d1f9c13439..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_Component.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_DuplicateWarning.gif b/docs/en_us/course_authors/source/Images/ORA_DuplicateWarning.gif
deleted file mode 100644
index 90cb07ce8d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_DuplicateWarning.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_DuplicateWarning.png b/docs/en_us/course_authors/source/Images/ORA_DuplicateWarning.png
deleted file mode 100644
index 36bae3c290..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_DuplicateWarning.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_ProblemName1.gif b/docs/en_us/course_authors/source/Images/ORA_ProblemName1.gif
deleted file mode 100644
index 450f1b8e94..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_ProblemName1.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_ProblemName1.png b/docs/en_us/course_authors/source/Images/ORA_ProblemName1.png
deleted file mode 100644
index 2df429ed0f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_ProblemName1.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_Prompt.gif b/docs/en_us/course_authors/source/Images/ORA_Prompt.gif
deleted file mode 100644
index 70f8069581..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_Prompt.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_Prompt.png b/docs/en_us/course_authors/source/Images/ORA_Prompt.png
deleted file mode 100644
index 757f146181..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_Prompt.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_Rubric.gif b/docs/en_us/course_authors/source/Images/ORA_Rubric.gif
deleted file mode 100644
index 12694da1f7..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_Rubric.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_Rubric.png b/docs/en_us/course_authors/source/Images/ORA_Rubric.png
deleted file mode 100644
index 6aacdfe84f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_Rubric.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_Settings.gif b/docs/en_us/course_authors/source/Images/ORA_Settings.gif
deleted file mode 100644
index 6a4f7c1ed5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_Settings.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_Settings.png b/docs/en_us/course_authors/source/Images/ORA_Settings.png
deleted file mode 100644
index 0f60fd8a98..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_Settings.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_Tasks.gif b/docs/en_us/course_authors/source/Images/ORA_Tasks.gif
deleted file mode 100644
index 0a39bab517..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_Tasks.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ORA_Tasks.png b/docs/en_us/course_authors/source/Images/ORA_Tasks.png
deleted file mode 100644
index e15263aa39..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ORA_Tasks.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/OpenEndedConsole_NewSubmissions.gif b/docs/en_us/course_authors/source/Images/OpenEndedConsole_NewSubmissions.gif
deleted file mode 100644
index 8441dcbb75..0000000000
Binary files a/docs/en_us/course_authors/source/Images/OpenEndedConsole_NewSubmissions.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/OpenEndedConsole_NewSubmissions.png b/docs/en_us/course_authors/source/Images/OpenEndedConsole_NewSubmissions.png
deleted file mode 100644
index 968c03c293..0000000000
Binary files a/docs/en_us/course_authors/source/Images/OpenEndedConsole_NewSubmissions.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/OpenEndedPanel.gif b/docs/en_us/course_authors/source/Images/OpenEndedPanel.gif
deleted file mode 100644
index 1e6de1fccb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/OpenEndedPanel.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/OpenEndedPanel.png b/docs/en_us/course_authors/source/Images/OpenEndedPanel.png
deleted file mode 100644
index 05c306f718..0000000000
Binary files a/docs/en_us/course_authors/source/Images/OpenEndedPanel.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PAStudent_NoSubmissions.gif b/docs/en_us/course_authors/source/Images/PAStudent_NoSubmissions.gif
deleted file mode 100644
index b7f63b07c1..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PAStudent_NoSubmissions.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PAStudent_NoSubmissions.png b/docs/en_us/course_authors/source/Images/PAStudent_NoSubmissions.png
deleted file mode 100644
index 0587e6bb2e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PAStudent_NoSubmissions.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PA_StaffDebug_Location.gif b/docs/en_us/course_authors/source/Images/PA_StaffDebug_Location.gif
deleted file mode 100644
index bac3da8c55..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PA_StaffDebug_Location.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PA_StaffDebug_Location.png b/docs/en_us/course_authors/source/Images/PA_StaffDebug_Location.png
deleted file mode 100644
index 06e88ba9f8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PA_StaffDebug_Location.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PGI_CompEditor_Settings.gif b/docs/en_us/course_authors/source/Images/PGI_CompEditor_Settings.gif
deleted file mode 100644
index da09adf8f3..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PGI_CompEditor_Settings.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PGI_CompEditor_Settings.png b/docs/en_us/course_authors/source/Images/PGI_CompEditor_Settings.png
deleted file mode 100644
index 1e4790e9fe..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PGI_CompEditor_Settings.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PGI_FromOEC_2Problems.gif b/docs/en_us/course_authors/source/Images/PGI_FromOEC_2Problems.gif
deleted file mode 100644
index 47ac20ca13..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PGI_FromOEC_2Problems.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PGI_FromOEC_2Problems.png b/docs/en_us/course_authors/source/Images/PGI_FromOEC_2Problems.png
deleted file mode 100644
index 08e7172080..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PGI_FromOEC_2Problems.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PGI_InUnitComposite.gif b/docs/en_us/course_authors/source/Images/PGI_InUnitComposite.gif
deleted file mode 100644
index ecc3951fa6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PGI_InUnitComposite.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PGI_InUnitComposite.png b/docs/en_us/course_authors/source/Images/PGI_InUnitComposite.png
deleted file mode 100644
index 065dc36d1e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PGI_InUnitComposite.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PGI_Multiple-600x.gif b/docs/en_us/course_authors/source/Images/PGI_Multiple-600x.gif
deleted file mode 100644
index ee5e256769..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PGI_Multiple-600x.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PGI_Multiple-600x.png b/docs/en_us/course_authors/source/Images/PGI_Multiple-600x.png
deleted file mode 100644
index 4d518815bb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PGI_Multiple-600x.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PGI_Single.gif b/docs/en_us/course_authors/source/Images/PGI_Single.gif
deleted file mode 100644
index 0c906366f2..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PGI_Single.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PGI_Single.png b/docs/en_us/course_authors/source/Images/PGI_Single.png
deleted file mode 100644
index 0f85455884..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PGI_Single.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PG_Calibration_Correct.gif b/docs/en_us/course_authors/source/Images/PG_Calibration_Correct.gif
deleted file mode 100644
index 9fc5d24476..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PG_Calibration_Correct.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PG_Calibration_Correct.png b/docs/en_us/course_authors/source/Images/PG_Calibration_Correct.png
deleted file mode 100644
index 050de13b09..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PG_Calibration_Correct.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PG_Calibration_Incorrect.gif b/docs/en_us/course_authors/source/Images/PG_Calibration_Incorrect.gif
deleted file mode 100644
index 77ea20b8c6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PG_Calibration_Incorrect.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PG_Calibration_Incorrect.png b/docs/en_us/course_authors/source/Images/PG_Calibration_Incorrect.png
deleted file mode 100644
index 52f525c060..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PG_Calibration_Incorrect.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PeerScoredResponse.gif b/docs/en_us/course_authors/source/Images/PeerScoredResponse.gif
deleted file mode 100644
index 9a6402df00..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PeerScoredResponse.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PeerScoredResponse.png b/docs/en_us/course_authors/source/Images/PeerScoredResponse.png
deleted file mode 100644
index 0d7565bfc6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PeerScoredResponse.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Peer_ScoredResponse.gif b/docs/en_us/course_authors/source/Images/Peer_ScoredResponse.gif
deleted file mode 100644
index 9a6402df00..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Peer_ScoredResponse.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Peer_ScoredResponse.png b/docs/en_us/course_authors/source/Images/Peer_ScoredResponse.png
deleted file mode 100644
index 0d7565bfc6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Peer_ScoredResponse.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Periodic_Table.gif b/docs/en_us/course_authors/source/Images/Periodic_Table.gif
deleted file mode 100644
index 8242489faf..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Periodic_Table.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Periodic_Table.png b/docs/en_us/course_authors/source/Images/Periodic_Table.png
deleted file mode 100644
index d266a7803f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Periodic_Table.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Pin_Discussion.png b/docs/en_us/course_authors/source/Images/Pin_Discussion.png
deleted file mode 100644
index c1fb8fddd9..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Pin_Discussion.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/PollExample.png b/docs/en_us/course_authors/source/Images/PollExample.png
deleted file mode 100644
index e21602952f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/PollExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Post_types_in_list.png b/docs/en_us/course_authors/source/Images/Post_types_in_list.png
deleted file mode 100644
index 6a68570c1d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Post_types_in_list.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbCompButton_Dropdown.gif b/docs/en_us/course_authors/source/Images/ProbCompButton_Dropdown.gif
deleted file mode 100644
index 8a3076197c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbCompButton_Dropdown.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbCompButton_Dropdown.png b/docs/en_us/course_authors/source/Images/ProbCompButton_Dropdown.png
deleted file mode 100644
index e83965239f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbCompButton_Dropdown.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbCompButton_Explanation.gif b/docs/en_us/course_authors/source/Images/ProbCompButton_Explanation.gif
deleted file mode 100644
index b212cab8f8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbCompButton_Explanation.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbCompButton_Explanation.png b/docs/en_us/course_authors/source/Images/ProbCompButton_Explanation.png
deleted file mode 100644
index 4a92ed0130..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbCompButton_Explanation.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbCompButton_MultChoice.gif b/docs/en_us/course_authors/source/Images/ProbCompButton_MultChoice.gif
deleted file mode 100644
index 91066a0826..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbCompButton_MultChoice.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbCompButton_MultChoice.png b/docs/en_us/course_authors/source/Images/ProbCompButton_MultChoice.png
deleted file mode 100644
index 01fb77a698..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbCompButton_MultChoice.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbCompButton_NumInput.gif b/docs/en_us/course_authors/source/Images/ProbCompButton_NumInput.gif
deleted file mode 100644
index c6b654fe27..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbCompButton_NumInput.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbCompButton_NumInput.png b/docs/en_us/course_authors/source/Images/ProbCompButton_NumInput.png
deleted file mode 100644
index 6277f70a4c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbCompButton_NumInput.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbCompButton_TextInput.gif b/docs/en_us/course_authors/source/Images/ProbCompButton_TextInput.gif
deleted file mode 100644
index 9a49e04418..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbCompButton_TextInput.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbCompButton_TextInput.png b/docs/en_us/course_authors/source/Images/ProbCompButton_TextInput.png
deleted file mode 100644
index efe19324e2..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbCompButton_TextInput.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbComponent_Attributes-1.png b/docs/en_us/course_authors/source/Images/ProbComponent_Attributes-1.png
deleted file mode 100644
index 8be7275a25..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbComponent_Attributes-1.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbComponent_Attributes.gif b/docs/en_us/course_authors/source/Images/ProbComponent_Attributes.gif
deleted file mode 100644
index 331276a921..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbComponent_Attributes.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbComponent_Attributes.png b/docs/en_us/course_authors/source/Images/ProbComponent_Attributes.png
deleted file mode 100644
index 76b0dea9d3..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbComponent_Attributes.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbComponent_CheckboxIcon.gif b/docs/en_us/course_authors/source/Images/ProbComponent_CheckboxIcon.gif
deleted file mode 100644
index f3ef4bdae6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbComponent_CheckboxIcon.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbComponent_CheckboxIcon.png b/docs/en_us/course_authors/source/Images/ProbComponent_CheckboxIcon.png
deleted file mode 100644
index 142cd8a772..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbComponent_CheckboxIcon.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbComponent_LMS_DisplayName.gif b/docs/en_us/course_authors/source/Images/ProbComponent_LMS_DisplayName.gif
deleted file mode 100644
index 0f4268c4ec..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbComponent_LMS_DisplayName.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProbComponent_LMS_DisplayName.png b/docs/en_us/course_authors/source/Images/ProbComponent_LMS_DisplayName.png
deleted file mode 100644
index 4dcd6a400b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProbComponent_LMS_DisplayName.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProblemList-DemoCourse.gif b/docs/en_us/course_authors/source/Images/ProblemList-DemoCourse.gif
deleted file mode 100644
index a652a4bde8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProblemList-DemoCourse.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProblemList-DemoCourse.png b/docs/en_us/course_authors/source/Images/ProblemList-DemoCourse.png
deleted file mode 100644
index 3d9794d719..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProblemList-DemoCourse.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProblemWeight_DD.gif b/docs/en_us/course_authors/source/Images/ProblemWeight_DD.gif
deleted file mode 100644
index 5815ad3ec4..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProblemWeight_DD.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProblemWeight_DD.png b/docs/en_us/course_authors/source/Images/ProblemWeight_DD.png
deleted file mode 100644
index b4ed4016b3..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProblemWeight_DD.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProblemWeight_TI.gif b/docs/en_us/course_authors/source/Images/ProblemWeight_TI.gif
deleted file mode 100644
index c69e029d8b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProblemWeight_TI.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProblemWeight_TI.png b/docs/en_us/course_authors/source/Images/ProblemWeight_TI.png
deleted file mode 100644
index 80122809ab..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProblemWeight_TI.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProblemWithAdaptiveHintExample.gif b/docs/en_us/course_authors/source/Images/ProblemWithAdaptiveHintExample.gif
deleted file mode 100644
index ae62af8cd8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProblemWithAdaptiveHintExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProblemWithAdaptiveHintExample.png b/docs/en_us/course_authors/source/Images/ProblemWithAdaptiveHintExample.png
deleted file mode 100644
index 7972323f1c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProblemWithAdaptiveHintExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProblemWrittenInLaTeX.gif b/docs/en_us/course_authors/source/Images/ProblemWrittenInLaTeX.gif
deleted file mode 100644
index 767c3f286c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProblemWrittenInLaTeX.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProblemWrittenInLaTeX.png b/docs/en_us/course_authors/source/Images/ProblemWrittenInLaTeX.png
deleted file mode 100644
index 1a317db3d0..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProblemWrittenInLaTeX.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Problem_URL.png b/docs/en_us/course_authors/source/Images/Problem_URL.png
deleted file mode 100644
index 4e2a97bff8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Problem_URL.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProblemsYouHaveSubmitted.gif b/docs/en_us/course_authors/source/Images/ProblemsYouHaveSubmitted.gif
deleted file mode 100644
index 7e9b254cc4..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProblemsYouHaveSubmitted.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProblemsYouHaveSubmitted.png b/docs/en_us/course_authors/source/Images/ProblemsYouHaveSubmitted.png
deleted file mode 100644
index b12f93d5b8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProblemsYouHaveSubmitted.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Progress_tab.png b/docs/en_us/course_authors/source/Images/Progress_tab.png
deleted file mode 100644
index ecd7b01862..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Progress_tab.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProteinBuilder.gif b/docs/en_us/course_authors/source/Images/ProteinBuilder.gif
deleted file mode 100644
index fa8958bfa5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProteinBuilder.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ProteinBuilder.png b/docs/en_us/course_authors/source/Images/ProteinBuilder.png
deleted file mode 100644
index bff7e75891..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ProteinBuilder.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Registration_page.png b/docs/en_us/course_authors/source/Images/Registration_page.png
deleted file mode 100644
index 1c7dea9657..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Registration_page.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Rerandomize.gif b/docs/en_us/course_authors/source/Images/Rerandomize.gif
deleted file mode 100644
index 7b14ce1482..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Rerandomize.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Rerandomize.png b/docs/en_us/course_authors/source/Images/Rerandomize.png
deleted file mode 100644
index 663f4cbea0..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Rerandomize.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ResponseToGrade.gif b/docs/en_us/course_authors/source/Images/ResponseToGrade.gif
deleted file mode 100644
index d56af8e251..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ResponseToGrade.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ResponseToGrade.png b/docs/en_us/course_authors/source/Images/ResponseToGrade.png
deleted file mode 100644
index 79abcc7830..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ResponseToGrade.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Rubric1.gif b/docs/en_us/course_authors/source/Images/Rubric1.gif
deleted file mode 100644
index 37df57b039..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Rubric1.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Rubric1.png b/docs/en_us/course_authors/source/Images/Rubric1.png
deleted file mode 100644
index e8cc72ac5d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Rubric1.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/SAD_Answer_Review.png b/docs/en_us/course_authors/source/Images/SAD_Answer_Review.png
deleted file mode 100644
index a4ea6cae22..0000000000
Binary files a/docs/en_us/course_authors/source/Images/SAD_Answer_Review.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/SAD_Column_Chart.png b/docs/en_us/course_authors/source/Images/SAD_Column_Chart.png
deleted file mode 100644
index 4f8966a86d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/SAD_Column_Chart.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Single_auto_cohort_group.png b/docs/en_us/course_authors/source/Images/Single_auto_cohort_group.png
deleted file mode 100644
index 5cf357271b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Single_auto_cohort_group.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/SpecProbs_List.gif b/docs/en_us/course_authors/source/Images/SpecProbs_List.gif
deleted file mode 100644
index ff74892313..0000000000
Binary files a/docs/en_us/course_authors/source/Images/SpecProbs_List.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/SpecProbs_List.png b/docs/en_us/course_authors/source/Images/SpecProbs_List.png
deleted file mode 100644
index 9eb31e15c1..0000000000
Binary files a/docs/en_us/course_authors/source/Images/SpecProbs_List.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/StudentData_Table.png b/docs/en_us/course_authors/source/Images/StudentData_Table.png
deleted file mode 100644
index 62cf438de6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/StudentData_Table.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/StudentView_GradeCutoffs.png b/docs/en_us/course_authors/source/Images/StudentView_GradeCutoffs.png
deleted file mode 100644
index ce3f19c1e2..0000000000
Binary files a/docs/en_us/course_authors/source/Images/StudentView_GradeCutoffs.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/StudentView_Problems.png b/docs/en_us/course_authors/source/Images/StudentView_Problems.png
deleted file mode 100644
index 858f3b98ba..0000000000
Binary files a/docs/en_us/course_authors/source/Images/StudentView_Problems.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Student_Gradebook.png b/docs/en_us/course_authors/source/Images/Student_Gradebook.png
deleted file mode 100644
index f5789d1308..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Student_Gradebook.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Student_Progress.png b/docs/en_us/course_authors/source/Images/Student_Progress.png
deleted file mode 100644
index b2016f9aac..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Student_Progress.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Student_Progress_list.png b/docs/en_us/course_authors/source/Images/Student_Progress_list.png
deleted file mode 100644
index 60cdb12a81..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Student_Progress_list.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Student_Progress_mouseover.png b/docs/en_us/course_authors/source/Images/Student_Progress_mouseover.png
deleted file mode 100644
index 5e9e5eb9dd..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Student_Progress_mouseover.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Subsection.gif b/docs/en_us/course_authors/source/Images/Subsection.gif
deleted file mode 100644
index fd3579f592..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Subsection.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Subsection_due_date.png b/docs/en_us/course_authors/source/Images/Subsection_due_date.png
deleted file mode 100644
index e56181914e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Subsection_due_date.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/TextInputExample.gif b/docs/en_us/course_authors/source/Images/TextInputExample.gif
deleted file mode 100644
index a9998db48d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/TextInputExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/TextInputExample.png b/docs/en_us/course_authors/source/Images/TextInputExample.png
deleted file mode 100644
index ece4257016..0000000000
Binary files a/docs/en_us/course_authors/source/Images/TextInputExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/TextInput_MultipleAnswer.gif b/docs/en_us/course_authors/source/Images/TextInput_MultipleAnswer.gif
deleted file mode 100644
index 1e9ecd9e12..0000000000
Binary files a/docs/en_us/course_authors/source/Images/TextInput_MultipleAnswer.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/TextInput_MultipleAnswer.png b/docs/en_us/course_authors/source/Images/TextInput_MultipleAnswer.png
deleted file mode 100644
index 9ac7c040f9..0000000000
Binary files a/docs/en_us/course_authors/source/Images/TextInput_MultipleAnswer.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ThreeAssmts_NoResponse.gif b/docs/en_us/course_authors/source/Images/ThreeAssmts_NoResponse.gif
deleted file mode 100644
index c029638f7c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ThreeAssmts_NoResponse.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ThreeAssmts_NoResponse.png b/docs/en_us/course_authors/source/Images/ThreeAssmts_NoResponse.png
deleted file mode 100644
index 4baa15d0a5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ThreeAssmts_NoResponse.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/TranscriptTranslations.png b/docs/en_us/course_authors/source/Images/TranscriptTranslations.png
deleted file mode 100644
index b37a11a5ab..0000000000
Binary files a/docs/en_us/course_authors/source/Images/TranscriptTranslations.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/UnitIdentifier.png b/docs/en_us/course_authors/source/Images/UnitIdentifier.png
deleted file mode 100644
index b5a299251a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/UnitIdentifier.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Unit_DisplayName_Studio.png b/docs/en_us/course_authors/source/Images/Unit_DisplayName_Studio.png
deleted file mode 100644
index c3aea05312..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Unit_DisplayName_Studio.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Units_LMS.gif b/docs/en_us/course_authors/source/Images/Units_LMS.gif
deleted file mode 100644
index 3d0690c315..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Units_LMS.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Units_LMS.png b/docs/en_us/course_authors/source/Images/Units_LMS.png
deleted file mode 100644
index 59de1c76f6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Units_LMS.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/VideoComponentEditor.gif b/docs/en_us/course_authors/source/Images/VideoComponentEditor.gif
deleted file mode 100644
index e72fe6f1a6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/VideoComponentEditor.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/VideoComponentEditor.png b/docs/en_us/course_authors/source/Images/VideoComponentEditor.png
deleted file mode 100644
index 23bb30e6c6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/VideoComponentEditor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/VideoTOC.png b/docs/en_us/course_authors/source/Images/VideoTOC.png
deleted file mode 100644
index cd84a20e66..0000000000
Binary files a/docs/en_us/course_authors/source/Images/VideoTOC.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Video_DownTrans_other.png b/docs/en_us/course_authors/source/Images/Video_DownTrans_other.png
deleted file mode 100644
index 3f7f80f8de..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Video_DownTrans_other.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Video_DownTrans_srt-handout.png b/docs/en_us/course_authors/source/Images/Video_DownTrans_srt-handout.png
deleted file mode 100644
index 8d5e93fa6a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Video_DownTrans_srt-handout.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Video_DownTrans_srt-txt.png b/docs/en_us/course_authors/source/Images/Video_DownTrans_srt-txt.png
deleted file mode 100644
index 49ab61560d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Video_DownTrans_srt-txt.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Video_LanguageTranscripts_LMS.png b/docs/en_us/course_authors/source/Images/Video_LanguageTranscripts_LMS.png
deleted file mode 100644
index 2e7e975683..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Video_LanguageTranscripts_LMS.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/VitalSource.png b/docs/en_us/course_authors/source/Images/VitalSource.png
deleted file mode 100644
index ed304d06ce..0000000000
Binary files a/docs/en_us/course_authors/source/Images/VitalSource.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/VitalSource_LMS.png b/docs/en_us/course_authors/source/Images/VitalSource_LMS.png
deleted file mode 100644
index 694fc78108..0000000000
Binary files a/docs/en_us/course_authors/source/Images/VitalSource_LMS.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Viz_Revise_EditDraft.png b/docs/en_us/course_authors/source/Images/Viz_Revise_EditDraft.png
deleted file mode 100644
index 66bd9ee015..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Viz_Revise_EditDraft.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Viz_Revise_ReplaceorDelete.png b/docs/en_us/course_authors/source/Images/Viz_Revise_ReplaceorDelete.png
deleted file mode 100644
index 4b6c2920b4..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Viz_Revise_ReplaceorDelete.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Viz_Revise_ViewLiveandPreview.png b/docs/en_us/course_authors/source/Images/Viz_Revise_ViewLiveandPreview.png
deleted file mode 100644
index eb8e93f91c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Viz_Revise_ViewLiveandPreview.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/WordCloudExample.gif b/docs/en_us/course_authors/source/Images/WordCloudExample.gif
deleted file mode 100644
index a5b26cad97..0000000000
Binary files a/docs/en_us/course_authors/source/Images/WordCloudExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/WordCloudExample.png b/docs/en_us/course_authors/source/Images/WordCloudExample.png
deleted file mode 100644
index a21f90bbcc..0000000000
Binary files a/docs/en_us/course_authors/source/Images/WordCloudExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/WriteYourOwnGraderExample.gif b/docs/en_us/course_authors/source/Images/WriteYourOwnGraderExample.gif
deleted file mode 100644
index da50c92b04..0000000000
Binary files a/docs/en_us/course_authors/source/Images/WriteYourOwnGraderExample.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/WriteYourOwnGraderExample.png b/docs/en_us/course_authors/source/Images/WriteYourOwnGraderExample.png
deleted file mode 100644
index 4f4750488e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/WriteYourOwnGraderExample.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ZoomingImage_Modified.gif b/docs/en_us/course_authors/source/Images/ZoomingImage_Modified.gif
deleted file mode 100644
index 9c7dc3bf77..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ZoomingImage_Modified.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/ZoomingImage_Modified.png b/docs/en_us/course_authors/source/Images/ZoomingImage_Modified.png
deleted file mode 100644
index ac15f3be1e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/ZoomingImage_Modified.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Zooming_Image.gif b/docs/en_us/course_authors/source/Images/Zooming_Image.gif
deleted file mode 100644
index 4a3493a7c1..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Zooming_Image.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/Zooming_Image.png b/docs/en_us/course_authors/source/Images/Zooming_Image.png
deleted file mode 100644
index 78c0f53a0b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/Zooming_Image.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/a-b-test-lms-group-0.png b/docs/en_us/course_authors/source/Images/a-b-test-lms-group-0.png
deleted file mode 100644
index e48a88ad05..0000000000
Binary files a/docs/en_us/course_authors/source/Images/a-b-test-lms-group-0.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/a-b-test-lms-group-2.png b/docs/en_us/course_authors/source/Images/a-b-test-lms-group-2.png
deleted file mode 100644
index c491e40710..0000000000
Binary files a/docs/en_us/course_authors/source/Images/a-b-test-lms-group-2.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/a-b-test-studio_unit_page.png b/docs/en_us/course_authors/source/Images/a-b-test-studio_unit_page.png
deleted file mode 100644
index 0e5816a559..0000000000
Binary files a/docs/en_us/course_authors/source/Images/a-b-test-studio_unit_page.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/a_b_test_child_expanded.png b/docs/en_us/course_authors/source/Images/a_b_test_child_expanded.png
deleted file mode 100644
index d064d72402..0000000000
Binary files a/docs/en_us/course_authors/source/Images/a_b_test_child_expanded.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/a_b_test_children.png b/docs/en_us/course_authors/source/Images/a_b_test_children.png
deleted file mode 100644
index 1baa9a7a1a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/a_b_test_children.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/about-page-course-description.png b/docs/en_us/course_authors/source/Images/about-page-course-description.png
deleted file mode 100644
index bac13041d1..0000000000
Binary files a/docs/en_us/course_authors/source/Images/about-page-course-description.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/about-page-course-image.png b/docs/en_us/course_authors/source/Images/about-page-course-image.png
deleted file mode 100644
index e0c2b3b8e1..0000000000
Binary files a/docs/en_us/course_authors/source/Images/about-page-course-image.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/about-page-course-start.png b/docs/en_us/course_authors/source/Images/about-page-course-start.png
deleted file mode 100644
index ae5c76fe26..0000000000
Binary files a/docs/en_us/course_authors/source/Images/about-page-course-start.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/about-page-course-video.png b/docs/en_us/course_authors/source/Images/about-page-course-video.png
deleted file mode 100644
index b11c0036ae..0000000000
Binary files a/docs/en_us/course_authors/source/Images/about-page-course-video.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/about_page.png b/docs/en_us/course_authors/source/Images/about_page.png
deleted file mode 100644
index e39fa264b6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/about_page.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/activation_screen.png b/docs/en_us/course_authors/source/Images/activation_screen.png
deleted file mode 100644
index f381326d77..0000000000
Binary files a/docs/en_us/course_authors/source/Images/activation_screen.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/advertised_start.png b/docs/en_us/course_authors/source/Images/advertised_start.png
deleted file mode 100644
index 114f7726ea..0000000000
Binary files a/docs/en_us/course_authors/source/Images/advertised_start.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/checklist.png b/docs/en_us/course_authors/source/Images/checklist.png
deleted file mode 100644
index 9dc20ed20a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/checklist.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/child-components-a.png b/docs/en_us/course_authors/source/Images/child-components-a.png
deleted file mode 100644
index 4874398e2e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/child-components-a.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/child-components.png b/docs/en_us/course_authors/source/Images/child-components.png
deleted file mode 100644
index 477437e4fb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/child-components.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/clock_icon.gif b/docs/en_us/course_authors/source/Images/clock_icon.gif
deleted file mode 100644
index 77f92ef5bb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/clock_icon.gif and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/clock_icon.png b/docs/en_us/course_authors/source/Images/clock_icon.png
deleted file mode 100644
index f490ddfce1..0000000000
Binary files a/docs/en_us/course_authors/source/Images/clock_icon.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/component_container.png b/docs/en_us/course_authors/source/Images/component_container.png
deleted file mode 100644
index d70ee3818d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/component_container.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/conex_selectgroupconfig.png b/docs/en_us/course_authors/source/Images/conex_selectgroupconfig.png
deleted file mode 100644
index 1ba791cedd..0000000000
Binary files a/docs/en_us/course_authors/source/Images/conex_selectgroupconfig.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/container_pub_status.png b/docs/en_us/course_authors/source/Images/container_pub_status.png
deleted file mode 100644
index 1be699bf7e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/container_pub_status.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/content_experiment_block.png b/docs/en_us/course_authors/source/Images/content_experiment_block.png
deleted file mode 100644
index 403449713e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/content_experiment_block.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/content_experiment_container.png b/docs/en_us/course_authors/source/Images/content_experiment_container.png
deleted file mode 100644
index 30185ddbce..0000000000
Binary files a/docs/en_us/course_authors/source/Images/content_experiment_container.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/content_experiment_editor.png b/docs/en_us/course_authors/source/Images/content_experiment_editor.png
deleted file mode 100644
index 7765b95a7b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/content_experiment_editor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/content_experiment_editor_group2.png b/docs/en_us/course_authors/source/Images/content_experiment_editor_group2.png
deleted file mode 100644
index 2604156898..0000000000
Binary files a/docs/en_us/course_authors/source/Images/content_experiment_editor_group2.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/content_experiment_group_config_link.png b/docs/en_us/course_authors/source/Images/content_experiment_group_config_link.png
deleted file mode 100644
index 4bd2c746f8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/content_experiment_group_config_link.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/content_experiment_page_group_config_link.png b/docs/en_us/course_authors/source/Images/content_experiment_page_group_config_link.png
deleted file mode 100644
index 6eaaca8b79..0000000000
Binary files a/docs/en_us/course_authors/source/Images/content_experiment_page_group_config_link.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/course_info.png b/docs/en_us/course_authors/source/Images/course_info.png
deleted file mode 100644
index 1808a1bd12..0000000000
Binary files a/docs/en_us/course_authors/source/Images/course_info.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/course_outline_set_grade.png b/docs/en_us/course_authors/source/Images/course_outline_set_grade.png
deleted file mode 100644
index 43296f4460..0000000000
Binary files a/docs/en_us/course_authors/source/Images/course_outline_set_grade.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/course_outline_student_view.png b/docs/en_us/course_authors/source/Images/course_outline_student_view.png
deleted file mode 100644
index a67b0879b6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/course_outline_student_view.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/course_outline_view_live.png b/docs/en_us/course_authors/source/Images/course_outline_view_live.png
deleted file mode 100644
index ea90512e12..0000000000
Binary files a/docs/en_us/course_authors/source/Images/course_outline_view_live.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/course_overview.png b/docs/en_us/course_authors/source/Images/course_overview.png
deleted file mode 100644
index 724fd6f241..0000000000
Binary files a/docs/en_us/course_authors/source/Images/course_overview.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/create-group-config.png b/docs/en_us/course_authors/source/Images/create-group-config.png
deleted file mode 100644
index fe71ef829e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/create-group-config.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/dashboard-completed-course copy.png b/docs/en_us/course_authors/source/Images/dashboard-completed-course copy.png
deleted file mode 100644
index b223880ec5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/dashboard-completed-course copy.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/dashboard-completed-course.png b/docs/en_us/course_authors/source/Images/dashboard-completed-course.png
deleted file mode 100644
index 9ba3c08d56..0000000000
Binary files a/docs/en_us/course_authors/source/Images/dashboard-completed-course.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/dashboard-course-image.png b/docs/en_us/course_authors/source/Images/dashboard-course-image.png
deleted file mode 100644
index 8dcbfc27b5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/dashboard-course-image.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/dashboard-course-to-start.png b/docs/en_us/course_authors/source/Images/dashboard-course-to-start.png
deleted file mode 100644
index 676389a1d5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/dashboard-course-to-start.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/dashboard-course.png b/docs/en_us/course_authors/source/Images/dashboard-course.png
deleted file mode 100644
index e2c9254745..0000000000
Binary files a/docs/en_us/course_authors/source/Images/dashboard-course.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/dashboard-course_adver_start.png b/docs/en_us/course_authors/source/Images/dashboard-course_adver_start.png
deleted file mode 100644
index 4fb78a4ced..0000000000
Binary files a/docs/en_us/course_authors/source/Images/dashboard-course_adver_start.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/dashboard-course_not_started.png b/docs/en_us/course_authors/source/Images/dashboard-course_not_started.png
deleted file mode 100644
index 7101eedcd2..0000000000
Binary files a/docs/en_us/course_authors/source/Images/dashboard-course_not_started.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/dashboard-no-cert-course.png b/docs/en_us/course_authors/source/Images/dashboard-no-cert-course.png
deleted file mode 100644
index ee531b7f55..0000000000
Binary files a/docs/en_us/course_authors/source/Images/dashboard-no-cert-course.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/dashboard-password-reset.png b/docs/en_us/course_authors/source/Images/dashboard-password-reset.png
deleted file mode 100644
index d4374946ca..0000000000
Binary files a/docs/en_us/course_authors/source/Images/dashboard-password-reset.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/dashboard-wrapping-course.png b/docs/en_us/course_authors/source/Images/dashboard-wrapping-course.png
deleted file mode 100644
index 922643c55c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/dashboard-wrapping-course.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/dashboard.png b/docs/en_us/course_authors/source/Images/dashboard.png
deleted file mode 100644
index 893ca9545f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/dashboard.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/discussion_category_names.png b/docs/en_us/course_authors/source/Images/discussion_category_names.png
deleted file mode 100644
index 7e95ee5b76..0000000000
Binary files a/docs/en_us/course_authors/source/Images/discussion_category_names.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/discussion_topic_names.png b/docs/en_us/course_authors/source/Images/discussion_topic_names.png
deleted file mode 100644
index acd15c0227..0000000000
Binary files a/docs/en_us/course_authors/source/Images/discussion_topic_names.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/display-name.png b/docs/en_us/course_authors/source/Images/display-name.png
deleted file mode 100644
index ad5e85fcbc..0000000000
Binary files a/docs/en_us/course_authors/source/Images/display-name.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/drag_child_component.png b/docs/en_us/course_authors/source/Images/drag_child_component.png
deleted file mode 100644
index 9e99c57500..0000000000
Binary files a/docs/en_us/course_authors/source/Images/drag_child_component.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/drag_drop.png b/docs/en_us/course_authors/source/Images/drag_drop.png
deleted file mode 100644
index ca312d5167..0000000000
Binary files a/docs/en_us/course_authors/source/Images/drag_drop.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/edge_register.png b/docs/en_us/course_authors/source/Images/edge_register.png
deleted file mode 100644
index b734549d8e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/edge_register.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/edx_registration.png b/docs/en_us/course_authors/source/Images/edx_registration.png
deleted file mode 100644
index 8a0fc5ccfb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/edx_registration.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/external-grader-correct.png b/docs/en_us/course_authors/source/Images/external-grader-correct.png
deleted file mode 100644
index 9842d580c5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/external-grader-correct.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/external-grader-incorrect.png b/docs/en_us/course_authors/source/Images/external-grader-incorrect.png
deleted file mode 100644
index d3bbcbed8a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/external-grader-incorrect.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/file_pagination.png b/docs/en_us/course_authors/source/Images/file_pagination.png
deleted file mode 100644
index b8447be1a7..0000000000
Binary files a/docs/en_us/course_authors/source/Images/file_pagination.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/file_sort.png b/docs/en_us/course_authors/source/Images/file_sort.png
deleted file mode 100644
index 280804883d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/file_sort.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/files_uploads_urls.png b/docs/en_us/course_authors/source/Images/files_uploads_urls.png
deleted file mode 100644
index 0fb1d0bc12..0000000000
Binary files a/docs/en_us/course_authors/source/Images/files_uploads_urls.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/first_course.png b/docs/en_us/course_authors/source/Images/first_course.png
deleted file mode 100644
index 240c47592e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/first_course.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/formularesponse.png b/docs/en_us/course_authors/source/Images/formularesponse.png
deleted file mode 100644
index 035112c396..0000000000
Binary files a/docs/en_us/course_authors/source/Images/formularesponse.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/formularesponse3.png b/docs/en_us/course_authors/source/Images/formularesponse3.png
deleted file mode 100644
index 49bbe6f76a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/formularesponse3.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/formularesponse6.png b/docs/en_us/course_authors/source/Images/formularesponse6.png
deleted file mode 100644
index 597bef5673..0000000000
Binary files a/docs/en_us/course_authors/source/Images/formularesponse6.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/google_login.png b/docs/en_us/course_authors/source/Images/google_login.png
deleted file mode 100644
index e6f599040e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/google_login.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/grade_range.png b/docs/en_us/course_authors/source/Images/grade_range.png
deleted file mode 100644
index c3b6a7b813..0000000000
Binary files a/docs/en_us/course_authors/source/Images/grade_range.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/grade_range_b.png b/docs/en_us/course_authors/source/Images/grade_range_b.png
deleted file mode 100644
index 69dd31fe79..0000000000
Binary files a/docs/en_us/course_authors/source/Images/grade_range_b.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/group-configuration-delete.png b/docs/en_us/course_authors/source/Images/group-configuration-delete.png
deleted file mode 100644
index 384ff2d0ad..0000000000
Binary files a/docs/en_us/course_authors/source/Images/group-configuration-delete.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/group_configurations.png b/docs/en_us/course_authors/source/Images/group_configurations.png
deleted file mode 100644
index b0a775e78e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/group_configurations.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/group_configurations_edit.png b/docs/en_us/course_authors/source/Images/group_configurations_edit.png
deleted file mode 100644
index 59a6b715e9..0000000000
Binary files a/docs/en_us/course_authors/source/Images/group_configurations_edit.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/group_configurations_experiments.png b/docs/en_us/course_authors/source/Images/group_configurations_experiments.png
deleted file mode 100644
index 4a3de76bc3..0000000000
Binary files a/docs/en_us/course_authors/source/Images/group_configurations_experiments.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/group_configurations_one_listed.png b/docs/en_us/course_authors/source/Images/group_configurations_one_listed.png
deleted file mode 100644
index c0d8211e4e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/group_configurations_one_listed.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/hangout.png b/docs/en_us/course_authors/source/Images/hangout.png
deleted file mode 100644
index 64aa2728c1..0000000000
Binary files a/docs/en_us/course_authors/source/Images/hangout.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/hangout_static_page.png b/docs/en_us/course_authors/source/Images/hangout_static_page.png
deleted file mode 100644
index ecfb77f8c6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/hangout_static_page.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/hangout_unit.png b/docs/en_us/course_authors/source/Images/hangout_unit.png
deleted file mode 100644
index 8fbf395548..0000000000
Binary files a/docs/en_us/course_authors/source/Images/hangout_unit.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/html_templates.png b/docs/en_us/course_authors/source/Images/html_templates.png
deleted file mode 100644
index 89a471853b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/html_templates.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image-modal-window.png b/docs/en_us/course_authors/source/Images/image-modal-window.png
deleted file mode 100644
index 714aa1b9fb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image-modal-window.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image-modal.png b/docs/en_us/course_authors/source/Images/image-modal.png
deleted file mode 100644
index c0749d2f6b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image-modal.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image-modeal-zoomed.png b/docs/en_us/course_authors/source/Images/image-modeal-zoomed.png
deleted file mode 100644
index 1746d56e43..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image-modeal-zoomed.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image001.png b/docs/en_us/course_authors/source/Images/image001.png
deleted file mode 100644
index 789270d277..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image001.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image127.png b/docs/en_us/course_authors/source/Images/image127.png
deleted file mode 100644
index 1568883cd3..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image127.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image249.png b/docs/en_us/course_authors/source/Images/image249.png
deleted file mode 100644
index 0204a40f98..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image249.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image287.png b/docs/en_us/course_authors/source/Images/image287.png
deleted file mode 100644
index 053e53b2c7..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image287.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image289.png b/docs/en_us/course_authors/source/Images/image289.png
deleted file mode 100644
index 1a9c4f3b64..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image289.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image290.png b/docs/en_us/course_authors/source/Images/image290.png
deleted file mode 100644
index 08f6f6e7c7..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image290.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image291.png b/docs/en_us/course_authors/source/Images/image291.png
deleted file mode 100644
index 05f02f71ab..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image291.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image292.png b/docs/en_us/course_authors/source/Images/image292.png
deleted file mode 100644
index eceeae7b03..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image292.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image293.png b/docs/en_us/course_authors/source/Images/image293.png
deleted file mode 100644
index 4766b1189b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image293.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image294.png b/docs/en_us/course_authors/source/Images/image294.png
deleted file mode 100644
index c57d36f781..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image294.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image295.png b/docs/en_us/course_authors/source/Images/image295.png
deleted file mode 100644
index 8213db3e0c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image295.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image296.png b/docs/en_us/course_authors/source/Images/image296.png
deleted file mode 100644
index db32b3a541..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image296.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image297.png b/docs/en_us/course_authors/source/Images/image297.png
deleted file mode 100644
index ed42259bfb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image297.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image298.png b/docs/en_us/course_authors/source/Images/image298.png
deleted file mode 100644
index a7f50113ec..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image298.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image299.png b/docs/en_us/course_authors/source/Images/image299.png
deleted file mode 100644
index d6b8d53b59..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image299.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image302.png b/docs/en_us/course_authors/source/Images/image302.png
deleted file mode 100644
index d238c8750a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image302.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image303.png b/docs/en_us/course_authors/source/Images/image303.png
deleted file mode 100644
index b841dfd621..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image303.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/image_link.png b/docs/en_us/course_authors/source/Images/image_link.png
deleted file mode 100644
index c0cccee52a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/image_link.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/imageresponse1.png b/docs/en_us/course_authors/source/Images/imageresponse1.png
deleted file mode 100644
index 0c8f7d89dc..0000000000
Binary files a/docs/en_us/course_authors/source/Images/imageresponse1.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/imageresponse2.png b/docs/en_us/course_authors/source/Images/imageresponse2.png
deleted file mode 100644
index 9a7aa2503c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/imageresponse2.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/inactive_groups.png b/docs/en_us/course_authors/source/Images/inactive_groups.png
deleted file mode 100644
index a527fa6e60..0000000000
Binary files a/docs/en_us/course_authors/source/Images/inactive_groups.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/latex_component.png b/docs/en_us/course_authors/source/Images/latex_component.png
deleted file mode 100644
index 55f04ca922..0000000000
Binary files a/docs/en_us/course_authors/source/Images/latex_component.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/multiple-choice-shuffle-1.png b/docs/en_us/course_authors/source/Images/multiple-choice-shuffle-1.png
deleted file mode 100644
index 61883c66be..0000000000
Binary files a/docs/en_us/course_authors/source/Images/multiple-choice-shuffle-1.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/multiple-choice-shuffle-2.png b/docs/en_us/course_authors/source/Images/multiple-choice-shuffle-2.png
deleted file mode 100644
index 0f8fb0da49..0000000000
Binary files a/docs/en_us/course_authors/source/Images/multiple-choice-shuffle-2.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/multipleresponse.png b/docs/en_us/course_authors/source/Images/multipleresponse.png
deleted file mode 100644
index c5f8043dd4..0000000000
Binary files a/docs/en_us/course_authors/source/Images/multipleresponse.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/multipleresponse2.png b/docs/en_us/course_authors/source/Images/multipleresponse2.png
deleted file mode 100644
index d237c36b1f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/multipleresponse2.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/multipleresponse3.png b/docs/en_us/course_authors/source/Images/multipleresponse3.png
deleted file mode 100644
index 084585cd09..0000000000
Binary files a/docs/en_us/course_authors/source/Images/multipleresponse3.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/nested_components_student_view.png b/docs/en_us/course_authors/source/Images/nested_components_student_view.png
deleted file mode 100644
index df4a5fc1e6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/nested_components_student_view.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/new_course.png b/docs/en_us/course_authors/source/Images/new_course.png
deleted file mode 100644
index 962ea4d96b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/new_course.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/new_course_info.png b/docs/en_us/course_authors/source/Images/new_course_info.png
deleted file mode 100644
index d8a3aeeffe..0000000000
Binary files a/docs/en_us/course_authors/source/Images/new_course_info.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/numericalresponse.png b/docs/en_us/course_authors/source/Images/numericalresponse.png
deleted file mode 100644
index 4b979a6683..0000000000
Binary files a/docs/en_us/course_authors/source/Images/numericalresponse.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/numericalresponse4.png b/docs/en_us/course_authors/source/Images/numericalresponse4.png
deleted file mode 100644
index 291456b25d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/numericalresponse4.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/numericalresponse5.png b/docs/en_us/course_authors/source/Images/numericalresponse5.png
deleted file mode 100644
index ee1fcf5da0..0000000000
Binary files a/docs/en_us/course_authors/source/Images/numericalresponse5.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/open_course.png b/docs/en_us/course_authors/source/Images/open_course.png
deleted file mode 100644
index e444e93d69..0000000000
Binary files a/docs/en_us/course_authors/source/Images/open_course.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/option_response1.png b/docs/en_us/course_authors/source/Images/option_response1.png
deleted file mode 100644
index 634a33aa75..0000000000
Binary files a/docs/en_us/course_authors/source/Images/option_response1.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/optionresponse2.png b/docs/en_us/course_authors/source/Images/optionresponse2.png
deleted file mode 100644
index 1a75819f4c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/optionresponse2.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-callouts.png b/docs/en_us/course_authors/source/Images/outline-callouts.png
deleted file mode 100644
index abf0b1f1d1..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-callouts.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-create-section.png b/docs/en_us/course_authors/source/Images/outline-create-section.png
deleted file mode 100644
index 7d4ff1ac28..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-create-section.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-delete.png b/docs/en_us/course_authors/source/Images/outline-delete.png
deleted file mode 100644
index 2e6eef556d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-delete.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-drag-new-location-collapsed.png b/docs/en_us/course_authors/source/Images/outline-drag-new-location-collapsed.png
deleted file mode 100644
index 2e000f200d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-drag-new-location-collapsed.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-drag-new-location.png b/docs/en_us/course_authors/source/Images/outline-drag-new-location.png
deleted file mode 100644
index 007e303996..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-drag-new-location.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-drag-select.png b/docs/en_us/course_authors/source/Images/outline-drag-select.png
deleted file mode 100644
index a02f5a047f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-drag-select.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-expand-collapse.png b/docs/en_us/course_authors/source/Images/outline-expand-collapse.png
deleted file mode 100644
index 00bfa2b5d2..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-expand-collapse.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-new-subsection.png b/docs/en_us/course_authors/source/Images/outline-new-subsection.png
deleted file mode 100644
index ee5dafc38d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-new-subsection.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-new-unit.png b/docs/en_us/course_authors/source/Images/outline-new-unit.png
deleted file mode 100644
index 9f6f974533..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-new-unit.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-publish-icon-section.png b/docs/en_us/course_authors/source/Images/outline-publish-icon-section.png
deleted file mode 100644
index 8b878bc9bf..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-publish-icon-section.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-publish-icon-subsection.png b/docs/en_us/course_authors/source/Images/outline-publish-icon-subsection.png
deleted file mode 100644
index 896ed460ea..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-publish-icon-subsection.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-publish-icon-unit.png b/docs/en_us/course_authors/source/Images/outline-publish-icon-unit.png
deleted file mode 100644
index 06f7ef0988..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-publish-icon-unit.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-publish-icons.png b/docs/en_us/course_authors/source/Images/outline-publish-icons.png
deleted file mode 100644
index 1a520a8353..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-publish-icons.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-unit-settings-dialog.png b/docs/en_us/course_authors/source/Images/outline-unit-settings-dialog.png
deleted file mode 100644
index 0b063f3a74..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-unit-settings-dialog.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-unit-settings.png b/docs/en_us/course_authors/source/Images/outline-unit-settings.png
deleted file mode 100644
index 489773f3e2..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-unit-settings.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline-with-units.png b/docs/en_us/course_authors/source/Images/outline-with-units.png
deleted file mode 100644
index 4d6263b301..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline-with-units.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/outline_empty.png b/docs/en_us/course_authors/source/Images/outline_empty.png
deleted file mode 100644
index 051d4b391c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/outline_empty.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/page_bar_lms.png b/docs/en_us/course_authors/source/Images/page_bar_lms.png
deleted file mode 100644
index 324e86163d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/page_bar_lms.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/pages_editor.png b/docs/en_us/course_authors/source/Images/pages_editor.png
deleted file mode 100644
index a270b49316..0000000000
Binary files a/docs/en_us/course_authors/source/Images/pages_editor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/pages_empty.png b/docs/en_us/course_authors/source/Images/pages_empty.png
deleted file mode 100644
index b6a32b8ea3..0000000000
Binary files a/docs/en_us/course_authors/source/Images/pages_empty.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/pages_page.png b/docs/en_us/course_authors/source/Images/pages_page.png
deleted file mode 100644
index 2cee8c5ab3..0000000000
Binary files a/docs/en_us/course_authors/source/Images/pages_page.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/pages_wiki_off.png b/docs/en_us/course_authors/source/Images/pages_wiki_off.png
deleted file mode 100644
index 5084ce69e5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/pages_wiki_off.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/pages_wiki_on.png b/docs/en_us/course_authors/source/Images/pages_wiki_on.png
deleted file mode 100644
index 7dc6830b7d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/pages_wiki_on.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/password-email-dialog.png b/docs/en_us/course_authors/source/Images/password-email-dialog.png
deleted file mode 100644
index daebc5f419..0000000000
Binary files a/docs/en_us/course_authors/source/Images/password-email-dialog.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/post_visible_all.png b/docs/en_us/course_authors/source/Images/post_visible_all.png
deleted file mode 100644
index d5bad323fe..0000000000
Binary files a/docs/en_us/course_authors/source/Images/post_visible_all.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/post_visible_cohort.png b/docs/en_us/course_authors/source/Images/post_visible_cohort.png
deleted file mode 100644
index 02a435ba68..0000000000
Binary files a/docs/en_us/course_authors/source/Images/post_visible_cohort.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/post_visible_default.png b/docs/en_us/course_authors/source/Images/post_visible_default.png
deleted file mode 100644
index 01487f790a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/post_visible_default.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/preview_changes.png b/docs/en_us/course_authors/source/Images/preview_changes.png
deleted file mode 100644
index b672bacf3d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/preview_changes.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/preview_draft.png b/docs/en_us/course_authors/source/Images/preview_draft.png
deleted file mode 100644
index b8d1092e56..0000000000
Binary files a/docs/en_us/course_authors/source/Images/preview_draft.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/preview_mode.png b/docs/en_us/course_authors/source/Images/preview_mode.png
deleted file mode 100644
index 28e44693c0..0000000000
Binary files a/docs/en_us/course_authors/source/Images/preview_mode.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/preview_private.png b/docs/en_us/course_authors/source/Images/preview_private.png
deleted file mode 100644
index 8fd703a29e..0000000000
Binary files a/docs/en_us/course_authors/source/Images/preview_private.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/preview_public.png b/docs/en_us/course_authors/source/Images/preview_public.png
deleted file mode 100644
index f9772ed867..0000000000
Binary files a/docs/en_us/course_authors/source/Images/preview_public.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/raw_html_editor.png b/docs/en_us/course_authors/source/Images/raw_html_editor.png
deleted file mode 100644
index 2ef1aa6066..0000000000
Binary files a/docs/en_us/course_authors/source/Images/raw_html_editor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/reset_password.png b/docs/en_us/course_authors/source/Images/reset_password.png
deleted file mode 100644
index 35e96010eb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/reset_password.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/save-group-config.png b/docs/en_us/course_authors/source/Images/save-group-config.png
deleted file mode 100644
index 2727853f75..0000000000
Binary files a/docs/en_us/course_authors/source/Images/save-group-config.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/schedule.png b/docs/en_us/course_authors/source/Images/schedule.png
deleted file mode 100644
index 3b0956d788..0000000000
Binary files a/docs/en_us/course_authors/source/Images/schedule.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/score_histogram.png b/docs/en_us/course_authors/source/Images/score_histogram.png
deleted file mode 100644
index dcc61c4b7c..0000000000
Binary files a/docs/en_us/course_authors/source/Images/score_histogram.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/score_histogram_callouts.png b/docs/en_us/course_authors/source/Images/score_histogram_callouts.png
deleted file mode 100644
index 17c5323633..0000000000
Binary files a/docs/en_us/course_authors/source/Images/score_histogram_callouts.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-delete.png b/docs/en_us/course_authors/source/Images/section-delete.png
deleted file mode 100644
index 76a49932ed..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-delete.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-edit-icon.png b/docs/en_us/course_authors/source/Images/section-edit-icon.png
deleted file mode 100644
index d16e507336..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-edit-icon.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-future.png b/docs/en_us/course_authors/source/Images/section-future.png
deleted file mode 100644
index a678bf6892..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-future.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-hidden-unit.png b/docs/en_us/course_authors/source/Images/section-hidden-unit.png
deleted file mode 100644
index 2bcc78f0b7..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-hidden-unit.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-released-with-changes.png b/docs/en_us/course_authors/source/Images/section-released-with-changes.png
deleted file mode 100644
index 56788f3b14..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-released-with-changes.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-released.png b/docs/en_us/course_authors/source/Images/section-released.png
deleted file mode 100644
index fed1f6b527..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-released.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-scheduled-with-changes.png b/docs/en_us/course_authors/source/Images/section-scheduled-with-changes.png
deleted file mode 100644
index f87b2b3707..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-scheduled-with-changes.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-settings-box.png b/docs/en_us/course_authors/source/Images/section-settings-box.png
deleted file mode 100644
index 0e5882a424..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-settings-box.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-settings-hide.png b/docs/en_us/course_authors/source/Images/section-settings-hide.png
deleted file mode 100644
index a5073733ef..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-settings-hide.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-settings-release-date.png b/docs/en_us/course_authors/source/Images/section-settings-release-date.png
deleted file mode 100644
index 0a983e3c02..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-settings-release-date.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-settings.png b/docs/en_us/course_authors/source/Images/section-settings.png
deleted file mode 100644
index 47cdaa7eae..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-settings.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-unpublished-changes.png b/docs/en_us/course_authors/source/Images/section-unpublished-changes.png
deleted file mode 100644
index 08cc248e1a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-unpublished-changes.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/section-unscheduled.png b/docs/en_us/course_authors/source/Images/section-unscheduled.png
deleted file mode 100644
index 79a8354ce8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/section-unscheduled.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/sections-outline.png b/docs/en_us/course_authors/source/Images/sections-outline.png
deleted file mode 100644
index 481d63ac29..0000000000
Binary files a/docs/en_us/course_authors/source/Images/sections-outline.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/sections_student.png b/docs/en_us/course_authors/source/Images/sections_student.png
deleted file mode 100644
index 72bd5de1c5..0000000000
Binary files a/docs/en_us/course_authors/source/Images/sections_student.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/set_html_editor.png b/docs/en_us/course_authors/source/Images/set_html_editor.png
deleted file mode 100644
index 4cbfab8a18..0000000000
Binary files a/docs/en_us/course_authors/source/Images/set_html_editor.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/settings-icons.png b/docs/en_us/course_authors/source/Images/settings-icons.png
deleted file mode 100644
index ae2f03f915..0000000000
Binary files a/docs/en_us/course_authors/source/Images/settings-icons.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/static_page_hangout.png b/docs/en_us/course_authors/source/Images/static_page_hangout.png
deleted file mode 100644
index 90cfb92e37..0000000000
Binary files a/docs/en_us/course_authors/source/Images/static_page_hangout.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/stringresponse.png b/docs/en_us/course_authors/source/Images/stringresponse.png
deleted file mode 100644
index da4f87689d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/stringresponse.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/stringresponse2.png b/docs/en_us/course_authors/source/Images/stringresponse2.png
deleted file mode 100644
index 97b84bd3cd..0000000000
Binary files a/docs/en_us/course_authors/source/Images/stringresponse2.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/student_answer_calc.png b/docs/en_us/course_authors/source/Images/student_answer_calc.png
deleted file mode 100644
index 661d6f972f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/student_answer_calc.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/student_answer_excel.png b/docs/en_us/course_authors/source/Images/student_answer_excel.png
deleted file mode 100644
index a807987ca8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/student_answer_excel.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsection-delete.png b/docs/en_us/course_authors/source/Images/subsection-delete.png
deleted file mode 100644
index 389fd64ced..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsection-delete.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsection-released.png b/docs/en_us/course_authors/source/Images/subsection-released.png
deleted file mode 100644
index d2628c8636..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsection-released.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsection-scheduled-different.png b/docs/en_us/course_authors/source/Images/subsection-scheduled-different.png
deleted file mode 100644
index 85a428ecc1..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsection-scheduled-different.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsection-scheduled.png b/docs/en_us/course_authors/source/Images/subsection-scheduled.png
deleted file mode 100644
index 4ecc33f8bf..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsection-scheduled.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsection-settings-grading.png b/docs/en_us/course_authors/source/Images/subsection-settings-grading.png
deleted file mode 100644
index d3963dfff4..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsection-settings-grading.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsection-settings-hidden.png b/docs/en_us/course_authors/source/Images/subsection-settings-hidden.png
deleted file mode 100644
index f8ec96051a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsection-settings-hidden.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsection-settings-release.png b/docs/en_us/course_authors/source/Images/subsection-settings-release.png
deleted file mode 100644
index eef250e8ba..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsection-settings-release.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsection-settings.png b/docs/en_us/course_authors/source/Images/subsection-settings.png
deleted file mode 100644
index 38558fa9a8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsection-settings.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsection-unscheduled.png b/docs/en_us/course_authors/source/Images/subsection-unscheduled.png
deleted file mode 100644
index b5dad26d55..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsection-unscheduled.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsection.png b/docs/en_us/course_authors/source/Images/subsection.png
deleted file mode 100644
index cf942b890a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsection.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsection_set_grade.png b/docs/en_us/course_authors/source/Images/subsection_set_grade.png
deleted file mode 100644
index 4579d94d85..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsection_set_grade.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsection_view_live.png b/docs/en_us/course_authors/source/Images/subsection_view_live.png
deleted file mode 100644
index 7d916d53eb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsection_view_live.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsections-settings-icon.png b/docs/en_us/course_authors/source/Images/subsections-settings-icon.png
deleted file mode 100644
index c5bb76ef6b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsections-settings-icon.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsections.png b/docs/en_us/course_authors/source/Images/subsections.png
deleted file mode 100644
index 63ad863a7a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsections.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/subsections_student.png b/docs/en_us/course_authors/source/Images/subsections_student.png
deleted file mode 100644
index 7a5fa1ad33..0000000000
Binary files a/docs/en_us/course_authors/source/Images/subsections_student.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/test-outline-view-live.png b/docs/en_us/course_authors/source/Images/test-outline-view-live.png
deleted file mode 100644
index e6fda24073..0000000000
Binary files a/docs/en_us/course_authors/source/Images/test-outline-view-live.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/test-unit-lms-added-comp.png b/docs/en_us/course_authors/source/Images/test-unit-lms-added-comp.png
deleted file mode 100644
index deb6652108..0000000000
Binary files a/docs/en_us/course_authors/source/Images/test-unit-lms-added-comp.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/test-unit-lms.png b/docs/en_us/course_authors/source/Images/test-unit-lms.png
deleted file mode 100644
index 6e1a832815..0000000000
Binary files a/docs/en_us/course_authors/source/Images/test-unit-lms.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/test-unit-studio-added-comp.png b/docs/en_us/course_authors/source/Images/test-unit-studio-added-comp.png
deleted file mode 100644
index e9361eff55..0000000000
Binary files a/docs/en_us/course_authors/source/Images/test-unit-studio-added-comp.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/test-unit-studio.png b/docs/en_us/course_authors/source/Images/test-unit-studio.png
deleted file mode 100644
index e0478f26bb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/test-unit-studio.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/test-unit-view-live.png b/docs/en_us/course_authors/source/Images/test-unit-view-live.png
deleted file mode 100644
index 6394a4ee5f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/test-unit-view-live.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/textbook_chapters.png b/docs/en_us/course_authors/source/Images/textbook_chapters.png
deleted file mode 100644
index a36672ae01..0000000000
Binary files a/docs/en_us/course_authors/source/Images/textbook_chapters.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/textbook_new.png b/docs/en_us/course_authors/source/Images/textbook_new.png
deleted file mode 100644
index 209bfd6381..0000000000
Binary files a/docs/en_us/course_authors/source/Images/textbook_new.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/transcript-download.png b/docs/en_us/course_authors/source/Images/transcript-download.png
deleted file mode 100644
index 4f0ea5c92b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/transcript-download.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-delete.png b/docs/en_us/course_authors/source/Images/unit-delete.png
deleted file mode 100644
index 3f924f7acc..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-delete.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-discard-changes.png b/docs/en_us/course_authors/source/Images/unit-discard-changes.png
deleted file mode 100644
index 842ddfa06b..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-discard-changes.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-drag-moved.png b/docs/en_us/course_authors/source/Images/unit-drag-moved.png
deleted file mode 100644
index 9976e3fc6a..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-drag-moved.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-drag-selected.png b/docs/en_us/course_authors/source/Images/unit-drag-selected.png
deleted file mode 100644
index 3634d2c269..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-drag-selected.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-dup.png b/docs/en_us/course_authors/source/Images/unit-dup.png
deleted file mode 100644
index 3a5be435ab..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-dup.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-edit-icon.png b/docs/en_us/course_authors/source/Images/unit-edit-icon.png
deleted file mode 100644
index 25622c80eb..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-edit-icon.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-edit.png b/docs/en_us/course_authors/source/Images/unit-edit.png
deleted file mode 100644
index 215c021ed3..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-edit.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-hide.png b/docs/en_us/course_authors/source/Images/unit-hide.png
deleted file mode 100644
index 9dfcaccbb6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-hide.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-never-published.png b/docs/en_us/course_authors/source/Images/unit-never-published.png
deleted file mode 100644
index d52c054786..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-never-published.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-page.png b/docs/en_us/course_authors/source/Images/unit-page.png
deleted file mode 100644
index 198b4389aa..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-page.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-pending-changes.png b/docs/en_us/course_authors/source/Images/unit-pending-changes.png
deleted file mode 100644
index f2e18469f8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-pending-changes.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-publish-button.png b/docs/en_us/course_authors/source/Images/unit-publish-button.png
deleted file mode 100644
index 2076964fd6..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-publish-button.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-published.png b/docs/en_us/course_authors/source/Images/unit-published.png
deleted file mode 100644
index cce3d8b05f..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-published.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-published_unreleased.png b/docs/en_us/course_authors/source/Images/unit-published_unreleased.png
deleted file mode 100644
index 7dad417419..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-published_unreleased.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit-unpublished.png b/docs/en_us/course_authors/source/Images/unit-unpublished.png
deleted file mode 100644
index 4188c7fdbd..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit-unpublished.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit_location.png b/docs/en_us/course_authors/source/Images/unit_location.png
deleted file mode 100644
index 375acd6d92..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit_location.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit_view_live.png b/docs/en_us/course_authors/source/Images/unit_view_live.png
deleted file mode 100644
index 0a12c4318d..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit_view_live.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/unit_view_live_button.png b/docs/en_us/course_authors/source/Images/unit_view_live_button.png
deleted file mode 100644
index c42763b128..0000000000
Binary files a/docs/en_us/course_authors/source/Images/unit_view_live_button.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/units_students.png b/docs/en_us/course_authors/source/Images/units_students.png
deleted file mode 100644
index 017611a432..0000000000
Binary files a/docs/en_us/course_authors/source/Images/units_students.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/viewing_all_or_cohort.png b/docs/en_us/course_authors/source/Images/viewing_all_or_cohort.png
deleted file mode 100644
index c3e09c8aed..0000000000
Binary files a/docs/en_us/course_authors/source/Images/viewing_all_or_cohort.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/visible_to_contentspecific.png b/docs/en_us/course_authors/source/Images/visible_to_contentspecific.png
deleted file mode 100644
index e0a7367721..0000000000
Binary files a/docs/en_us/course_authors/source/Images/visible_to_contentspecific.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/workflow-create-content.png b/docs/en_us/course_authors/source/Images/workflow-create-content.png
deleted file mode 100644
index 2b2a22c3c8..0000000000
Binary files a/docs/en_us/course_authors/source/Images/workflow-create-content.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/workflow-create-unit.png b/docs/en_us/course_authors/source/Images/workflow-create-unit.png
deleted file mode 100644
index 95266a4fb9..0000000000
Binary files a/docs/en_us/course_authors/source/Images/workflow-create-unit.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/Images/workflow-revise-content.png b/docs/en_us/course_authors/source/Images/workflow-revise-content.png
deleted file mode 100644
index 4dddc8ac32..0000000000
Binary files a/docs/en_us/course_authors/source/Images/workflow-revise-content.png and /dev/null differ
diff --git a/docs/en_us/course_authors/source/building_course/course_files.rst b/docs/en_us/course_authors/source/building_course/course_files.rst
deleted file mode 100644
index a3acdd3198..0000000000
--- a/docs/en_us/course_authors/source/building_course/course_files.rst
+++ /dev/null
@@ -1,160 +0,0 @@
-.. _Add Files to a Course:
-
-###########################
-Adding Files to a Course
-###########################
-
-
-*******************
-Overview
-*******************
-
-To use images in your course content, or to use other documents such as a
-syllabus, you must add the files to your course.
-
-* :ref:`Add a File`
-* :ref:`File URLs`
-* :ref:`Sort Files`
-* :ref:`Find Files`
-* :ref:`Lock a File`
-* :ref:`Delete a File`
-
-
-.. _Add a File:
-
-*******************
-Add a File
-*******************
- 
-You can add files that you want students to access in the course. After you add
-a file, you must link to it from a component, a course update, or in the course
-handouts. A file is only visible to students if you create a link to it.
-
-Because the file name becomes part of the URL, students can see the name of the
-file when they open it. Avoid using file names such as AnswerKey.pdf.
-
-.. warning:: 
- For PDF and image files, edX recommends that you use standard compression tools to reduce the file size before adding them to your course.
-
- If you have files that are larger than 50 MB after compression and need them for your course, contact your edX Program Manager.
-
- Furthermore, do not add video or audio files, or large data sets that are to be used by students. You should use YouTube or another hosting service to host multimedia files for your course. For storing large data sets for student use, contact your edX Program Manager.
-  
-
-
-To add files:
- 
-#. From the **Content** menu, select **Files & Uploads**.
-#. Click **Upload New File**.
-#. In the **Upload New File** dialog box, click **Choose File**.
-#. In the **Open** dialog box, select one more files that you want to upload,
-   then click **Open**.
-
-   .. note:: 
-     If you upload a file with the same name as an existing course file
-     the original file is overwritten without warning.
-
-#. To add more file, click **Load Another File** and repeat the previous step.
-#. To close the dialog box, click the **x** in the top right corner. 
-
-When you close the dialog box, the new files appear on the **Files & Uploads**
-page.
-
-.. _File URLs:
-
-*******************
-File URLs
-*******************
-
-In the Files & Uploads page, each file has has an **Embed URL** and an
-**External URL**:
-
-
-.. image:: ../Images/files_uploads_urls.png
- :alt: Image of the Files and Uploads page, with Embed URL and External URL
-     columns circled
-
-* You use the **Embed URL** to link to the file or image from a component, a
-  course update, or a course handout.
-
-* You use the **External URL** to reference the file or image from outside of
-  your course. The external URL does not work if you lock the file unless the
-  person accessing the URL is enrolled in the course.
-
-  .. warning:: You cannot use the External URL as the reference to a file or
-   image from within your course.
-
-You can double click a value in the **Embed URL** or **External URL** column to select the value, then copy it.
-
-.. _Sort Files:
-
-*******************
-Sort Files
-*******************
-
-By default, files are sorted by the **Date Added** column, with the most
-recently added first.
-
-Alternatively, can also sort the list by the **Name** column by clicking on the
-column header.
-
-For either the the **Date Added** or **Name** column, you can switch the sort
-order from descending to ascending, and back, by clicking the column header a
-second time.
-
-The current sort order is shown at the top of the file list, and the active sort
-column header is underlined:
-
-.. image:: ../Images/file_sort.png
-  :alt: Sorting files in the Files & Uploads page
-
-.. _Find Files:
-
-*******************
-Find Files
-*******************
-
-The **Files & Uploads** page lists up to 50 files.  If your course has more than
-50 files, additional files are listed on other pages.
-
-The range of the files listed on the page, and the total number of files, are
-shown at the top of the page.
-
-You can navigate through the pages listing files in two ways:
-
-* Use the **<** and **>** buttons at the top and bottom of the list to navigate
-  to the previous and next pages.
-
-* At the bottom of the page, enter the page number to skip to, then tab out of
-  the field:
-
-  
-  .. image:: ../Images/file_pagination.png
-    :alt: Pagination in the Files & Uploads page
-
-.. _Lock a File:
- 
-*******************
-Lock a File
-*******************
-
-By default, anyone can access a file you upload if they know the URL, even
-people not enrolled in your class.
-
-To ensure that those not in your class cannot view the file, click the lock
-icon.
-
-.. note:: The external URL does not work if you lock the file.
- 
-.. _Delete a File:
-
-*******************
-Delete a File
-*******************
-
-To delete a file, click the **x** icon next to the file.  You are prompted to
-confirm the deletion.
-
-.. warning:: If you have links to a file you delete, those links will be broken.
- Ensure you change those links before deleting the file.
- 
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/building_course/creating_new_course.rst b/docs/en_us/course_authors/source/building_course/creating_new_course.rst
deleted file mode 100644
index 6d48d969b8..0000000000
--- a/docs/en_us/course_authors/source/building_course/creating_new_course.rst
+++ /dev/null
@@ -1,149 +0,0 @@
-.. _Creating a New Course:
-
-###########################
-Creating a New Course
-###########################
-
-
-*******************
-Overview
-*******************
-
-This chapter describes how to create and set up your course:
-
-* :ref:`Create a New Course`
-* :ref:`Edit Your Course`
-* :ref:`Use the Course Checklist`
-* :ref:`Add Course Team Members`
-
-You can also :ref:`Export a Course` and :ref:`Import a Course` through Studio.
-You can do this when you need to edit the course in XML.
-
-.. _Edge: http://edge.edx.org
-.. _edXorg: http://edx.org
-
-.. _Create a New Course:
-  
-*******************
-Create a New Course
-*******************
-
-#. Log in to Studio.
-#. Click **New Course**.
-#. Enter course information as needed and click **Create**.
-
-  .. image:: ../Images/new_course_info.png
-     :alt: Image of the course creation page
-
-  .. note::  Enter new course information carefully. This information becomes
-   part of the URL for your course. To change the URL after the course is
-   created, you must contact edX through the Help site
-   (http://help.edge.edx.org). Additionally, because this information becomes
-   part of your course URL, the total number of characters in the following
-   four fields must be 65 or fewer.
-
-  * For **Course Name**, enter the title of your course. For example, the name
-    may be “Sets, Maps and Symmetry Groups". Use title capitalization for the
-    course title.
-
-  * For **Organization**, enter the name of your university. Do not include
-    whitespace or special characters.
-
-  * For **Course Number**, enter both a subject abbreviation and a number. For
-    example, for public health course number 207, enter **PH207**. For math
-    course 101x, enter **Math101x**. Do not include whitespace or special
-    characters in the course number.
-
-    .. note:: If your course will be open to the world, be sure to include the
-     "x". If it is exclusively an on-campus offering, do not include the "x".*
-
-  * For **Course Run**, enter the term your course will run. Do not include
-    whitespace or special characters.
-
-    The Course Run date you enter does not affect the default **Course Start
-    Date**.  See :ref:`Set Important Dates for Your Course` for more
-    information.
-
-4. Click **Save.**
-
-You then see the empty Course Outline.
-
-.. _Edit Your Course:
-
-************************
-Edit Your Course
-************************
-When you create a new course, the course opens in Studio automatically and you
-can begin editing.
-
-If you come back to Studio later, your courses are listed on the Studio login
-page.
-
- .. image:: ../Images/open_course.png
-  :alt: Image of the course on the Studio dashboard
- 
-To open the course, click the course name. You go to the Course Outline. 
-
-.. _Use the Course Checklist:
-
-************************
-Use the Course Checklist
-************************
-
-You can use a Course Checklist within Studio to help you work through the tasks
-of building a course.
-
-Categories of tasks in the Course Checklist include:
-
-* Getting Started with Studio
-* Draft a Rough Course Outline
-* Explore edX's Support Tools
-* Draft Your Course About Page
-
-From the **Tools** menu, select **Checklists**.
-
- .. image:: ../Images/checklist.png
-  :alt: Image of the course checklist
- 
-
-As shown above for the **Add Course Team Members** task, if you hover over a
-task, a button is displayed that takes you to the page to complete that task.
-
-You can expand and collapse sections of this page as needed.
-
-You can check tasks as you complete them. Studio saves your changes
-automatically. Other course staff can see your changes.
-
-.. _Add Course Team Members:
-
-************************
-Add Course Team Members
-************************
-
-Course team members are users who help you build your course.
-
-Only a team member with Admin access can add or remove course team members, or
-grant Admin access to other team members.
-
-Other course team members can edit the course and perform all tasks except
-adding and removing other new team members and granting Admin access.
-
-.. note::  Any course team member can delete content created by other team
- members.
-
-All course team members must be registered with Studio and have an active
-account.
-
-To add a course team member:
-
-#. Ensure you have Admin access.
-#. Ensure that the new team member has registered with Studio.
-#. From the **Settings** menu, select **Course Team**.
-#. Click **Add a New Team Member**.
-#. Enter the new team member's email address, then click **ADD USER**.
-
-You can also assign privileged roles to users when you work in the LMS.
-Regardless of where the role is assigned, these administrative team members can
-work on your course in both the LMS and in Studio. For more information on
-assigning roles while you run your course, see
-:ref:`Course_Staffing`.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/building_course/establish_grading_policy.rst b/docs/en_us/course_authors/source/building_course/establish_grading_policy.rst
deleted file mode 100644
index f7701389ad..0000000000
--- a/docs/en_us/course_authors/source/building_course/establish_grading_policy.rst
+++ /dev/null
@@ -1,230 +0,0 @@
-.. _Establish a Grading Policy:
-
-##############################
-Establishing a Grading Policy  
-##############################
-
-*******************
-Overview
-*******************
-
-Establishing a grading policy takes several steps. You must:
-
-#. :ref:`Set the Grade Range`
-#. :ref:`Set the Grace Period`
-#. :ref:`Configure the Assignment Types`
-#. :ref:`Graded Subsections`
-#. :ref:`The Student View of Grades`
-
-.. important:: Any changes to the course grading policy, to graded 
- subsections, or to graded components after a course begins will affect the
- student experience in the course and analysis of its data. 
-
-.. _Set the Grade Range:
-
-*******************
-Set the Grade Range
-*******************
-
-You must set the grade range for the course.  For example, your course can be
-pass/fail, or can have letter grades A through F.
-
-To set the grade range, from the **Settings** menu, select **Grading**.
-
-The control for the grade range is at the top of the Grading page.
-
-.. image:: ../Images/grade_range.png
-  :alt: Image of the Grade Range control
-
-The above example shows that you have a pass/fail grade range, with a score of
-50 as the cutoff. This is the default setting used when you create a course.
-
-You use the grade range control to change these settings:
-
-* To add a grade in the range, click the **+** icon.
-
-  A new grade is added to the range between the existing grades. For example,
-  if you add a grade in the default setting, the grade range changes to **F**
-  (0 to 50), **B** (50 to 75), and **A** (75 to 100):
-
-  .. image:: ../Images/grade_range_b.png
-    :alt: Image of an altered Grade Range control
-
-* To change the score range, move the cursor over the line dividing two grades
-  and then click and drag the line left or right.
-
-  You can see the range numbers of the two grades adjacent to the line change.
-  Release the mouse button when the line is where you want it.
-  
-* To change the name of the grade, double-click the current name of the grade
-  to select it, and then start typing the name of the new grade. For example,
-  if the original name of the grade is "Pass", you can double-click "Pass" and
-  then type "Excellent" to replace the name.
-
-  You cannot change **F** or **Fail**. 
-
-* To remove a grade, move the cursor so that it is over the grade. 
-
-  A **remove** link appears above the grade. Click the link.
-  
-  You cannot remove F or A.
-  
-After you make any changes to the grade range, you must click **Save Changes**
-at the bottom of the page.
-
-.. _Grade Ranges and Certificates:
-
-==============================
-Grade Ranges and Certificates
-==============================
-
-If you plan for your course to offer certificates, note that a student will
-qualify for a certificate by earning any grade over the F, or Fail, threshold.
-This is true regardless of how many grade levels you add in the grade range.
-
-.. _Set the Grace Period:
-
-*************************
-Set the Grace Period 
-*************************
-    
-You can set a grace period that extends homework due dates for your students. 
-
-.. note:: The grace period applies to the whole course; you cannot set a grace
- period for individual assignments.
-  
-In the Grading page, under **Grading Rules & Policies**, enter a value in the
-**Grace Period on Deadline** field. Enter the value in Hours:Minutes format.
-
-.. _Configure the Assignment Types:
-
-******************************
-Configure the Assignment Types
-******************************
-
-You must create assignment types for your course and determine the weight of
-the student's total grade for each assignment type.
-
-For example, you may have:
-
-* 10 homework assignments, worth a total of 50% of the grade; 
-* A midterm exam, worth a total of 20% of the grade; 
-* A final exam, worth 30% of the grade. 
-
-By default, a new course you create has four assignment types: 
-
-* Homework
-* Lab
-* Midterm Exam
-* Final Exam
-
-You can use these assignment types, modify or remove them, and create new
-assignment types.
-
-To create a new assignment type, in the bottom of the Grading page, click **New
-Assignment Type**, then configure the fields described below.
-
-==========================
-Assignment Type Fields
-==========================
-You configure the following fields for each assignment type:
-    
-* **Assignment Type Name:** 
-  
-  The general category of the assignment. This name will be visible to
-  students.
- 
-  .. note:: All assignments of a particular type count the same toward the
-   weight of that category. As a result, a homework assignment that contains
-   10 problems is worth the same percentage of a student's grade as a homework
-   assignment that contains 20 problems.
-  
-* **Abbreviation:** 
-  
-  This is the short name that appears next to an assignment on a student's
-  **Progress** tab.  
-
-* **Weight of Total Grade:** 
-  
-  The assignments of this type together account for the percent value set in
-  **Weight of Total Grade**.
-  
-  The total weight of all assignment types must equal 100.
-  
-  .. note:: Do not include the percent sign (%) in this field.
-  
-* **Total Number:** 
-  
-  The number of assignments of this type that you plan to include in your
-  course.
-  
-* **Number of Droppable**
-  
-  The number of assignments of this type that the grader will drop. The grader
-  will drop the lowest-scored assignments first.
-
-.. _Graded Subsections:
-
-**********************************************
-Graded Subsections
-**********************************************
-
-After you configure assignment types, as you are organizing your course, you
-set the assignment type for subsections that contain problems that are to be
-graded.
-
-Each subsection that contains problems to be graded can include only one
-assignment type. 
-
-.. note:: 
- You can only set assignment types and due dates at the subsection level. You
- cannot set assignment types or due dates for entire sections or for individual
- units within subsections. Additionally, you can designate a subsection as one,
- and only one, of the assignment types you configured.
-  
-See :ref:`Developing Course Subsections` for general instructions on
-configuring a subsection.
-
-See :ref:`Set the Assignment Type and Due Date for a Subsection` for
-instructions on designating a subsection as a graded assignment.
-
-Within a graded subsection, you create problems of the type designated for that
-subsection. You cannot not mix problems of different assignment types in the
-same subsection.
-
-For example, if you want to create a homework assignment and a lab for a
-specific topic, create two subsections. Set one subsection as the Homework
-assignment type and the other as the Lab assignment type. Both subsections can
-contain other content as well as the actual homework or lab problems.
-
-.. note:: 
- You can create problems in Studio without specifying that the subsection is an
- assignment type. However, such problems do not count toward a student's grade.
-
-See :ref:`Working with Problem Components` for instructions on creating
-problems.
-
-.. _The Student View of Grades:
-
-**************************
-The Student View of Grades
-**************************
-
-After a grading policy is in place, students can view both their problem scores
-and the percent completed and current grade in the **Progress** tab for the
-course.
-  
-  .. image:: ../Images/Progress_tab.png
-    :alt: Image of the student Progress tab
-
-Each item in the X axis of the chart is for a graded subsection. Graded
-problems in units are not broken out in the chart; the score from each problem
-in the subsection is added to that vertical bar.
-
-Graded subsections are grouped in the chart by assignment type rather than
-listed in chronological order. For example, all homework exercises are grouped
-together, followed by labs, then exams.
-
-.. note:: The **x** for an assignment in the Progress tab indicates that the 
- grade for that assignment is currently dropped. You configure how many
- assignments are dropped when you :ref:`Configure the Assignment Types`.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/building_course/export_import_course.rst b/docs/en_us/course_authors/source/building_course/export_import_course.rst
deleted file mode 100644
index 39eb370191..0000000000
--- a/docs/en_us/course_authors/source/building_course/export_import_course.rst
+++ /dev/null
@@ -1,92 +0,0 @@
-.. _Exporting and Importing a Course:
-
-#####################################
-Exporting and Importing a Course
-#####################################
-
-You can :ref:`Export a Course` and :ref:`Import a Course` through Studio.
-
-.. _Export a Course:
-
-***************
-Export a Course
-***************
-
-There are several reasons you may want to export your course:
-
-* To save your work
-* To edit the XML in your course directly
-* To create a backup copy of your course, which you can import if you want to
-  revert the course back to a previous state
-* To create a copy of your course that you can later import into another course
-  instance and customize
-* To share with another instructor for another class
- 
- 
-When you export your course, Studio creates a **.tar.gz** file that includes
-the following course data:
- 
-* Course content (all Sections, Subsections, and Units)
-* Course structure
-* Individual problems
-* Pages
-* Course assets
-* Course settings
- 
-
-The following data is not exported with your course:
- 
-* User data
-* Course team data
-* Discussion data
-* Certificates
-
-To export a course:
- 
-#. From the **Tools** menu, select **Export**.
-#. Click **Export Course Content**.
-
-When the export completes you can then access the .tar.gz file on your computer.
-
-
-.. _Import a Course:
-
-*************** 
-Import a Course
-***************
-
-.. warning::
-
-	Content of the imported course replaces all the content of this course.
-	**You cannot undo a course import**. We recommend that you first export the
-	current course, so you have a backup copy of it.
- 
-There are several reasons you may want to import a course:
-
-* To run a new version of an existing course
-* To replace an existing course 
-* To load a course you developed outside of Studio
-
-
-The course that you import must be in a .tar.gz file (that is, a .tar file
-compressed with GNU Zip). This .tar.gz file must contain a course.xml file in a
-course data directory. The tar.gz file must have the same name as the course
-data directory. It may also contain other files.
- 
-If your course uses legacy layout structures, you may not be able to edit the
-course in Studio, although it will probably appear correctly on Edge. To make
-sure that your course is completely editable, ensure that all of your material
-is embedded in a unit.
- 
-The import process has five stages. During the first two stages, you must stay
-on the Course Import page. You can leave this page after the Unpacking stage has
-completed. We recommend, however, that you don't make important changes to your
-course until the import operation has completed.
- 
-To import a course:
- 
-#. From the **Tools** menu, select **Import**.
-#. Click **Choose a File to Import**.
-#. Locate the file that you want, and then click **Open**.
-#. Click **Replace my course with the one above**.
-
diff --git a/docs/en_us/course_authors/source/building_course/handouts_updates.rst b/docs/en_us/course_authors/source/building_course/handouts_updates.rst
deleted file mode 100644
index 10362e793f..0000000000
--- a/docs/en_us/course_authors/source/building_course/handouts_updates.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-.. _Adding Course Updates and Handouts:
-
-######################################################
-Adding Course Updates and Handouts
-######################################################
-
-You add course updates and handouts in Studio.
-
-Student's see the course updates and handouts in the **Course Info** tab in your
-course:
-
-.. image:: ../Images/course_info.png
- :alt: Image of the Course Info page.
-
-.. _Add a Course Update:
-
-**********************
-Add a Course Update
-**********************
-
-You add updates to notify students of exams, changes in the course schedule, or
-anything else of a more urgent nature.
-
-To add a course update:
-
-#. From the **Content** menu, select **Updates**. 
-#. Click **New Update**.
-#. Enter your update in the HTML editor that opens.
-
-  .. note::  You must enter the update in HTML. 
-
-4. Click **Save**.
-
-.. _Add Course Handouts:
-
-**********************
-Add Course Handouts
-**********************
-You can add course handouts that are visible to students on the **Course Info**
-page. To add an uploaded file to the course handouts, you will need its URL.
-
-.. note::  You must :ref:`Add Files to a Course` before you can add them as
- course handouts.
-
-#. From the **Content** menu, select **Updates**. 
-#. In the **Course Handouts** panel, click **Edit**.
-#. Edit the HTML to add links to the files you uploaded. See :ref:`Add a Link in
-   an HTML Component` for more information.
-#. Click **Save**.
-
diff --git a/docs/en_us/course_authors/source/building_course/index.rst b/docs/en_us/course_authors/source/building_course/index.rst
deleted file mode 100644
index 4dc6790013..0000000000
--- a/docs/en_us/course_authors/source/building_course/index.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-.. _Setting up Your Course Index:
-
-##########################
-Setting up Your Course
-##########################
-
-Use the chapters in this section to create and build your course.
-
-For information on how to develop your course content in the Studio Outline
-page, see :ref:`Developing Your Course Index`.
-
-.. toctree::
-   :maxdepth: 2
-
-   creating_new_course
-   export_import_course
-   course_files
-   handouts_updates
-   pages
-   textbooks
-   establish_grading_policy
-   setting_up_student_view
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/building_course/pages.rst b/docs/en_us/course_authors/source/building_course/pages.rst
deleted file mode 100644
index 38f1d17944..0000000000
--- a/docs/en_us/course_authors/source/building_course/pages.rst
+++ /dev/null
@@ -1,293 +0,0 @@
-.. _Adding Pages to a Course:
-
-###########################
-Adding Pages to a Course
-###########################
-
-
-*******************
-Overview
-*******************
-
-By default, your course has the following pages:
-
-* Courseware
-* Course Info
-* Discussion
-* Wiki
-* Progress
-
-You cannot rename, reorder, or remove these pages.
-
-You can add pages to your course. Each page appears in your course's navigation bar. 
-
-For example, the following navigation bar includes the default pages as well as the
-**Course Schedule** and **Supplements & Instructor's Blog** pages.
-
-.. image:: ../Images/page_bar_lms.png
- :alt: Image of the page bar in the LMS
-
-You can create other pages for the grading policy, course slides, or any other purpose. More examples of pages you can add are:
-
-* A Google calendar, by embedding the code for it.  
-
-* A dynamic HTML calendar, using the template in :ref:`Code for Dynamic HTML Schedule`.
-
-* An instant hangout.  See :ref:`Google Instant Hangout` for more information.
-
-See:
-
-* :ref:`Add a Page`
-* :ref:`Show or Hide the Course Wiki Page`
-* :ref:`Reorder Pages`
-* :ref:`Delete a Page`
-* :ref:`Code for Dynamic HTML Schedule`
-
-
-.. _`Add a Page`:
-
-****************
-Add a Page
-****************
-
-#. In Studio, from the **Content** menu, select **Pages**. 
-
-  .. image:: ../Images/pages_page.png
-   :alt: Image of the Pages screen
-
-
-2. Click **Add a New Page**. A page with the title **Empty** is added to the list:
-
-  .. image:: ../Images/pages_empty.png
-   :alt: Image of the Pages screen with a new Empty page
-
-3. Click **Edit**. The HTML editor opens.  
-
-  .. image:: ../Images/pages_editor.png
-   :alt: Image of the Page editor
-
-4. Enter text for your page. See :ref:`Options for Editing HTML Components` for more information about using the editor.
-#. Click **Settings** to edit the **Display Name**. The display name is the name of the page visible to students in the course.
-#. Click **Save**. 
-
-The new page is immediately available to students, if the course has started.
-
-.. _Show or Hide the Course Wiki Page:
-
-************************************************
-Show or Hide the Course Wiki Page
-************************************************
-
-By default, your course includes a Wiki page. Students and course staff can use the Wiki to post content and comment on others' content.
-
-If you do not want to use the Wiki in your course, you can hide the page.
-
-The eye icon in the Wiki object indicates that the Wiki page is visible in your course:
-
-.. image:: ../Images/pages_wiki_on.png
- :alt: Image of the Pages page with the Wiki made visible
-
-Click the eye icon to hide the Wiki page. The icon changes:
-
-.. image:: ../Images/pages_wiki_off.png
- :alt: Image of the Pages page with the Wiki made visible
-
-Click it again to make the Wiki page visible.
-
-.. note:: Content remains in the Wiki when you hide the page. For example, if a student bookmarks a Wiki topic, then you hide the Wiki page, the student can still use the bookmark to access that Wiki topic. All content that was previously posted in the Wiki remains available after you hide the Wiki page, and any students logged in to edX can access the content if they know the URL. 
-
-.. _Reorder Pages:
-
-****************
-Reorder Pages
-****************
-
-You can reorder pages in your course by dragging and dropping the pages to different locations. 
-
-To move a page, hover over the element handle on the right side of the page row until the mouse pointer changes to a four-headed arrow. Then, click and drag the page to the location that you want.
-
-.. note:: You cannot reorder the Courseware, Course Info, Discussion, Wiki, and Progress pages that your course includes by default
-
-.. _Delete a Page:
-
-****************
-Delete a Page
-****************
-
-To delete a page that you previously added, click the trash can icon in the row for the page.  You are prompted to confirm the deletion.
-
-.. _Code for Dynamic HTML Schedule:
-
-********************************
-Code for Dynamic HTML Schedule
-********************************
-
-You can use the following code in a page to provide a dynamic HTML schedule in your course.
-
-.. code-block:: html
-
-
-	<div class= "syllabus">
-
-	<table style="width: 100%">
- 		<col width="10%">
- 		<col width="15%">
-  		<col width="10%">
-  		<col width="30%">
-  		<col width="10%">
-  		<col width="15%">
-  		<col width="10%">
-  
-	<!-- Headings -->
- 		 <thead>
-    			<td class="day"> Wk of </td>
-   			<td class="topic"> Topic </td>
-   			<td class="reading"> Read </td>
-    			<td class="video"> Lecture Sequence </td>	
-    			<td class="slides"> Slides </td>
-    			<td class="assignment"> HW/Q </td>
-			<td class="due"> Due </td>
-  		</thead>
-  
-	<!-- Week 1 Row 1 -->
- 		 <tr class="first">
-   			<td class="day">10/22</td>
-			<td class="topic">Topic 1</td>
-			<td class="reading">Ch. 1</td>
-    			<td class="video"><a href="#">L1: Title</a></td>
-    			<td class="slides"><a href="#">L1</a></td>
-    			<td class="assignment"><a href="#">HW 1</a></td>
-    			<td class="due">11/04</td>
-  		</tr>
-  
-	<!-- Week 1 Row 2 -->
-    		<tr>
-    			<td class="day"> </td>
-    			<td class="topic"></td>
-    			<td class="reading"></td>
-    			<td class="video"><a href="#">L2: Title</a></td>
-    			<td class="slides"><a href="#">L2</a></td>
-    			<td class="assignment">     </td>
-   			 <td class="due">      </td>
-  		</tr>
-
-   		 <tr> <td class="week_separator" colspan=7> <hr/> </td> </tr>
-  
-	<!-- Week 2 Row 1 -->
- 		 <tr>
-    			<td class="day">10/29</td>
-    			<td class="topic">Topic 2</td>
-    			<td class="reading">Ch. 2</td>
-    			<td class="video"> <a href="#">L3: Title<a></td>
-   			 <td class="slides"><a href="#">L3</a></td>
-    			<td class="assignment"><a href="#">Quiz 1</a></td>
-    			<td class="due">11/11</td>
- 		 </tr>
-  
-	<!-- Week 2 Row 2 -->
- 		<tr>
-  			<td class="day"></td>
-    			<td class="topic"></td>
-    			<td class="reading"></td>
-    			<td class="video"><a href="#">L4: Title</a></td>
-    			<td class="slides"><a href="#">L4</a> </td>
-    			<td class="assignment"></td>
-    			<td class="due"></td>
-  		</tr>
-  		<tr> <td class="week_separator" colspan=7> <hr/> </td> </tr>
-  
-	<!-- Week 3 Row 1 -->
-  		<tr>
-    			<td class="day">11/05</td>
-    			<td class="topic">Topic 3</td>
-    			<td class="reading">Ch. 3</td>
-    			<td class="video"><a href="#">L5: Title</a></td>
-    			<td class="slides"><a href="#">L5 </a></td>
-    			<td class="assignment"><a href="#">HW 2</a></td>
-    			<td class="due">11/18 </td>
-  		</tr>
-  
-	<!-- Week 3 Row 2 -->
-		<tr>
-    			<td class="day"> </td>
-    			<td class="topic"> </td>
-    			<td class="reading"></td>
-    			<td class="video"><a href="#">L6: Title</a></td>
-    			<td class="slides"><a href="#">L6 </a></td>
-    			<td class="video"></td>
-    			<td class="assignment"></td>
-    			<td class="due"></td>
-  		</tr>
-  		<tr> <td class="week_separator" colspan=7> <hr/> </td> </tr>
-  
-	<!-- Week 4 Row 1 -->
-  		<tr>
-    			<td class="day">11/12</td>
-    			<td class="topic">Topic 4</td>
-    			<td class="reading">Ch. 4</td>
-    			<td class="video"><!--<a href="#">L7: Title</a>--> L7: Title</td>
-    			<td class="slides"><!--<a href="#">L7</a>-->L7</td>
-    			<td class="assignment"><!--<a href="#">Quiz 2</a>-->Quiz 2</td>
-    			<td class="due"> 11/25 </td>
-  		</tr>
-  
-	<!-- Week 4 Row 2 -->
-    		<tr>
-    			<td class="day"></td>
-    			<td class="topic"></td>
-    			<td class="reading"></td>
-    			<td class="video"><!--<a href="#">L8: Title</a>-->L8: Title</td>
-    			<td class="slides"><!--<a href="#">L8</a>-->L8</td>
-    			<td class="assignment"></td>
-    			<td class="due"></td>
-  		</tr>
-  		<tr> <td class="week_separator" colspan=7> <hr/> </td> </tr>
-  
-	<!-- Week 5 Row 1 -->
-  		<tr>
-    			<td class="day">11/19</td>
-    			<td class="topic">Topic 5</td>
-    			<td class="reading">Ch. 5</td>
-    			<td class="video"><!--<a href="#">L9: Title</a>-->L9: Title</td>
-    			<td class="slides"><!--<a href="#">L9</a>-->L9</td>
-    <			td class="assignment"><!--<a href="#">HW 3</a>-->HW 3</td>
-    			<td class="due"> 12/02 </td>
-  		</tr>
-  
-	<!-- Week 5 Row 2 -->
-   		<tr>
-    			<td class="day"></td>
-    			<td class="topic"></td>
-    			<td class="reading"></td>
-    			<td class="video"><!--<a href="#">L10: Title</a>-->L10: Title</td>
-    			<td class="slides"><!--<a href="#">L10</a>-->L10 </td>
-    			<td class="assignment"></td>
-    			<td class="due"></td>
-  		</tr>
-  		<tr> <td class="week_separator" colspan=7> <hr/> </td> </tr>
-  
-	<!-- Week 6 Row 1 -->
-  		<tr>
-    			<td class="day">11/26</td>
-    			<td class="topic">Topic 6</td>
-    			<td class="reading">Ch. 6</td>
-    			<td class="video"><!--<a href="#"><L11: Title</a>-->L11: Title </td>
-    			<td class="slides"><!--<a href="#">L11</a>-->L11</td>
-    			<td class="assignment"><!--<a href="#">HW 4</a>-->HW 4</td>
-    			<td class="due">12/09</td>
-  		</tr>
-  
-	<!-- Week 6 Row 2 -->
-    		<tr>
-			<td class="day"> </td>
-    			<td class="topic"> </td>
-    			<td class="reading"></td>
-    			<td class="video"><!--<a href="#">L12: Title</a>-->L12: Title</td>
-    			<td class="slides"><!--<a href="#">L12</a>-->L12</td>
-    			<td class="assignment"></td>
-    			<td class="due">      </td>
-		</tr>
-
-	</table>
-	</div>
-
diff --git a/docs/en_us/course_authors/source/building_course/setting_up_student_view.rst b/docs/en_us/course_authors/source/building_course/setting_up_student_view.rst
deleted file mode 100644
index 95ce5d3cb2..0000000000
--- a/docs/en_us/course_authors/source/building_course/setting_up_student_view.rst
+++ /dev/null
@@ -1,402 +0,0 @@
-.. _Setting up the Student View:
-
-######################################################
-Setting up the Student View
-######################################################
-
-
-*******************
-Overview
-*******************
-
-This chapter describes how you set up your course to be displayed in the course
-summary page and in a student's **Current Courses** dashboard. The information
-you configure for your course is important for prospective and current students
-to understand.
-
-See:
-
-* :ref:`The Course Summary Page`
-* :ref:`The Student Dashboard`
-* :ref:`Set Important Dates for Your Course`
-* :ref:`The Course Start Date`
-* :ref:`Set the Advertised Start Date`
-* :ref:`The Course End Date`
-* :ref:`Describe Your Course`
-* :ref:`Add a Course Image`
-* :ref:`Add a Course Video`
-* :ref:`Set Course Requirements`
-* :ref:`A Template For Course Overview`
-
-
-.. _Edge: http://edge.edx.org
-.. _edX.org: http://edx.org
-
-.. _The Course Summary Page:
-
-***********************************
-The Course Summary Page
-***********************************
-
-The following image shows an example course summary page.  Students can see the
-course summary page before registering, and may decide to register based on the
-content of the page. You configure the contents of this page in Studio, as
-described in this chapter:
-
-.. image:: ../Images/about_page.png
- :alt: An image of the course summary page.
-
-
-
-
-.. _The Student Dashboard:
-
-***********************************
-The Student Dashboard
-***********************************
-
-
-If a student registers for your course, the course is then listed on the
-**Current Courses** dashboard, with the course image.  From the dashboard, a
-student can open a course that has started. If the course has not started, the
-student can see the start date, as explained in this chapter.
-
-.. image:: ../Images/dashboard.png
- :alt: An image of the dashboard
-
-
-
-.. _Set Important Dates for Your Course:
-
-***********************************
-Set Important Dates for Your Course
-***********************************
-
-You must set dates and times for enrollment and for the course.
-
-In Studio, from the **Settings** menu, select **Schedule and Details**.  
-
-.. image:: ../Images/schedule.png
-  :alt: An image of the course schedule page.
-
-Follow the on-screen text to enter the course and enrollment schedule.
-
-.. note:: 
- The Time fields on this page, and the times that students see, use UTC
- (Universal Coordinated Time)
-
-
-.. _The Course Start Date:
-
-***********************************
-The Course Start Date
-***********************************
-
-.. note:: The default **Course Start Date** is set far into the future, to
- **01/01/2030**. This is to ensure that your course does not start before
- you intend it to.  You must change the course start date to the date you want
- students to begin using the course.
-
-Students see the course start date on their **Current Courses** dashboards and
-on the course summary page.
-
-The following example shows the course start date on the course summary page:
-
-.. image:: ../Images/about-page-course-start.png
- :alt: An image of the course summary page, with the start date circled.
-
-.. note:: For courses on edX.org_, you must communicate the course start date to
- your edX Program Manager, to ensure the date is accurate on the course
- summary page.
-
-In the dashboard, if the course has not yet started, students see the start
-date as in the following example:
-
-.. image:: ../Images/dashboard-course-to-start.png
- :alt: An image of a course that has not started in the student dashboard, with
-     the start date circled.
-
-If the course has started, students see the start date as in the following
-example:
-
-.. image:: ../Images/dashboard-course.png
- :alt: An image of a course listing in the student dashboard, with the start
-     date circled
-
-
-
-.. _Set the Advertised Start Date:
-
-***********************************
-Set the Advertised Start Date
-***********************************
-
-You can set an advertised start date for your course that is different than the
-course start date you set in the **Schedule and Details** page. You may want to
-do this if there is uncertainty about the exact start date. For example, you
-could advertise the start date as **Spring, 2014**.
-
-To set an advertised start date:
-
-#. From the **Settings** menu, select **Advanced Settings**.
-#. Find the **Course Advertised Start Date** policy key. The default value is
-   **null**.
-#. Enter the value you want to display as the advertised start date. You can
-   use any string, enclosed in double quotation marks. If you format the string
-   as a date (for example, as 02/01/2014), the value is parsed and presented to
-   students as a date.
-
-  .. image:: ../Images/advertised_start.png
-   :alt: Image of the advertised start date policy key with a value of "anytime, self-paced"
-
-4. Click **Save Changes** at the bottom of the page.
-
-  The start date shown on the dashboard is now the value of the **Course
-  Advertised Start Date** policy key:
-
-  .. image:: ../Images/dashboard-course_adver_start.png
-   :alt: An image of a course listing in the student dashboard, with the
-     advertised start date circled.
-
-If you do not change the default course start date (01/01/2030), and the
-**Course Advertised Start Date** policy value is ``null``, then the student
-dashboard does not list a start date for the course. Students just see that
-the course has not yet started.
-
-.. _The Course End Date:
-
-***********************************
-The Course End Date
-***********************************
-
-The course end date is the date after which students can no longer earn credit
-toward certificates. Students who have earned certificates can view them after
-the course end date.
-
-.. important::
- If you do not set a course end date, students will not be able to access
- earned certificates.
-
-.. note:: 
- For courses on edX.org_, you must communicate the course end date to
- your edX Program Manager, to ensure the date is accurate on the course
- summary page.
-
-After grades and certificates are finalized, students see the course end date
-on their personal **Current Courses** dashboards, as shown in the following
-examples.
-
-* If grades and certificates are not yet finalized, students can see the course
-  end date and a message:
-
-  .. image:: ../Images/dashboard-wrapping-course.png
-   :alt: Image of a course on the student dashboard that has ended, but not
-     been graded
-
-* When grades and certificates are finalized, students who have not earned a
-  certificate see their score and the score required to earn a certificate:
-  
-  .. image:: ../Images/dashboard-no-cert-course.png
-   :alt: Image of a course on the student dashboard that has ended, but not
-     been graded
-
-* Students whose final score is equal to or higher than the required score can
-  click **Download Certificate** to get their certificates as PDFs:
-
-  .. image:: ../Images/dashboard-completed-course.png
-   :alt: Image of a course on the student dashboard that has ended, but not
-     been graded
-
-
-.. _Describe Your Course:
-
-************************
-Describe Your Course
-************************
-
-On Edge_, students that you explicitly invite see the description of your course
-on the course summary page.
-
-For example, the course description is circled in the following course summary
-page:
-
-.. image:: ../Images/about-page-course-description.png
- :alt: Image of a course summary with the description circled
-
-.. note:: For courses on edX.org_, you must communicate the course description
- to your edX Program Manager, to ensure the content is accurate on the course
- summary page.
-
-#. From the **Settings** menu, select **Schedule & Details**.
-#. Scroll down to the **Introducing Your Course** section, then locate the
-   **Course Overview** field.
-
-.. image:: ../Images/course_overview.png
-  :alt: Image of the HTML course description.
-
-3. Overwrite the content as needed for your course, following the directions in
-   the boilerplate text. Do not edit HTML tags. For a template that includes
-   placeholders, see :ref:`A Template For Course Overview`.
-
-   .. note:: There is no save button. Studio automatically saves your changes.
- 
-4. Click **your course summary page** in the text beneath the field to test how
-   the description will appear to students.
-
-.. _Add a Course Image:
-
-************************
-Add a Course Image
-************************
-
-The course image that you add in Studio appears on the student dashboard. 
-
-On Edge_, the image also appears on the course summary page.
-
-In the following example, the course image that was added in Studio is circled
-in the student dashboard:
-
-.. image:: ../Images/dashboard-course-image.png
- :alt: Image of the course image in the student dashboard
-
-On edX.org_, the course image you add in Studio does not appear on the course
-summary page automatically. You must work directly with your edX Program Manager
-to set up the course summary page.
-
-The course image should be a minimum of 660 pixels in width by 240 pixels in
-height, and in .JPG or .PNG format.
-
-#. From the **Settings** menu, select **Schedule & Details**.
-#. Scroll down to the **Course Image** section.
-#. To select an image from your computer, click **Upload Course Image**, then
-   follow the prompts to find and upload your image.
-#. View your dashboard to test how the image will appear to students.
-
-.. _Add a Course Video:
-
-*********************************
-Add a Course Introduction Video
-*********************************
-
-On Edge_, the course introduction video appears on the course summary page that
-students see.
-
-.. note:: On edX.org_, you work directly with your Program Manager to set up the
- course video in the summary page.
-
-In the following example, the course video is circled in the course summary
-page:
-
-.. image:: ../Images/about-page-course-video.png
- :alt: Image of the course video in the course summary page.
-
-The course video should excite and entice potential students to register, and
-reveal some of the personality the instructors bring to the course.
-
-The video should answer these key questions:
-
-* Who is teaching the course?
-* What university or college is the course affiliated with?
-* What topics and concepts are covered in your course?
-* Why should a learner register for your course?
-
-The video should deliver your message as concisely as possible and have a run
-time of less than 2 minutes.
-
-Ensure your course introduction video follows the same :ref:`Compression
-Specifications` and :ref:`Video Formats` guidelines as course content videos.
-
-To add a course introduction video:
-
-
-#. Upload the course video to YouTube. Make note of the code that appears
-   between **watch?v =** and **&feature** in the URL. This code appears in the
-   green box below.
-
-  .. image:: ../Images/image127.png
-    :alt: Image of a sample course video
-    
-2. From the **Settings** menu, select **Schedule & Details**.
-#. Scroll down to the **Course Introduction Video** section.
-#. In the field below the video box, enter the YouTube video ID (the code you
-   copied in step 1). When you add the code, the video automatically loads in
-   the video box. Studio automatically saves your changes.
-#. View your course summary page to test how the video will appear to students.
-
-.. _Set Course Requirements:
-
-************************
-Set Course Requirements
-************************
-The estimated Effort per Week appears at the bottom of the course summary page.
-
-#. From the **Settings** menu, select **Schedule & Details**.
-#. Scroll down to the **Requirements** section.
-#. In the **Hours of Effort per Week** field, enter the number of hours you
-   expect students to work on this course each week.
-#. View your course summary page to test how the requirements will appear to students.
-
-.. _A Template For Course Overview:
-
-************************************************
- A Template For Your Course Overview
-************************************************
-
-  
-Replace the placeholders in the following template with your information.
-
-.. code-block:: html
-
-  <section class="about">
-    <h2>About This Course</h2>
-    <p>Include your long course description here. The long course description
-      should contain 150-400 words.</p>
-    <p>This is paragraph 2 of the long course description. Add more paragraphs
-      as needed. Make sure to enclose them in paragraph tags.</p>
-  <section>
-  <section class="prerequisites">
-    <h2>Prerequisites</h2>
-    <p>Add information about class prerequisites here.</p>
-  </section>
-  <section class="course-staff">
-    <h2>Course Staff</h2>
-    <article class="teacher">
-      <div class="teacher-image">
-        <!-- Replace the path below with the path to your faculty image. -->
-        <img src="/c4x/edX/edX101/asset/Placeholder_FacultyImage.jpg"
-          align="left" style="margin:0 20 px 0"/>
-      </div>
-      <h3>Staff Member</h3>
-      <p>Biography of instructor/staff member</p>
-    </article>
-  <article class="teacher">
-      <div class="teacher-image">
-        <img src="/c4x/edX/edX101/asset/Placeholder_FalcutyImage.jpg"/>
-      </div>
-      <h3>Staff Member Name</h3>
-      <p>Biography of instructor/staff member</p>
-    </article>
-  </section>
-  <section class="faq">
-    <section class="responses">
-      <h2>Frequently Asked Questions</h2>
-      <article class="response">
-        <h3>Do I need to buy a textbook?</h3>
-        <p>No, a free online version of Chemistry: Principles, Patterns, and
-          Applications, First Edition by Bruce Averill and Patricia Eldredge
-          will be available, though you can purchase a printed version
-          (published by FlatWorld Knowledge) if you'd like.</p>
-      </article>
-      <article class="response">
-        <h3>Question 2?</h3>
-        <p>Answer 2.</p>
-      </article>
-    </section>
-  </section>
-
-  <!--Paragraph: <p>CONTENT GOES IN HERE</p> -->
-  <!--Line break: <br/> -->
-  <!--Hyperlink: <a href="URL">LINK TEXT</a> -->
-  <!--Email hyperlink: <a href="mailto:EMAIL@ADDRESS.COM">LINK TEXT</a> -->
-  <!--Bold text: <b>TEXT</b> -->
-  <!--Italic text: <i>TEXT</i> -->
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/building_course/textbooks.rst b/docs/en_us/course_authors/source/building_course/textbooks.rst
deleted file mode 100644
index 7fde02aeb2..0000000000
--- a/docs/en_us/course_authors/source/building_course/textbooks.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-.. _Adding Textbooks:
-
-###########################
-Adding Textbooks
-###########################
-
-You can add PDF textbooks for your course.  
-
-.. note::  Do not use image files (for example, .PNG files) as textbooks for
- your course, as they are not accessible to screen readers. Review the
- :ref:`Best Practices for Accessible PDFs` for more information.
-
-Each textbook that you add is displayed to students as a tab in the course
-navigation bar.
-
-It's recommended that you upload a separate PDF file for each chapter of your
-textbook.
-
-When students open the textbook tab in the course, they can navigate the
-textbook by chapter:
-
-.. image:: ../Images/textbook_chapters.png
- :alt: Image of a textbook in a course.
-
-To add a textbook:
-
-#. From the **Content** menu, select **Textbooks**.
-#. Click **New Textbook**. The following screen opens:
-
-  .. image:: ../Images/textbook_new.png
-   :alt: Image of the New Textbook page.
-
-3. Enter the **Textbook Name**.
-#. Enter the first **Chapter Name**.
-#. To upload a PDF file from your computer, click **Upload PDF**.  Follow the
-   prompts to upload your file.
-#. To add more chapters, click **+Add a Chapter** and repeat steps 3 and 4.
-#. Click **Save**.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/change_log.rst b/docs/en_us/course_authors/source/change_log.rst
deleted file mode 100644
index 781121d937..0000000000
--- a/docs/en_us/course_authors/source/change_log.rst
+++ /dev/null
@@ -1,490 +0,0 @@
-############
-Change Log
-############
-
-       
-*****************
-October, 2014
-*****************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 10/27/14
-     - Fixed the code sample in :ref:`Script Tag Format` in the :ref:`Write
-       Your Own Grader` chapter.
-   * - 
-     - Fixed a bug in :ref:`Text Input Problem XML`.
-   * - 10/23/14
-     - Added note about limited support of annotation problem type to
-       :ref:`Annotation`.
-   * - 10/16/14
-     - Updated :ref:`Set Important Dates for Your Course` to reflect change
-       that course dates now use UTC.
-   * - 10/14/14
-     - Removed the chapter on the Vital Source E-Reader tool, as it is no
-       longer supported in the edX Platform.
-   * - 10/7/14
-     - Added the :ref:`Including Student Cohorts` chapter.
-       
-       
-*****************
-September, 2014
-*****************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 09/30/14
-     - Added information about accessing edX Insights to the :ref:`Course Data`
-       and :ref:`Enrollment` chapters.
-   * - 09/04/14
-     - Updated the :ref:`Discussions` and :ref:`Discussions for Students and
-       Staff` chapters to include information about choosing the type of post
-       and to reflect changes in the user interface.
-   * - 09/11/14
-     - Added info about possible problem types to :ref:`Problem with Adaptive Hint`.
-   * - 
-     - Removed "These problems only allow integers and a few select constants" from table of problem types in :ref:`Create Exercises`.
-   * - 
-     - Added a note about angle bracket characters to the :ref:`Dropdown` topic.
-   * - 09/26/14
-     - Added :ref:`Molecule Viewer` to :ref:`Create Exercises`
-
-**************
-August, 2014
-**************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 08/28/14
-     - Updated documentation in :ref:`Developing Your Course Index`
-       for new capabilities to publish or hide multiple units 
-       from the outline.
-   * - 
-     - Added documentation for :ref:`Creating Content Experiments`.
-   * - 08/22/14
-     - Added warnings about the effects of changing the course grading policy,
-       graded subsections, or graded components after the course begins.
-   * - 08/20/14
-     - Added :ref:`Browsers` to the :ref:`Getting Started Index` section.
-   * - 08/18/14
-     - Expanded the :ref:`Example Messages to Students` in the :ref:`Launch`
-       chapter.
-   * - 08/12/14
-     - Updated documentation to address the new publishing workflow and user
-       interface. 
-
-       Created a new part, :ref:`Developing Your Course Index`,
-       which contains the following chapters:
-
-       * :ref:`Getting Started with Course Content Development`
-       * :ref:`Developing Your Course Outline`
-       * :ref:`Developing Course Sections`
-       * :ref:`Developing Course Subsections`
-       * :ref:`Developing Course Units`
-       * :ref:`Developing Course Components`
-       * :ref:`Controlling Content Visibility`
-       * :ref:`Testing Your Course Content`
-
-   * - 08/07/14
-     - Added information about reviewing and duplicating the contents of
-       previously-sent messages to the :ref:`Bulk Email` section.
-   * - 
-     - Updated the :ref:`view_enrollment_count` section to include the
-       breakdown by certification track in the enrollment section.
-
-.. note::
- In several cases, older links to changed topics were made obsolete by
- subsequent changes.
-
-
-
-***********
-July, 2014
-***********
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 07/30/14
-     - Expanded the :ref:`Discussions for Students and Staff` chapter to
-       include information about adding posts, responses, and comments.
-   * - 07/23/14
-     - Added the section :ref:`Grade Ranges and Certificates` to the
-       :ref:`Establish a Grading Policy` chapter.
-   * - 07/22/14
-     - Added :ref:`Example Messages to Students` to the :ref:`Launch` chapter.
-   * - 07/15/14
-     - Added the :ref:`Discussions for Students and Staff` chapter.
-   * - 07/11/14
-     - Added :ref:`Track Student Activity` to the :ref:`Student Data`
-       chapter.
-   * - 07/10/14
-     - Updated the :ref:`Discussions` chapter to add an
-       :ref:`Overview_discussions` section and to reflect changes to the
-       Discussion list and to the Advanced Settings page in Studio.
-   * - 07/01/14
-     - Updated :ref:`The Course End Date` to specify when students can earn and
-       access certificates.
-   
-
-
-***********
-June, 2014
-***********
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 06/20/14
-     - Added a `Preface`_ with resources for course teams, developers,
-       researchers, and students.
-   * - 06/18/14    
-     - In the :ref:`View and download student data` section, updated the
-       example report to include the new User ID column.
-   * - 06/17/14   
-     - Added :ref:`Video TOC` section to :ref:`Working with Video Components`.
-   * - 06/06/14   
-     - Added a description of email task workflow states to the :ref:`Launch`
-       section.
-   * - 06/03/14   
-     - Added :ref:`gradebook` to the :ref:`Grades` section.
-
-***********
-May, 2014
-***********
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 05/30/14
-     - Update :ref:`Working with Video Components` to include recommendations to
-       use .mp4 and .webm video formats for browser compatibility
-   * - 05/27/14
-     - Based on the new requirement to specify the complete location identifier
-       of a problem to adjust student grades, revised the :ref:`Grades` section.
-   * - 05/22/14
-     - Reorganized, updated, and streamlined these sections in the :ref:`Running
-       Your Course Index` chapter:
-
-       * Divided *Grade and Answer Data* into separate sections for
-         :ref:`Grades` and :ref:`Review_Answers`.
-       * Moved information about the student **Progress** page from the
-         *Checking Student Progress and Issuing Certificates* section to
-         :ref:`Grades`.
-       * Renamed the *Checking Student Progress and Issuing Certificates*
-         section to :ref:`Checking Student Progress and Issuing Certificates`.
-
-   * - 
-     - Updated :ref:`Problem with Adaptive Hint` to reflect formatting
-       requirements for the Python script and the correct_answer attribute.
-   * - 05/21/14
-     - Added warning that version 1 of the :ref:`Open Response Assessments<Open
-       Response Assessment>` suite has been deprecated and added a link to the
-       `new ORA information <http://edx-open-response-
-       assessments.readthedocs.org/en/latest/>`_.
-   * - 05/16/14
-     - Updated :ref:`Working with Video Components` to reflect UI changes.
-   * - 05/14/14
-     - Updated the :ref:`Running Your Course Index` chapter to remove references
-       to the "new beta" Instructor Dashboard.
-   * - 05/13/14
-     - Updated the :ref:`Enrollment` section to reflect that usernames or email
-       addresses can be used to batch enroll students.
-   * - 
-     - Updated the :ref:`Grades` section to reflect new features on the problem
-       **Staff Debug** viewer for rescoring, resetting attempts, and deleting
-       student state.
-   * - 
-     - Updated the :ref:`Course_Staffing` section to state the labeling
-       differences between Studio and the LMS with respect to course team roles.
-   * - 05/09/14
-     - Updated :ref:`Assigning_discussion_roles` with a note about course staff
-       requiring explicit granting of discussion administration roles.
-   * - 
-     - Added VitalSource topic.
-   * - 05/08/14
-     - Added warnings to :ref:`Add a File` about file size.
-   * - 05/07/14
-     - Updated the :ref:`Discussions` chapter to include a topic on closing
-       discussions.
-   * - 05/06/14
-     - Expanded the :ref:`Grades` chapter to include a topic on interpreting the
-       score histograms for problems.
-   * - 
-     - Updated :ref:`LTI Component` to reflect changes to the Studio UI.
-   * - 05/02/14
-     - Updated :ref:`Drag and Drop` information.
-   * - 
-     - Updated :ref:`IFrame` documentation.
-
-************
-April, 2014
-************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 04/28/14
-     - Updated :ref:`Show or Hide the Course Wiki Page` to include note about Wiki content being available after you hide the Wiki page.
-   * - 04/26/14
-     - Updated label information; added XML information to :ref:`Problem with Adaptive Hint`.  
-   * - 04/24/14
-     - Expanded the :ref:`Grades` chapter to include topics on interpreting the grade reports and student progress page.
-   * -    
-     - Updated the :ref:`Beta_Testing` section to reflect feature changes.
-   * -
-     - Updated the :ref:`Working with HTML Components` chapter to reflect changes to the HTML component editor.
-   * - 04/23/14
-     - Reorganized information about problems into :ref:`Exercises and Tools Index` section.
-   * - 04/23/14
-     - Added more information about collecting language and location data from students to :ref:`Student Data`.  
-   * - 04/22/14
-     - Updated the :ref:`Bulk Email` section with information about the dashboard option to opt out of course email.
-   * - 
-     - In :ref:`Discussions`, corrected the steps to "Create Discussion
-       Categories".
-   * - 
-     - Updated the :ref:`Enrollment` section to reflect feature changes.
-   * - 04/16/14
-     - Updated "Transcripts in Additional Languages" in :ref:`Working with Video Components`.
-   * -  
-     - In support of new features, added the following sections to :ref:`Multiple Choice` problems:
-
-       * :ref:`Shuffle Answers in a Multiple Choice Problem`
-       * :ref:`Targeted Feedback in a Multiple Choice Problem`
-       * :ref:`Answer Pools in a Multiple Choice Problem`
-
-   * - 04/15/14
-     - Updated *Testing Your Course* to include a section on how to *View Your
-       Live Course*.
-   * - 04/11/14
-     - Expanded the :ref:`Grades` section to include a topic on interpreting the Student Answer Distribution report. 
-   * - 04/08/14
-     - Updated the chapter :ref:`Working with HTML Components` to reflect the
-       new HTML editor. 
-   * - 04/07/14
-     - Expanded the :ref:`Course Data`, :ref:`Enrollment`, and
-   * - 04/03/14
-     - Updated the :ref:`Adding Pages to a Course` chapter to reflect ability to :ref:`Show or Hide the Course Wiki Page`.
-   * - 04/02/14
-     - Reorganized the sections Building a *Course Index* and
-       *Creating Course Content Index* to better reflect the workflow of
-       building a new course.
-   * - 04/01/14 
-     - Update the :ref:`Establish a Grading Policy` chapter to emphasize that
-       grading is applied to subsections only.
-   * - 
-     - Updated the :ref:`Releasing Your Course Index` section to include
-       :ref:`Launch`.
-   
-
-************
-March, 2014
-************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change  
-   * - 03/31/14 
-     - Expanded the :ref:`Grades` chapter to include the new
-       :ref:`Review_Answers` section.
-   * - 03/27/14
-     - Updated the :ref:`Adding Pages to a Course` section to reflect feature
-       changes.
-   * - 03/27/14
-     - Updated the section on :ref:`Beta_Testing` to include the new "batch add" feature.
-   * - 03/19/14
-     - Updated the sections on :ref:`Beta_Testing`, :ref:`Discussions`,
-       :ref:`Grades`, and :ref:`Student Data` with changes to the new Instructor Dashboard.
-   * - 03/17/14
-     - Reorganized this document into major sections: 
-
-       * :ref:`Getting Started Index`
-
-       * Building a Course Index
-
-       * :ref:`Creating Course Content Index`
-
-       * :ref:`Exercises and Tools Index`
-
-       * :ref:`Releasing Your Course Index`
-
-       * :ref:`Running Your Course Index`
-
-       * :ref:`Information for Your Students Index`
-
-   * - 03/10/14
-     - Added information about setting up your course summary page to 
-
-       * :ref:`The Course Start Date`
-
-       * :ref:`The Course End Date`
-
-       * :ref:`Add a Course Image`
-
-       * :ref:`Add a Course Video`
-
-       * :ref:`Describe Your Course`
-
-   
-
-****************
-February, 2014
-****************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change  
-   * - 02/25/14
-     - Updated :ref:`Add Files to a Course` section to include new External URL
-       feature.
-   * -
-     - Updated :ref:`Add a Link to a File` and :ref:`Add an Image to an HTML
-       Component` to specify you must use the file's Embed URL.
-   * - 02/24/14
-     - Created new chapter, :ref:`Getting Started with edX`.
-   * -
-     - Updated :ref:`Add a Course Video` section.
-   * - 02/21/14
-     - Added the :ref:`Beta_Testing` chapter. 
-   * - 02/19/14
-     - Updated :ref:`Import LaTeX Code` to reflect new workflow and UI change
-       for creating Latex HTML components.
-   * - 02/18/14
-     - Included several enhancements to the chapter :ref:`Establish a Grading
-       Policy`
-   * - 02/14/14
-     - Added :ref:`Additional Transcripts` section to :ref:`Working with Video
-       Components`; updated :ref:`Video Advanced Options`.
-   * -
-     - Added the :ref:`Course Data`, :ref:`Course_Staffing`, and
-       :ref:`Enrollment` chapters.
-   * - 02/11/14
-     - Added :ref:`Gene Explorer` and updated :ref:`Periodic Table`
-       and :ref:`Molecule Editor`.
-   * - 02/07/14
-     - Added section on :ref:`Full Screen Image`.
-   * - 02/06/14
-     - Added :ref:`Periodic Table` and :ref:`Molecule Editor`
-   * - 02/05/14
-     - Added section :ref:`Set the Advertised Start Date`.
-   * - 02/04/14
-     - Added the :ref:`Student Data` and :ref:`Grades` chapters.
-   * - 
-     - Added :ref:`Multiple Choice and
-       Numerical Input` and :ref:`Protein Builder`.
-   
-
-**************
-January, 2014
-**************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change  
-   * - 01/29/2014
-     - Added the chapter :ref:`Google Instant Hangout`.
-   * - 01/24/2014
-     - Added the :ref:`Discussions` and :ref:`Guidance for Discussion
-       Moderators` chapters.
-   * - 
-     - Added more detailed instructions to :ref:`Zooming image`
-   * - 01/21/2014
-     - Added information about accessibility in the topic :ref:`Adding
-       Textbooks`.
-   * - 01/14/2014
-     - Added info about scoring (:ref:`ORA Access Scores`) and due dates in
-       :ref:`Open Response Assessment`.
-   * - 01/13/2014
-     - Extensive updates to Organizing Your Course Content and
-       :ref:`Working with HTML Components`.
-   * - 01/08/2014
-     - Updated :ref:`Add Files to a Course` to reflect addition of sorting to
-       the **Files & Uploads** page.
-   * - 
-     - Updated :ref:`Set Important Dates for Your Course` to reflect change to
-       default course start date to 2029.
-   * - 01/07/2014
-     - Updated :ref:`Text Input` with info about multiple strings.
-   * - 
-     - Added info about template to :ref:`Checkbox`.
-   * - 01/06/2014
-     - Created :ref:`Custom JavaScript`
-   * - 01/06/2014
-     - Created :ref:`Zooming image`
-   * - 01/01/2014
-     - Updated the chapters Organizing Your Course Content and
-       Testing Your Course to reflect changes in the Course Outline
-       design.
-
-***************
-December, 2013
-***************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change  
-   * - 12/20/2013
-     - Made :ref:`ORA for Students` into template that instructors can
-       customize.
-   * - 12/19/2013
-     - Created "Tools" topic. (Note 4/10/14: Topic merged into :ref:`Create Exercises`.)
-   * - 12/18/2013
-     - Updated documentation about video player options in :ref:`Working with
-       Video Components`.
-   * - 12/13/2013
-     - Created :ref:`LTI Component`.
-   * - 
-     - Created :ref:`ORA for Students`.
-   * - 12/12/2013
-     - Added the edX :ref:`Glossary`.
-   * - 12/11/2013
-     - Added the chapter :ref:`Guidelines for Creating Accessible Content`.
-   * - 12/10/2013
-     - Added note about number of responses in "Available to Grade" column in
-       :ref:`Open Response Assessment`.
-   * - 
-     - Added :ref:`MathJax in Studio`.
-   * - 12/09/2013
-     - Created :ref:`MathJax in Studio`.
-   * - 12/05/2013
-     - Complete revision of edX Studio documentation and integration of edX101
-       content.
-
-.. _Preface: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/cohorts/cohort_config.rst b/docs/en_us/course_authors/source/cohorts/cohort_config.rst
deleted file mode 100644
index eb92ec6df6..0000000000
--- a/docs/en_us/course_authors/source/cohorts/cohort_config.rst
+++ /dev/null
@@ -1,456 +0,0 @@
-.. _Enabling and Configuring Cohorts:
-
-############################################
-Enabling and Configuring the Cohort Feature
-############################################
-
-To support discussions that are divided by cohort, you select a strategy
-for assigning your students to cohort groups: automated assignment, manual
-assignment, or a hybrid approach. See :ref:`Options for Assigning Students to
-Cohorts`. You also decide whether to change any of the course-wide discussion
-topics so that they are divided by cohort instead of unified for all students. 
-
-After you select a strategy, you complete these configuration steps (as
-applicable):
-
-#. :ref:`Enable the cohort feature<Enable Cohorts>`.
-
-#. Based on the strategy you select for assigning students to cohort groups:
-   
-  * :ref:`Define the auto cohort groups<Define Auto Cohort Groups>`.
-
-  * :ref:`Define the manual cohort groups<Define the Manual Cohort Groups>` and
-    then :ref:`assign students<Assign Students to Cohort Groups
-    Manually>` to them.
-
-  * Do both. 
-
-3. Identify the :ref:`course-wide discussion topics<Identifying Private
-   CourseWide Discussion Topics>` that you want to be divided by cohort. This
-   procedure is optional.
-
-You complete these procedures in Studio and on the Instructor Dashboard. For an
-optimal student experience, configuration of the cohort feature should be as
-complete as possible prior to the start date of your course. 
-
-If you need to make changes to the way you have configured the cohort feature
-while your course is running, please see :ref:`Altering Cohort Configuration`.
-
-.. _Enable Cohorts:
-
-********************************
-Enabling the Cohort Feature
-********************************
-
-#. Open the course in Studio. 
-
-#. Select **Settings**, then **Advanced Settings**.
-
-#. In the **Cohort Configuration** field, place your cursor between the
-   supplied pair of braces.
-
-#. Type ``"cohorted": true``. 
-
-#. Click **Save Changes**. Studio reformats the name:value pair you just
-   entered to indent it on a new line.
-   
- .. image:: ../Images/Enable_cohorts.png
-  :alt: Cohort Configuration dictionary field with the cohorted key defined 
-        as true
-
-You can then :ref:`implement the automated assignment strategy<Implementing the
-Automated Assignment Strategy>`, :ref:`implement the manual assignment
-strategy<Implementing the Manual Assignment Strategy>`, or both.
-
-.. _Implementing the Automated Assignment Strategy:
-
-***************************************************
-Implementing the Automated Assignment Strategy
-***************************************************
-
-To implement automated assignment of students to cohort groups you define the
-auto cohort groups in the **Cohort Configuration** advanced setting field.
-
-You complete this procedure if you are using either the automated or hybrid
-assignment strategy for your course. For more information, see :ref:`All
-Automated Assignment` or :ref:`Hybrid Assignment`.
-
-.. _Define Auto Cohort Groups:
-
-============================================
-Define the Auto Cohort Groups
-============================================
-
-Before you define your auto cohort groups, note that students can see the name
-of the cohort group they are assigned to. The message "This post is visible
-only to {cohort name}" appears with each post in discussion topics that are
-divided by cohort. See :ref:`Read the Cohort Indicator in Posts`.
-
-.. note:: You cannot delete cohort groups or change their names. If you need 
- to make changes to the way you have configured the cohort feature while your course is running, please see :ref:`Altering Cohort Configuration`.
-
-#. Open the course in Studio. 
-
-#. Select **Settings**, then **Advanced Settings**.
-
-#. In the **Cohort Configuration** field, place your cursor after the opening
-   brace character (``{``) and press Enter.
-
-#. On the new line, you define the ``"auto_cohort_groups":`` policy key,
-   followed by one or more cohort group names enclosed by square brackets (``[
-   ]``). You can define a set of auto cohort groups or just one.
-
-   To define a set of groups, you type each group name on a new line, enclose
-   it within quotation marks (``" "``), and separate the quoted name values
-   with commas. For example:
-   
- .. code:: 
-
-   "auto_cohort_groups": [
-       "Example Group Name A",
-       "Example Group Name B",
-       "Example Group Name C"
-   ]
-   
-.. comment is here only to allow indented formatting of next line
-
-  You can also define only a single auto cohort group. Type
-   ``"auto_cohort_groups": ["Example Group Name"]`` and then press Enter again.
-
-5. Type a comma after the closing square bracket character (``],``). You must
-   include a comma to separate each of the policy keys that you define.
-   
-#. Click **Save Changes**. Studio resequences and reformats your entry. Scroll
-   back to the **Cohort Configuration** field to verify that your entry was
-   saved as you expect. Entries that do not contain all of the required
-   punctuation characters revert to the previous value when you save, and no
-   warning is presented.
-
- .. image:: ../Images/Multiple_auto_cohort_groups.png
-  :alt: Cohort Configuration dictionary field with the auto_cohort_groups key 
-        with three values
-
-.. spacer line
-
- .. image:: ../Images/Single_auto_cohort_group.png
-  :alt: Cohort Configuration dictionary field with the auto_cohort_groups key 
-        with one value
-
-Any student who is not already assigned to a cohort group will be randomly
-assigned to one of the auto cohort groups when she visits any of the course
-discussion topics.
-
-For a report that includes the cohort group assignment for every enrolled
-student, review the student profile information for your course. See
-:ref:`View and download student data`.
-
-.. _Implementing the Manual Assignment Strategy:
-
-***************************************************
-Implementing the Manual Assignment Strategy
-***************************************************
-
-To implement manual assignment of students to cohort groups, you define the
-manual cohort groups and then assign students to them. 
-
-You complete these procedures if you are using either the manual or hybrid
-assignment strategy for your course. For more information, see :ref:`All Manual
-Assignment` or :ref:`Hybrid Assignment`.
-
-You must :ref:`enable the cohort feature<Enable Cohorts>` for your course
-before you can complete these procedures.
-
-
-.. _Define the Manual Cohort Groups:
-
-==========================================
-Define the Manual Cohort Groups
-==========================================
-
-Before you define your manual cohort groups, note that students can see the
-name of the cohort group they are assigned to. The message "This post is
-visible only to {cohort name}" appears with each post in discussion topics that
-are divided by cohort. See :ref:`Read the Cohort Indicator in Posts`.
-
-.. note:: You cannot delete cohort groups or change their names. If you need 
- to make changes to the way you have configured the cohort feature while your
- course is running, please see :ref:`Altering Cohort Configuration`.
-
-#. View the live version of your course. For example, in Studio click **View
-   Live**.
-
-#. Click **Instructor**, then click **Membership**. 
-
-#. Scroll to the **Cohort Management** section at the bottom.
-
-#. Click **Add Cohort Group**.
-
-#. Supply a name for the group, and then click **Save** below the **New Cohort
-   Name** field.
-
-.. _Assign Students to Cohort Groups Manually:
-
-==========================================
-Assign Students to Cohort Groups Manually
-==========================================
-
-.. note:: Manual assignments should be as complete as possible before your 
- course starts. If student enrollment continues after your course starts, you
- should continue to assign new students to cohort groups. 
-
-#. View the live version of your course. For example, in Studio click **View
-   Live**.
-
-#. Click **Instructor**, then click **Membership**. 
-
-#. Scroll to the **Cohort Management** section at the bottom.
-
-#. Select a cohort group from the drop down list.
-
-#. In the **Add students** field, enter the username or email address of a
-   single student, or enter multiple names or addresses separated by commas or
-   new lines. You can copy data from a CSV file of email addresses and paste it
-   into this field.
-
-#. Click **Add Students**. The students are assigned to the selected manual
-   cohort group. A message appears to indicate the number of students who were
-   added to the cohort group. Because students can belong to only one cohort
-   group, the message also indicates the number of students whose assignment to
-   another cohort group was changed by this procedure.
-
-For a report that includes the cohort group assignment for every enrolled
-student, review the student profile information for your course. See
-:ref:`View and download student data`.
-
-.. _Identifying Private CourseWide Discussion Topics:
-
-*****************************************************************
-Configuring Course-Wide Discussion Topics As Divided
-*****************************************************************
-
-When you enable the cohort feature for a course, all of the course-wide
-discussion topics provide unified access to posts for all students. You can
-configure one or more of the course-wide topics to be divided by cohort
-instead.
-
-.. note:: The content-specific discussion topics in the course, which are 
- added to units as discussion components, are always divided by cohort.
-
-For more information about content-specific and course-wide discussion topics,
-see :ref:`Organizing_discussions`.
-
-Before you configure course-wide discussion topics to be divided by cohort, you
-add the topics in Studio. See :ref:`Create CourseWide Discussion Topics`. 
-
-In the example given for creating course-wide discussion topics, a single
-topic, Course Q&A, is added to the system-supplied General topic. The steps in
-the following procedure expand on that example: you have now decided to enable
-the cohort feature for your course. The posts that you intend to make to the
-Course Q&A and General topics, and the subjects you expect students to explore
-there, are appropriate for a unified student audience. However, you also want
-to give students some course-wide topics that are divided by cohort. You define
-two more course-wide discussion topics, Announcements and Brainstorming.
-
-You also decide to apply a naming convention so that students will know 
-the audience for their posts before they add them. See :ref:`Apply Naming
-Conventions to Discussion Topics`. 
-
-.. image:: ../Images/Discussion_Add_cohort_topics.png
- :alt: Discussion Topic Mapping field with four course-wide discussion topics 
-       defined
-
-.. _Configure CourseWide Discussion Topics as Private:
-
-======================================================
-Identify Divided Course-Wide Discussion Topics
-======================================================
-
-In the steps that follow, you configure two topics so that they are divided by
-cohort. On the Studio **Advanced Settings** page, the two topics appear as
-follows in the **Discussion Topic Mapping** field:
-
-.. code::
-
-      "Brainstorming (private)": {
-          "id": "i4x-edX-Open-edx_demo_course_brainstorming"
-      },
-      "Announcements (private)": {
-          "id": "i4x-edX-Open-edx_demo_course_announcements"
-      }
-
-#. Open the course in Studio. 
-
-#. Select **Settings**, then **Advanced Settings**.
-
-#. In the **Cohort Configuration** field, place your cursor after the opening
-   brace character (``{``) and press Enter.
-
-#. On the new line, you define the ``"cohorted_discussions":`` policy key,
-   followed by one or more course-wide discussion topic IDs enclosed by
-   square brackets (``[ ]``). You can define a set of discussion topics or just
-   one.
-
-   To define a set of topics, you type the value of the "id" for each
-   discussion topic on a new line, enclose it within quotation marks (``" "``),
-   and separate the quoted "id" values with commas. For example:
-
- .. code:: 
-
-   "cohorted_discussions": [
-       "i4x-edX-Open-edx_demo_course_announcements",
-       "i4x-edX-Open-edx_demo_course_brainstorming"
-   ]
-   
-.. this comment is here only to force allow indented formatting of next line
-
-  To specify a single discussion topic, type ``"cohorted_discussions": ["i4x-
-  test_doc-SB101-course-2014_Jan_announcements"]`` and then press Enter again.
-   
-5. Type a comma after the closing square bracket character (``],``). You must
-   include a comma to separate each of the policy keys that you define.
-   
-#. Click **Save Changes**. Studio resequences and reformats your entry. Scroll
-   back to the **Cohort Configuration** field to verify that your entry was
-   saved as you expect. Entries that do not contain all of the required
-   punctuation characters revert to the previous value when you save, and no
-   warning is presented.
-
- .. image:: ../Images/Configure_cohort_topic.png
-  :alt: Cohort Configuration dictionary field with the cohorted_discussions key
-        defined
-
-.. _Altering Cohort Configuration:
-
-*****************************************************************
-Altering Cohort Configuration in a Running Course
-*****************************************************************
-
-The configuration of the cohort feature should be complete and stable before
-your course begins. Manual cohort assignments should be completed as soon as
-possible after any student enrolls, including any enrollments that occur while
-your course is running. 
-
-If you decide that you must alter cohort configuration after your course starts
-and activity in the course discussion begins, be sure that you understand the
-consequences of these actions:
-
-* :ref:`Changing a student's cohort group assignment<Changing Student Cohort
-  Group Assignments>`
-
-* :ref:`Renaming a cohort group<Renaming a Cohort Group>`
-
-* :ref:`Deleting a cohort group<Deleting a Cohort Group>`
-
-* :ref:`Disabling the cohort feature<Disable the Cohort Feature>`
-
-.. _Changing Student Cohort Group Assignments:
-
-=============================================
-Change Student Cohort Group Assignments
-=============================================
-
-After your course starts and students begin to contribute to the course
-discussion, each post that they add is visible either to everyone or to the
-members of a single cohort group. When you change the cohort group that a
-student is assigned to, there are three results:
-
-* The student continues to see the posts that are visible to everyone.
-
-* The student sees the posts that are visible to his new cohort group.
-
-* The student no longer sees the posts that are visible only to his original
-  cohort group.
-
-The visibility of a post and its responses and comments does not change, even
-if the cohort group assignment of its author changes. To a student, it can
-seem that posts have "disappeared".
-
-To verify the cohort group assignments for your students, download the 
-:ref:`student profile report<View and download student data>` for your course. 
-If changes are needed, you can :ref:`assign students<Assign Students to Cohort 
-Groups Manually>` to different cohort groups manually on the **Membership** 
-page of the Instructor Dashboard.
-
-.. _Renaming a Cohort Group:
-
-==========================
-Rename a Cohort Group
-==========================
-
-Name changes for cohort groups are not supported. The **Membership** page of
-the Instructor Dashboard does not offer an option to rename your manual cohort
-groups.
-
-It is possible to change the value for the ``auto_cohort_groups`` policy key on
-the **Advanced Settings** page in Studio. However, changing the names in the
-listed name:value pairs **does not** result in any renamed auto cohort groups.
-Instead, changing the value for the ``auto_cohort_groups`` policy key has these
-results.
-
-* The system uses the new value that you saved for the ``auto_cohort_groups``
-  policy key to create one or more additional auto cohort groups.
-
-* The system begins to assign students who do not have a cohort group
-  assignment to the newly defined cohort group or groups. Students also
-  continue to be assigned to any auto cohort groups that were not affected by
-  your changes.
-
-  The system uniformly distributes students among all of the auto cohort groups
-  that exist when an assignment is needed. The size of each group is not
-  considered.
-
-* The original cohort group or groups remain in the system. Any students who
-  were assigned to the original groups remain assigned to them.
-
-  For the results of assigning any students who remain in the original cohort
-  groups to other groups, see :ref:`Changing Student Cohort Group Assignments`.
-
-* The system converts the original auto cohort groups, which are no longer
-  listed as values for ``auto_cohort_groups``, into manual cohort groups. The
-  system no longer assigns students to those groups automatically. These cohort
-  groups are listed as manual cohort groups on the **Membership** page of the
-  Instructor Dashboard.
-
-.. _Deleting a Cohort Group:
-
-==========================
-Delete a Cohort Group
-==========================
-
-Deletion of cohort groups is not supported. The **Membership** page of
-the Instructor Dashboard does not offer an option to delete your manual cohort
-groups.
-
-It is possible to change the value for the ``auto_cohort_groups`` policy key on
-the **Advanced Settings** page in Studio. However, removing any of the listed
-name:value pairs **does not** result in the deletion of any cohort groups.
-Instead, changing the value for the ``auto_cohort_groups`` policy key has these
-results.
-
-* The cohort groups that you removed from the policy key remain in the system.
-
-* Any students who were assigned to those groups remain assigned to them. 
-  
-  For the results of assigning any students to other groups, see :ref:`Changing
-  Student Cohort Group Assignments`.
-
-* The system no longer assigns students to the groups automatically. 
-
-* The groups are listed as manual cohort groups on the **Membership** page of
-  the Instructor Dashboard, and you can continue to assign students to them
-  manually.
-
-.. _Disable the Cohort Feature:
-
-==============================
-Disable the Cohort Feature
-==============================
-
-You can disable the cohort feature for your course. Follow the instructions for
-:ref:`enabling the cohort feature<Enable Cohorts>`, but set ``"cohorted":
-false``. All discussion posts immediately become visible to all students.
-
-If you do reenable the cohort feature by setting ``"cohorted": true``, all
-previous student cohort assignments are reenabled, and all visibility settings
-for posts are reapplied. However, any posts created while the cohort feature
-was disabled will remain visible to all users.
diff --git a/docs/en_us/course_authors/source/cohorts/cohorts_discussions.rst b/docs/en_us/course_authors/source/cohorts/cohorts_discussions.rst
deleted file mode 100644
index 2a829c2fcf..0000000000
--- a/docs/en_us/course_authors/source/cohorts/cohorts_discussions.rst
+++ /dev/null
@@ -1,191 +0,0 @@
-.. _Moderating Discussions for Cohorts:
-
-##########################################################
-Managing Discussions in a Course with Student Cohorts
-##########################################################
-
-In a course that has the cohort feature enabled, every post has an indicator of
-who can read it: either everyone, or only the members of a single cohort group.
-For students, this is the only noticeable difference between discussions in
-courses that include cohorts when compared to courses that don't. You can share
-the examples in the :ref:`Read the Cohort Indicator in Posts` section with your
-students, along with the :ref:`Discussions for Students and Staff` section of
-this guide.
-
-Staff members who have the discussion admin, discussion moderator, or community
-TA role see the same indicator of who can read each post. Unlike the students,
-however, the discussion staff members can read and contribute to every post,
-regardless of the cohort group assignment of the student who posted it.
-
-.. note:: Students who have the Community TA role can read and 
- contribute to all posts.
-
-In courses that enable the cohort feature, members of the discussion staff can
-also:
-
-* Choose who will be able to see the posts that they add to divided topics. See
-  :ref:`Choosing the Visibility of a Post`.
-
-* Filter the posts that are listed on the **Discussion** page by cohort group.
-  See :ref:`Viewing the Posts of a Cohort Group`.
-  
-All of the other options and features described in the :ref:`Discussions`
-section continue to be available to the discussion staff.
-
-.. _Finding Out Who Can See a Post:
-
-********************************
-Identifying Who Can Read a Post
-********************************
-
-In a course that includes cohorts, all posts include a cohort indicator above
-the title. This indicator appears after any student or staff member adds a
-post. Other than naming the cohort groups carefully when you add them, no
-configuration is necessary to include this identifier.
-
-Optionally, you can name your discussion topics to show students who will be
-able to view their posts. See :ref:`Apply Naming Conventions to Discussion
-Topics`.
-
-.. _Read the Cohort Indicator in Posts:
-
-==================================
-Read the Cohort Indicator in Posts
-==================================
-
-Every post includes a sentence that identifies whether everyone can see and
-contribute to it, or only the members of a cohort in the course. Examples
-follow.
-
-.. image:: ../Images/post_visible_all.png
- :alt: A discussion topic post with "This post is visible to everyone" above 
-       the title
-
-.. image:: ../Images/post_visible_cohort.png
- :alt: A discussion topic post with "This post is visible to" and a cohort name
-       above the title
-
-You see this identifier after you add your post. All of the responses and
-comments that other contributors add to a post are visible to the same group of
-people as the post itself.
-
-.. _Apply Naming Conventions to Discussion Topics:
-
-=========================================================
-Apply Naming Conventions to Discussion Topics
-=========================================================
-
-Optionally, course team members can give students the audience context of their
-posts before they add them. Indicating who will be able to read posts in the
-names of the topics themselves can be useful when a cohort is particularly
-sensitive about the privacy of their conversations.
-
-For example, you add "(everyone)" to the names of the unified course-wide
-discussion topics in your course.
-
-.. image:: ../Images/discussion_category_names.png
- :alt: The names you supply for course-wide topics in Studio appear on the 
-       dropdown list of discussion topics in the live course
-
-When students visit the **Discussion** page and use dropdown lists to select a
-course-wide topic, the topic names indicate who can see the posts, responses,
-and comments.
-
-(In the illustration above, every topic name includes either "(everyone)" or
-"(private)". You may only find it necessary to explicitly identify topics that
-have a unified audience for all posts.)
-
-For more information about adding and configuring course-wide discussion
-topics, see :ref:`Organizing_discussions` or :ref:`Identifying Private
-CourseWide Discussion Topics`.
-
-If desired, you could also apply a naming convention to the content-specific
-discussion topics that you add as Discussion components in Studio. For example,
-you could include an identifier like "(private)" or "(small group)" in the
-**Subcategory** name of every Discussion component that you add.
-
-.. image:: ../Images/discussion_topic_names.png
- :alt: The Subcategory name that you supply for a Discussion component in
-       Studio appears on the dropdown lists of discussion topics in the live
-       course
-
-.. _Choosing the Visibility of a Post:
-
-***************************************
-Choosing the Visibility of a Post
-***************************************
-
-If you have the discussion admin, discussion moderator, or community TA role,
-you can make posts to divided discussion topics visible to everyone who is
-enrolled in the course or to the members of a selected cohort group only. When
-you :ref:`add a post<Add a Post>`, the **Visible to** dropdown list appears
-above the **Title** field.
-
-This example shows a new post being added to a content-specific
-discussion topic.
-
-.. image:: ../Images/visible_to_contentspecific.png
- :alt: The fields and controls that appear when a staff member clicks 
-       New Post for a content-specific topic
-
-As a discussion staff member, you can choose the visibility of your posts in
-topics that are divided by cohort. This means that you can add a single post
-with information that you want everyone to see, rather than having to write a
-separate post for each cohort group. It also means that it is possible for you
-to unintentionally share information with a different audience than you
-intended.
-
-.. note:: Students do not choose the visibility of their posts. The 
- visibility of student posts is determined by the configuration of the topic
- they post in. See :ref:`Options for Discussion Topics`.
-
-Posts that discussion staff members add to unified discussion topics are always
-visible to all students, regardless of cohort assignment.
-
-.. _Considerations When Editing Posts:
-
-===================================
-Considerations When Editing Posts
-===================================
-
-It may be helpful to keep these additional considerations in mind when you edit
-posts in a course that includes cohorts.
-
-* You cannot change the visibility of a post after it has been added. If you
-  notice that a post contains information that is not appropriate for the
-  cohort who can read it, edit the content of the post or delete the post.
-
-* If you change the topic that a post appears in, the visibility of the post
-  and its responses and comments **does not change**. This ensures that
-  students who are following the post, or who have contributed responses or
-  comments to it, will still be able to read it.
-
-* All of the responses and comments that are contributed to a post will be
-  visible to the same group of people as the post itself. You cannot change the
-  visibility of individual responses or comments.
-
-.. _Viewing the Posts of a Cohort Group:
-
-************************************
-Viewing the Posts of a Cohort Group
-************************************
-
-When a course includes student cohorts, you can view posts and monitor
-discussion activity for one cohort group at a time. You can also view all
-posts.
-
-Above the list of posts on the **Discussion** page, the **in all cohorts**
-filter is selected by default. You see every post when you make this selection,
-as shown in the illustration on the left. To limit the list so that you can
-view the same set of posts as the members of a cohort group, select the name
-of that group as shown on the right.
-
-.. image:: ../Images/viewing_all_or_cohort.png
- :alt: The list of posts on the Discussion page, first showing all posts then 
-  showing only posts that members of the Univeristy Alumni cohort group can see
-
-Note that both of these lists include posts that are visible to
-everyone. When you filter the list by cohort group, you see the same, complete
-set of posts that the members of the cohort see.
-
-For other options that you can use to view posts, see :ref:`Find Posts`.
diff --git a/docs/en_us/course_authors/source/cohorts/cohorts_overview.rst b/docs/en_us/course_authors/source/cohorts/cohorts_overview.rst
deleted file mode 100644
index a2405169ae..0000000000
--- a/docs/en_us/course_authors/source/cohorts/cohorts_overview.rst
+++ /dev/null
@@ -1,262 +0,0 @@
-.. _Cohorts Overview:
-
-##########################################
-Using Cohorts to Build Course Communities
-##########################################
-
-Cohorts create smaller communities of students within a course. Students who
-are in a cohort can communicate and share experiences privately within course
-discussion topics.
-
-When you enable the cohort feature for your course, the discussion topics that
-you include in units by adding discussion components are divided by cohort.
-This means that each post that a student makes to those content-specific topics
-can only be read, and responded to, by members of the same cohort. However, any
-course-wide discussion topics that you set up for your course remain unified.
-This means that all posts can be read, and responded to, by every student. You
-can change some, or all, of your course-wide topics to be divided by cohort.
-See :ref:`Options for Discussion Topics`.
-
-This section also describes your options for :ref:`assigning students to cohort
-groups<Options for Assigning Students to Cohorts>`. When you enable the cohort
-feature, you define a set of cohort groups to reflect communities of students,
-and select a strategy for assigning students to those groups. Note that:
-
-* Every student must be assigned to a cohort group. This assures that every
-  student has the ability to read and contribute to all of the course
-  discussion topics.
-
-* Each student is in one and only one cohort group. 
-
-To provide a consistent experience throughout the course run, each student's
-assignment to a cohort group should remain unchanged after the course begins.
-
-For more information, see:
-
-* :ref:`Enabling and Configuring Cohorts`
-
-* :ref:`Moderating Discussions for Cohorts`
-
-For information about discussions, see :ref:`Discussions`.
-
-.. _Options for Discussion Topics:
-
-*********************************
-Options for Discussion Topics
-*********************************
-
-By enabling the cohort feature in a course, you provide students with the
-ability to ask questions of, and have conversations with, other members of
-their cohort. By offering cohort-only discussion oppotunities, the cohort
-feature can help students develop a sense of community, provide specialized
-experiences, and encourage deeper, more meaningful course involvement.
-
-Enabling the cohort feature has different effects on the course-wide discussion
-topics and the content-specific discussion topics in the course.
-
-===================================================
-Course-Wide Discussion Topics Are Configurable
-===================================================
-
-To create course-wide discussion topics, you add them on the **Advanced
-Settings** page in Studio. By default, each of these topics is unified. All of
-the students in the course can post, read, respond, and comment in course-wide
-discussion topics without regard to their cohort group assignments. After you
-add a course-wide topic, you can configure it so that it is divided by cohort
-instead.
-
-For example, in addition to the General topic, which is supplied by default,
-you create these additional course-wide topics: Course Q&A, Announcements, and
-Brainstorming. You want all students to be able to read and contribute to all
-of the posts in the General and Course Q&A topics. However, you want the
-Announcements and Brainstorming topics to be divided, so that students will
-only be able to read and respond to contributions by the members of their own
-cohorts. You complete the additional configuration step for the Announcements
-and Brainstorming topics only.
-
-For information about course-wide discussion topics, see
-:ref:`Organizing_discussions`. For information about configuring these topics, 
-see :ref:`Configure CourseWide Discussion Topics as Private`.
-
-===================================================
-All Content-Specific Discussion Topics Are Divided
-===================================================
-
-Each of the content-specific discussion topics is divided by cohort. A student
-who is assigned to one cohort group cannot read or add to the posts, responses,
-or comments contributed by the members of another cohort group.
-
-To create content-specific discussion topics in a course, you add units that
-include discussion components. In a course with the cohort feature enabled, you
-do not have the option to change these topics to be unified for all students.
-
-For more information about content-specific discussion topics,
-see :ref:`Organizing_discussions`.
-
-.. _Options for Assigning Students to Cohorts:
-
-***********************************************
-Options for Assigning Students to Cohort Groups
-***********************************************
-
-You can configure the cohort feature so that students are assigned to cohort
-groups automatically or manually. You can also use a combination of both
-assignment methods. Typically, your purpose in including the cohort feature in
-your course determines which assignment option you will use for your course.
-
-* :ref:`All Automated Assignment`
-
-* :ref:`All Manual Assignment`
-
-* :ref:`Hybrid Assignment`
-
-* :ref:`Default Cohort Group`
-
-.. _All Automated Assignment:
-
-=============================================================
-Making MOOC Discussions Manageable: Automated Assignment
-=============================================================
-
-In very large courses, the number of posts made to course discussion topics can
-make for a daunting amount of daily reading. In such courses, dividing the
-enrollees into separate cohorts makes the volume of posts, responses, and
-comments by the members of each one more manageable, and is more likely to
-foster community feeling.
-
-To implement this assignment strategy, you enable the cohort feature and create
-a set of "auto" cohort groups. The first time a student views the course
-**Discussion** page or any of the content-specific discussion topics, he or she
-is randomly assigned to a cohort group. Together, all of the students assigned
-to a group are a cohort.
-
-These guidelines, which are based on the experiences of MOOC teams that have
-used the cohort feature in this way, are suggested to help you determine how
-many auto cohort groups to define for your course.
-
-* Each cohort should be large enough to inspire lively participation and
-  diverse points of view, but small enough to allow a sense of community to
-  develop. Cohorts formed by random assignment tend to be successful if they
-  include between 200 and 500 members.
-
-* For every 10,000 students who enroll, approximately 200 to 400 students
-  remain active in the discussions throughout the course run. 
-
-* Divide the estimated total enrollment of the course run by 10,000.
-
-* Use the result as the number of auto cohort groups to create.
-
-For example, two days before it starts, a course has an enrollment of 80,000
-students. To create small communities within the discussions, the course team
-enables the cohort feature and creates eight auto cohort groups. As they visit
-the **Discussion** page and view the discussion components in the course
-content, students are assigned to one of the cohorts. In divided discussion
-topics, students read and respond to contributions made by other members of the
-same cohort only.
-
-For more information, see :ref:`Implementing the Automated Assignment
-Strategy`.
-
-.. _All Manual Assignment:
-
-==========================================================
-Grouping by Common Characteristic: Manual Assignment
-==========================================================
-
-In SPOCs and other courses with small- to medium-sized enrollments, known
-existing commonalities can be used to identify cohorts. An example is a course
-that enrolls students from different companies or with different educational
-backgrounds, or members of alumni or parent groups. When students are assigned
-to cohorts on the basis of a characteristic that they share, they can privately
-discuss applications for what they are learning and explore resources and ideas
-that are of particular interest.
-
-To implement this assignment strategy, you identify the "real-world" cohorts
-that your students belong to already. You enable the cohort feature and create
-a "manual" cohort group to represent each of those cohorts. You then assign
-each student to one of the manual cohort groups. Every student who enrolls,
-including those who enroll after the course starts, must be assigned to a
-cohort group.
-
-.. note:: To ensure that every student is assigned to a cohort group, you can 
- set up a single auto cohort group, as described for the :ref:`hybrid
- assignment strategy<Hybrid Assignment>`. If you do not create an auto cohort
- group, the system automatically creates a :ref:`default cohort group<Default
- Cohort Group>` and assignes students to it if necessary.
-
-For more information, see :ref:`Implementing the Manual Assignment Strategy`.
-
-.. _Hybrid Assignment:
-
-=============================================================
-Accomodating Small Groups Within a Course: Hybrid Assignment
-=============================================================
-
-For some courses, the manual assignment strategy isn't feasible to execute, and
-the automated assignment strategy doesn't accommodate the existing cohorts that
-exist in the student body. The enrollment may be too large to complete manual
-assignments effectively, or only some of the students may have strong defining
-characteristics among an otherwise diverse student body. For these courses, you
-can use a hybrid of the two strategies to implement the cohort feature.
-
-An example is a course that enrolls members of an alumni association. The
-alumni want an opportunity for private interactions, so manual assignment of
-those students to a cohort group makes sense. For other students in the class,
-manual assignment isn't needed: you create one or more auto cohort groups for
-those students.
-
-Before you implement the hybrid strategy, you identify the characteristics that
-define existing cohorts in the student body. You also decide whether you want
-the rest of the students in the course to be divided into their own, 
-similarly-sized cohort groups, or if you want them all to be in just one other 
-group.
-
-After you enable the cohort feature, you create a manual cohort group for each
-cohort that you identified. You manually assign students who belong to those
-cohorts to the corresponding groups. You also set up auto cohort groups for
-the other students in the course, or rely on the default cohort group. The
-students who are not assigned to a manual cohort group are automatically
-assigned to one of the auto cohort groups, or to the default cohort group if
-you choose to use it, when they view the **Discussion** page or a discussion
-topic in the course content. (For best results when you use this strategy, you
-complete all manual assignments before the course starts and students begin
-viewing discussion topics.)
-
-For more information, see :ref:`Implementing the Automated Assignment
-Strategy` and :ref:`Implementing the Manual Assignment Strategy`.
-
-.. _Default Cohort Group:
-
-==================================================================
-Assuring That All Students Are Assigned: The Default Cohort Group
-==================================================================
-
-In a course that has the cohort feature enabled, all students must be assigned
-to a cohort group. To assure that all students are assigned, the system
-automatically creates a default cohort group and assigns students to it if
-necessary. Creation of the default cohort group only occurs if you do not
-define any auto cohort groups for your course. Any student who is not assigned
-to a manual cohort group is assigned to the default cohort group automatically
-when they visit the **Discussion** page or a discussion topic in the course
-content.
-
-Students who are assigned to the default cohort group see a cohort name of
-"Default Group" in discussion posts. 
-
-.. image:: ../Images/post_visible_default.png
- :alt: A discussion topic post with "This post is visible to Default Group" 
-       above the title
-
-If you want students to see a different cohort name when your course starts,
-you can add an auto cohort group with the name that you prefer. See
-:ref:`Define Auto Cohort Groups`. (Adding an auto cohort group to your course 
-for this purpose is not recommended after your course starts.)
-
-You can check the :ref:`student profile information report<View and download
-student data>` for your course to see if any students are assigned to the
-default cohort group in your course, and change their group assignments. Note,
-however, that in divided discussion topics students can only see posts by
-members of their currently assigned cohort group: when a student is reassigned,
-posts "disappear". As a result, any group assignment changes should be done as
-early in the course run as possible so that students see discussion posts and
-contributions that remain consistent over time.
diff --git a/docs/en_us/course_authors/source/cohorts/index.rst b/docs/en_us/course_authors/source/cohorts/index.rst
deleted file mode 100644
index a9288acff1..0000000000
--- a/docs/en_us/course_authors/source/cohorts/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-.. _Including Student Cohorts:
-
-#############################
-Including Student Cohorts
-#############################
-
-.. toctree::
-   :maxdepth: 2
-   
-   cohorts_overview
-   cohort_config
-   cohorts_discussions
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/conf.py b/docs/en_us/course_authors/source/conf.py
deleted file mode 100644
index 2c86781b5d..0000000000
--- a/docs/en_us/course_authors/source/conf.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-import sys, os
-
-# on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-
-
-
-
-
-
-
-sys.path.append(os.path.abspath('../../../'))
-sys.path.append(os.path.abspath('../../'))
-
-#from docs.shared.conf import *
-
-sys.path.insert(0, os.path.abspath('.'))
-
-master_doc = 'index'
-
-# Add any paths that contain templates here, relative to this directory.
-#templates_path.append('source/_templates')
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path.append('source/_static')
-
-
-# General information about the project.
-project = u'Building and Running an edX Course'
-copyright = u'2014, edX'
-
-# The short X.Y version.
-version = ''
-# The full version, including alpha/beta/rc tags.
-release = ''
diff --git a/docs/en_us/course_authors/source/content_experiments/content_experiments_add.rst b/docs/en_us/course_authors/source/content_experiments/content_experiments_add.rst
deleted file mode 100644
index 6e7edf4f11..0000000000
--- a/docs/en_us/course_authors/source/content_experiments/content_experiments_add.rst
+++ /dev/null
@@ -1,239 +0,0 @@
-.. _Add Content Experiments to Your Course:
-
-#########################################
-Add Content Experiments to Your Course
-#########################################
-
-After you :ref:`enable content experiments <Enable Content Experiments>` and
-:ref:`set up group configurations in Studio <Set up Group Configurations in edX
-Studio>` or :ref:`in XML <Set up Group Configurations in an XML Course>`, you
-can add content experiments to your course. See:
-
-* :ref:`Add a Content Experiment in Studio`
-* :ref:`Add a Content Experiment in XML`
-
-.. _Add a Content Experiment in Studio:
-
-********************************************
-Add a Content Experiment in Studio
-********************************************
-
-You can add a content experiment in a unit or container page. In Studio, you
-create and view content for all groups in the content experiment in a container
-page for the experiment, as shown in `Create Content for Groups in the Content
-Experiment`_.
-
-When a student views the unit with the content experiment, she has no
-indication there is a content experiment in the unit, and the content
-experiment display name is not shown. She sees only the content that you
-configure for the group she is assigned to. To the student, the unit with the
-content experiment is no different than any other unit.
-
-To configure a content experiment in Studio, you:
-
-#. `Create the content experiment`_.
-#. `Create content for groups in the content experiment`_.
-   
-After you configure a content experiment, you can `change the
-group configuration <Change the Group Configuration for a Content
-Experiment>`_.
-
-===============================
-Create the Content Experiment
-===============================
-
-#. In the unit page, under **Add New Component**, click **Advanced**.
-
-#. Select **Content Experiment**.
-   
-   A new content experiment is added to the unit:
-
-   .. image:: ../Images/content_experiment_block.png
-    :width: 800
-    :alt: The content experiment component in a unit page
-
-   You can work with the content experiment as you can any other component.
-   See :ref:`Developing Course Components` for more information.
-
-#. Click either **Select a Group Configuration** or **Edit** to open the content
-   experiment component.
-
-   .. image:: ../Images/content_experiment_editor.png
-    :alt: The content experiment editor
-
-#. Next to **Group Configuration**, select a group configuration.
-
-#. In the **Display Name** field, enter the name that the component will use in Studio. The
-   display name is only used in Studio; students do not see this value.
-
-#. Click **Save**.
-
-The content experiment is displayed as a component that contains other
-components. See :ref:`Components that Contain Other Components` for more
-information.
-
-.. note::  You cannot duplicate a content experiment.
-
-You can now create content for the groups in the experiment.
-
-=====================================================
-Create Content for Groups in the Content Experiment
-=====================================================
-   
-After you select a group configuration, in the content experiment component,
-click **View**.
-
-The content experiment page that opens automatically includes a container for
-each group that is defined in the group configuration you selected. For
-example, if you select a group configuration that defines Group A and Group B,
-you see the following page:
-
-.. image:: ../Images/content_experiment_container.png
- :alt: The content experiment page with two groups
-
-You add content for both groups as needed, just as you would add content to any
-container page. See :ref:`Components that Contain Other Components` for more
-information.
-
-For example, you can add an HTML component and a video to Group A:
-
-.. image:: ../Images/a_b_test_child_expanded.png
- :alt: Image of an expanded A/B test component
-
-.. note:: 
-  It is valid, and can be useful, to have no content for a group in the
-  experiment.  For example, if one group has a video and another group has no
-  content, you can analyze the effect of the video on student performance.
-
-
-========================================================
-Change the Group Configuration for a Content Experiment
-========================================================
-
-You can change the group configuration for a content experiment. When you
-change the group configuration, you must add components to any new groups that you create. You
-can use the components from the previous groups, as well as create new
-components.
-
-.. warning::
-  Changing the group configuration of a student-visible experiment will affect
-  the experiment data.
-
-To change the group configuration:
-
-#. Open the unit page of the unit that contains the content experiment.
-
-#. In the content experiment component, click **Edit**.
-
-   .. image:: ../Images/content_experiment_editor_group2.png
-    :alt: The content experiment editor with a group configuration selected
-
-#. Select a different group configuration.
-
-#. Click **Save**.
-
-#. You must now add components to the new groups in the experiment. Click
-   **View** to open the content experiment.
-
-   You see that groups for the new configuration are empty, and any components
-   that you had added to groups in the previous configuration are now moved to
-   a section called **Inactive Groups**.
-
-   .. image:: ../Images/inactive_groups.png
-    :alt: Components in inactive groups
-
-#. Drag and drop components from the **Inactive Groups** section into the new
-   groups. You can also create new components in the new groups.
-
-
-.. _Add a Content Experiment in XML:
-
-****************************************
-Add a Content Experiment in XML
-****************************************
-
-If you are developing your course in XML, you work with multiple XML files to
-configure a content experiment. This section steps through the files involved
-in a content experiment that shows different content to two different groups of
-students.
-
-For more information about working with your course's XML files, including
-information about terminology, see the `edX XML Tutorial
-<http://edx.readthedocs
-.org/projects/devdata/en/latest/course_data_formats/course_xml.html>`_.
-
-=====================================================
-Define the Content Experiment in the Sequential File
-=====================================================
-
-You reference a content experiment in the file for the subsection in the
-``sequential`` directory. For example:
-
-.. code-block:: xml
-
-    ...
-    <vertical url_name="name for the unit that contains the A/B test" display_name="A/B Test Unit">
-        <split_test url_name="name of A/B test file in the split_test folder"/>
-    </vertical>
-    .....
-
-The ``<split_test>`` element's ``url_name`` value references the name of the
-A/B test file in the ``split_test`` directory.
-
-
-.. _Define the Experiment Content in the Split Test File:
-
-=====================================================
-Define the Experiment Content in the Split Test File
-=====================================================
-
-After you define the content experiment in the sequential file, you define the
-course content you want to test in the file in the ``split_test`` directory.
-This is the file referenced in the ``<split_test>`` element in the sequential
-file, as shown above.
-
-In the content experiment file, you add elements for the experiment content.
-For this example, you add two ``<vertical>`` elements to compare the two
-different sets of content.
-
-.. code-block:: xml
-
-    <split_test url_name="AB_Test.xml" display_name="A/B Test" user_partition_id="0" 
-                group_id_to_child='{"0": "i4x://path-to-course/vertical/group_a", 
-                                    "1": "i4x://path-to-course/vertical/group_b"}'>
-        <vertical url_name="group_a" display_name="Group A">
-           <html>Welcome to group A.</html>
-           <video url_name="group_a_video"/>
-        </vertical>
-        <vertical url_name="group_b" display_name="Group B">
-            <html>Welcome to group B.</html>
-            <problem display_name="Checkboxes">
-                <p>A checkboxes problem presents checkbox buttons for student input. 
-                   Students can select more than one option presented.</p>
-                <choiceresponse>
-                    <checkboxgroup direction="vertical" label="Select the answer that matches">
-                        <choice correct="true">correct</choice>
-                        <choice correct="false">incorrect</choice>
-                        <choice correct="true">correct</choice>
-                    </checkboxgroup>
-                </choiceresponse>
-            </problem>
-        </vertical>
-    </split_test>
-
-
-In this example:
-
-* The ``user_partition_id`` value references the ID of the experiment defined
-  in the ``policy.json`` file.
-
-* The ``group_id_to_child`` value references the IDs of the groups defined in
-  the ``policy.json`` file and maps the group IDs to specific content.
-
-  For example,  the value for group ``0``, ``i4x://path-to-
-  course/vertical/group_a``, maps to the ``<vertical>`` element with the
-  ``url_name`` equal to ``group_a``.  Therefore, students in group 0 see the
-  content in that vertical.
-
-For information about the ``policy.json`` file, see :ref:`Set up Group
-Configurations in an XML Course`.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/content_experiments/content_experiments_configure.rst b/docs/en_us/course_authors/source/content_experiments/content_experiments_configure.rst
deleted file mode 100644
index 7f58cdd297..0000000000
--- a/docs/en_us/course_authors/source/content_experiments/content_experiments_configure.rst
+++ /dev/null
@@ -1,408 +0,0 @@
-.. _Configure Your Course for Content Experiments:
-
-#####################################################
-Configure Your Course for Content Experiments
-#####################################################
-
-This chapter describes how to configure your course so that you can use content
-experiments. See:
-
-* :ref:`Enable Content Experiments`
-* :ref:`Overview of Group Configurations`
-* :ref:`Set up Group Configurations in edX Studio`
-* :ref:`Guidelines for Modifying Group Configurations`
-* :ref:`Set up Group Configurations in an XML Course`
-
-.. _Enable Content Experiments:
-
-****************************************
-Enable Content Experiments
-****************************************
-
-To enable content experiments in your course, you add ``split_test`` to the
-**Advanced Modules List** in Advanced Settings.
-
-.. note::  
-  ``split_test`` is the internal edX Platform name for a content experiment.
-
-#. From the **Settings** menu, select **Advanced Settings**.
-
-#. On the **Advanced Settings** page, locate **Advanced Modules List**.
-
-#. In the **Advanced Modules List** field, add ``"split_test"``. Be sure that
-   you include the double quotation marks.
-
-   If you have multiple values, ensure that they are separated by commas
-   (``,``).
-
-   For example, the text in the **Advanced Modules List** field may resemble
-   the following:
-
-   .. code-block:: json
-     
-     [
-       "lti",
-       "word_cloud",
-       "split_test"
-     ]
-
-#. At the bottom of the page, click **Save Changes**.
-
-.. _Overview of Group Configurations:
-
-****************************************
-Overview of Group Configurations
-****************************************
-
-Before you can create content experiments, you must specify at least one group
-configuration for your course.
-
-A group configuration defines how many groups of students are in an experiment.
-You can have any number of group configurations in your course. When you create
-a content experiment, you select the group configuration to use.
-
-For example, you may want to do two different experiments at different times
-during your course. In one content experiment, students either see a video or
-complete a reading assignment. You can then include problems so that you can
-see which group learned the material more completely. For this content
-experiment, you need a group configuration that assigns your students to two
-groups.
-
-In the other content experiment, you can present the same question using four 
-different types of problem. For this content experiment, you need a
-group configuration that assigns your students to four groups.
-
-=============================
-Assigning Students to Groups
-=============================
-
-The edX Platform assigns students to each group in a group configuration. 
-
-Group assignments are:
-
-* Dynamic
-
-  The edX Platform assigns a student to a group the first time he or she views
-  a content experiment that uses the group configuration.
-
-* Random
-  
-  You cannot control which students are assigned to which group. 
-  
-* Evenly distributed
-  
-  The edX Platform keeps track of the size of groups and assigns new students
-  to groups evenly. For example, when there are two groups in a configuration,
-  each group will include 50% of the students in the course; when you have four
-  groups, each group will include 25%.
-
-* Permanent
-  
-  Students remain in their assigned groups regardless of how many content
-  experiments you set up that use the same group configuration.
-
-.. _Set up Group Configurations in edX Studio:
-
-************************************************
-Set up Group Configurations in edX Studio 
-************************************************
-
-.. note:: 
-  You must :ref:`enable content experiments<Enable Content Experiments>` before
-  you can set up group configurations.
-
-To set up group configurations, on the **Settings** menu, select **Group
-Configurations**. The **Group Configurations** page opens:
-
-.. image:: ../Images/group_configurations.png
- :width: 800
- :alt: The Group Configurations page
-
-From this page you can :ref:`create<Create a Group Configuration>`,
-:ref:`edit<Edit a Group Configuration>`, and :ref:`delete<Delete a Group
-Configuration>` group configurations. You can also :ref:`view experiments that
-use a group configuration<View Experiments that Use a Group Configuration>`.
-
-.. _Create a Group Configuration:
-
-=============================
-Create a Group Configuration
-=============================
-
-You can create a group configuration at any time.
-
-#. On the **Group Configurations** page, click **Add Your First Group
-   Configuration**. The following page opens:
-
-  .. image:: ../Images/create-group-config.png
-   :width: 800
-   :alt: Create a New Group Configuration page
-
-2. Enter a name in the **Group Configuration Name** field. Use a meaningful
-   name, as you select from group configuration names when creating content
-   experiments. Students will not see the name.
-
-#. Optionally, enter a description for the new group configuration.
-#. By default, a new configuration already contains two groups. Modify the
-   names of those groups or add new groups as needed:
-
-  * Modify the group names as needed. You see group names in the unit page in
-    Studio; students do not see group names.
-  * Click **Add another group** to include another group as part of the
-    configuration.
-  * Click the **X** to the right of an existing group to remove it from the
-    configuration. A group configuration must have at least one group.
-
-5. Click **Create** to save the new group configuration.
-   
-The group configuration is then listed in the page. You can see the number of
-groups that the configuration contains, as well as whether the configuration is
-in use in the course:
-
-.. image:: ../Images/group_configurations_one_listed.png
- :width: 800
- :alt: The Group Configurations page with one group configuration
-  
-.. _Edit a Group Configuration:
-
-=============================
-Edit a Group Configuration
-=============================
-
-.. important:: 
-  You can change the name of a group configuration at any time. However, before
-  you modify any other characteristics of a group that is inside a group
-  configuration that is currently used in a running course, review `Guidelines
-  for Modifying Group Configurations`_.
-
-#. On the **Group Configurations** page, hover over the group configuration and
-   click **Edit**.
-   
-   .. image:: ../Images/group_configurations_edit.png
-    :alt: The Group Configurations page with Edit button
-
-   The following page opens:
-
-   .. image:: ../Images/save-group-config.png
-    :alt: Edit a Group Configuration page
-
-#. Modify the name and description as needed.
-
-#. Modify groups in the configuration as needed. See `Create a Group
-   Configuration`_ for details.
-   
-#. Click **Save** to save your changes.
-
-.. _Delete a Group Configuration:
-
-=============================
-Delete a Group Configuration
-=============================
-
-.. note:: 
- You can only delete a group configuration that is not currently used in a
- content experiment. You cannot delete a group configuration that is used in a
- content experiment.
-
-#. On the **Group Configurations** page, hover over the group configuration and
-   click the Delete icon. 
-
-  .. image:: ../Images/group-configuration-delete.png
-   :alt: Edit a Group Configuration page
-
-2. When prompted to confirm the deletion, click **Delete**.
-
-.. _View Experiments that Use a Group Configuration:
-
-===============================================
-View Experiments that Use a Group Configuration
-===============================================
-
-When working with group configurations, you can view the experiments that use
-each configuration.
-
-On the **Group Configurations** page, click the name of a group to expand the
-group and see its details. You see links to experiments that use the group
-configuration:
-
-.. image:: ../Images/group_configurations_experiments.png
- :alt: A group configuration with the experiments using it circled
-
-Click a link to go to the unit page that contains the experiment.
-
-===============================================
-View a Group Configuration from an Experiment
-===============================================
-
-When working with a content experiment, you can view details about the group
-configuration used by that experiment.
-
-On the unit page for a unit that contains a content experiment, click the name
-of the group configuration.
-
-.. image:: ../Images/content_experiment_group_config_link.png
- :alt: Content experiment in the unit page with the group configuration link
-     circled
-
-Or at the top of the content experiment page, click the name of the group
-configuration.
-
-.. image:: ../Images/content_experiment_page_group_config_link.png
- :alt: Content experiment page with the group configuration link circled
-
-In both cases, the group configuration opens:
-
-.. image:: ../Images/group_configurations_experiments.png
- :alt: A Group Configuration with the experiments using it circled
-
-You can use the link in the group configuration to return to the unit that
-contains the content experiment.
-
-
-.. _Guidelines for Modifying Group Configurations:
-
-*********************************************
-Guidelines for Modifying Group Configurations
-*********************************************
-
-Review these guidelines if you must modify a group configuration after a course
-starts. These guidelines apply for courses built in Studio or XML.
-
-
-==================================
-Modifying a Group Configuration
-==================================
-
-After the course starts, **do not**:
-
-* Delete group configurations.
-
-* Change the ``id`` value of a group configuration.
-
-
-=================
-Modifying Groups
-=================
-
-After the course starts, **do not** change the ``id`` value of a group.
-  
-You can change group names at any time.
-
-==========================================================
-Removing Groups from Group Configurations
-==========================================================
-
-After a course has started, you may find that students in a specific group are
-having difficulties or a poor experience. In this situation, you can remove the
-group from the group configuration. Content that was specified for that
-group is then no longer visible to students.
-
-Students in the removed group are reassigned evenly to one of the other groups
-in the group configuration. Any problems that these students completed in the
-removed group content do not count toward the students' grades. The students
-must begin the problem set again and complete all the problems in the group
-content to which they've been reassigned.
-
-Removing a group affects the course event data. Ensure that researchers
-evaluating your course results are aware of the group you removed and the
-date you removed it.
-
-.. _Set up Group Configurations in an XML Course:
-
-************************************************
-Set up Group Configurations in an XML Course 
-************************************************
-
-If you are developing your course in XML, you define group configurations in
-the ``policy.json`` file in the ``policies`` directory.
-
-See :ref:`Add a Content Experiment in XML` for more information on how the XML
-for the content experiment uses these settings.
-
-To specify group configurations, you modify the value for the
-``user_partitions`` policy key.
-
-.. note::  
-  ``user_partitions`` is the internal edX Platform name for group
-  configurations.
-
-The value for ``user_partitions`` is a JSON collection of group configurations,
-each of which defines the groups of students. 
-
-.. note:: 
-  Use names for group configurations that are meaningful. You select from the
-  list of group configuration names when you add a content experiment.
-
-See the following examples for more information.
-
-=============================================
-Example: One Group Configuration
-=============================================
-
-The following is an example JSON object that defines an group configuration
-with two student segments.
-
-.. code-block:: json
-
-    "user_partitions": [{"id": 0,
-                       "name": "Name of the group configuration",
-                       "description": "Description of the group configuration.",
-                       "version": 1,
-                       "groups": [{"id": 0,
-                                   "name": "Group 1",
-                                   "version": 1},
-                                  {"id": 1,
-                                   "name": "Group 2",
-                                   "version": 1}]
-                                }
-                       ]
-
-In this example:
-
-* The ``"id": 0`` identifies the group configuration. For XML courses, the
-  value is referenced in the ``user_partition`` attribute of the
-  ``<split_test>`` element in the content experiment file.
-* The ``groups`` array identifies the groups to which students are randomly
-  assigned. For XML courses, each group ``id`` value is referenced in the
-  ``group_id_to_child`` attribute of the ``<split_test>`` element.
-
-==========================================================
-Example: Multiple Group Configurations
-==========================================================
-
-The following is an example JSON object that defines two group configurations.
-The first group configuration divides students into two groups, and the second
-divides students into three groups.
-
-.. code-block:: json
-
-    "user_partitions": [{"id": 0,
-                         "name": "Name of Group Configuration 1",
-                         "description": "Description of Group Configuration 1.",
-                         "version": 1,
-                         "groups": [{"id": 0,
-                                     "name": "Group 1",
-                                     "version": 1},
-                                    {"id": 1,
-                                     "name": "Group 2",
-                                     "version": 1}]}
-                        {"id": 1,
-                         "name": "Name of Group Configuration 2",
-                         "description": "Description of Group Configuration 2.",
-                         "version": 1,
-                         "groups": [{"id": 0,
-                                     "name": "Group 1",
-                                     "version": 1},
-                                    {"id": 1,
-                                     "name": "Group 2",
-                                     "version": 1}
-                                     {"id": 2,
-                                     "name": "Group 3",
-                                     "version": 1}
-                                     ]}
-                       ]
-
-.. note:: 
-  As this example shows, each group configuration is independent.  Group IDs
-  and names must be unique within a group configuration, but not across all
-  group configurations in your course.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/content_experiments/content_experiments_overview.rst b/docs/en_us/course_authors/source/content_experiments/content_experiments_overview.rst
deleted file mode 100644
index 952deb1dbc..0000000000
--- a/docs/en_us/course_authors/source/content_experiments/content_experiments_overview.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-.. _Overview of Content Experiments:
-
-#################################
-Overview of Content Experiments
-#################################
-
-You use content experiments to show different course content to different
-groups of students.
-
-Also known as A/B or split tests, content experiments enable you to
-research and compare the performance of students in different groups to gain
-insight into the relative effectiveness of your course content.
-
-Information on analyzing events from content experiments is included in the
-`edX Researcher Guide`_.
-
-.. _edX Researcher Guide: http://edx.readthedocs.org/projects/devdata/en/latest/internal_data_formats/tracking_logs.html#a-b-testing-events
-
-.. caution::
-  If you have graded problems within a content experiment, grade exports do not
-  work for your course. This issue is currently being addressed.
-
-For more information, see:
-
-* :ref:`Configure Your Course for Content Experiments`
-* :ref:`Add Content Experiments to Your Course`
-* :ref:`Test Content Experiments`
-
-.. _Courses with Multiple Content Experiments:
-
-******************************************
-Courses with Multiple Content Experiments
-******************************************
-
-You can run multiple content experiments in your course. You can set up each
-experiment to use the same groups of students, or you can set up each
-experiment to be independent and use a different grouping.
-
-.. important::
-
-  If your course has multiple experiments, it is critical that you decide
-  up front if the experiments share the same groups of students or if each
-  experiment has its own unique grouping. If two experiments share the same
-  grouping, then any student that is in Group A for the first experiment will
-  also be in Group A for the second one. If you want the experiments to be
-  independent, then the experiments must use different groupings so that
-  students are randomly assigned for each experiment.
-
-To determine the available groupings of students, you :ref:`set up group
-configurations in Studio <Set up Group Configurations in edX Studio>` or
-:ref:`in XML <Set up Group Configurations in an XML Course>`.
-
-You then select which grouping to use when you :ref:`add a content experiment
-in Studio <Add a Content Experiment in Studio>` or :ref:`in XML <Add a Content
-Experiment in XML>`.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/content_experiments/content_experiments_view.rst b/docs/en_us/course_authors/source/content_experiments/content_experiments_view.rst
deleted file mode 100644
index e02951db46..0000000000
--- a/docs/en_us/course_authors/source/content_experiments/content_experiments_view.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-.. _Test Content Experiments:
-
-##########################################
-Test Content Experiments
-##########################################
-
-You should test content experiments in your course before the course starts to
-ensure that content is delivered to groups as you intended.
-
-When you view a unit that contains a content experiment in the LMS in the Staff
-view, you select one of the groups from a drop-down list. The unit page then shows the
-content for that group of students.
-
-For example, in the following page, Group 0 is selected, and the HTML component
-and video that is part of Group 0 is displayed:
-
-.. image:: ../Images/a-b-test-lms-group-0.png
- :alt: Image of a unit page with Group 0 selected
-
-You can change the group selection to view the problem that a different group of
-students sees:
-
-.. image:: ../Images/a-b-test-lms-group-2.png
- :alt: Image of a unit page with Group 1 selected
-
-.. note:: 
-  The example course content in this chapter uses content experiment
-  terminology to make the functionality clear. Typically, you would not use
-  terminology in course content that would make students aware of the
-  experiment.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/content_experiments/index.rst b/docs/en_us/course_authors/source/content_experiments/index.rst
deleted file mode 100644
index 1f8d8fc35e..0000000000
--- a/docs/en_us/course_authors/source/content_experiments/index.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. _Creating Content Experiments:
-
-#############################
-Creating Content Experiments
-#############################
-
-
-.. toctree::
-   :maxdepth: 2
-   
-   content_experiments_overview
-   content_experiments_configure
-   content_experiments_add
-   content_experiments_view
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/creating_content/create_discussion.rst b/docs/en_us/course_authors/source/creating_content/create_discussion.rst
deleted file mode 100644
index 8f6cdace03..0000000000
--- a/docs/en_us/course_authors/source/creating_content/create_discussion.rst
+++ /dev/null
@@ -1,105 +0,0 @@
-.. _Working with Discussion Components:
-
-###################################
-Working with Discussion Components
-###################################
-
-*******************
-Overview
-*******************
-
-You can add a Discussion component to a unit, to pose a question related to the
-Unit and give students a chance to respond and interact.
-
-See the following topics:
-
-* :ref:`Create a Discussion Component`
-* :ref:`A Students View of the Discussion`
-
-
-Before you add a Discussion component, it is generally a good idea to add an
-HTML component that introduces the topic to be discussed. The Discussion
-component itself does not contain any text and may be easy for students to
-overlook.
-
-Also see the following chapters:
-
-* :ref:`Discussions`
-* :ref:`Guidance for Discussion Moderators`
-
-.. _Create a Discussion Component:
-
-*****************************
-Create a Discussion Component 
-*****************************
-
-#. Under **Add New Component**, click **Discussion**.
-
-#. In the Discussion component that appears, click **Edit**.
-  
-   .. image:: ../Images/Disc_Create_Edit.png
-    :alt: Image of the discussion component with the Edit button circled
-
-#. When the Discussion component editor opens, follow the guidelines in the
-   editor to fill in the **Category**, the optional **Display Name**, and the 
-   **Subcategory** fields.
-   
-   .. image:: ../Images/DiscussionComponentEditor.png
-    :alt: Image of the discussion component editor with a category of "Getting Graded" and a subcategory of "Answering More Than Once"
-
-   The value in the **Display Name** field identifies the discussion in the
-   course content. The values in the **Category** and **Subcategory** fields
-   appear in the list of discussion topics on the **Discussion** page. To
-   uniquely identify the discussion in your course, each **Category** /
-   **Subcategory** pair that you supply must be unique.
-
-   .. image:: ../Images/Discussion_category_subcategory.png
-    :alt: The list of discussions with the "Answering More Than Once" topic indented under "Getting Graded"
-  
-#. Click **Save**.
-
-.. warning:: 
-  You should always use these steps to create a discussion component. If you
-  create a discussion component by using the **Duplicate** button in Studio,
-  both discussion components will contain the same conversations, even if users
-  post in different discussions.
-
-Discussion *categories* are immediately visible on the **Discussion** tab for
-your course when you create them, even if the unit that contains the Discussion
-is not published. However, an individual Discussion component is not visible
-until the unit is published and release dates for the section and subsection
-have passed. See :ref:`Controlling Content Visibility` for more information.
-
-Additionally, you cannot see posts, responses, or comments in a Discussion
-component when you are working in Studio. To see the discussion, go to the unit
-that contains the Discussion component in Studio, and then click **Preview** or
-**View Live** under **Unit Settings**.
-
-.. _A Students View of the Discussion:
-
-**********************************
-A Student's View of the Discussion 
-**********************************
-
-For students, the display name for the Discussion component appears in the
-course ribbon at the top of the page:
-
-.. image:: ../Images/DiscussionComponent_LMS_Ribbon.png
- :alt: Image of a unit from a student's point of view with the component list
-     showing a discussion component
-
-The Discussion space appears under other components in the unit. It doesn't
-have a label in the body of the unit. Instead, students see "Show discussion"
-or "Hide discussion" on the left, and a blue **New Post** button on the right.
-
-In the following example, the Discussion component follows Video and HTML
-components:
-
-.. image:: ../Images/DiscussionComponent_LMS.png
-  :alt: Image of a video component followed by a discussion component
-
-In the **Discussion** tab at the top of the page, students can find the
-category and subcategory of the discussion in the left pane.
-
-.. image:: ../Images/Discussion_category_subcategory.png
- :alt: Image of the Discussion page from a student's point of view
diff --git a/docs/en_us/course_authors/source/creating_content/create_html_component.rst b/docs/en_us/course_authors/source/creating_content/create_html_component.rst
deleted file mode 100644
index 9367e13ab1..0000000000
--- a/docs/en_us/course_authors/source/creating_content/create_html_component.rst
+++ /dev/null
@@ -1,477 +0,0 @@
-.. _Working with HTML Components:
-
-
-#############################
-Working with HTML Components
-#############################
-
-***********************
-HTML Component Overview
-***********************
-
-HTML, or HyperText Markup Language, is the standard markup language used to
-create web pages. Web browsers present HTML code in a more readable format.
-
-When students see text and images in your course, they are seeing HTML code
-that is formatted and presented by their browsers. For more information about
-HTML, see `Wikipedia <http://en.wikipedia.org/wiki/HTML>`_.
-
-HTML components are the basic building blocks of your course content. You use
-HTML components to add and format text, links, images, and more. You can choose
-to create HTML components directly in HTML code, or using a Visual editor that
-hides the HTML code details, as described below.
-
-For more information, see the following topics:
-
-* :ref:`Options for Editing HTML Components`
-* :ref:`The Visual Editor`
-* :ref:`The Raw HTML Editor`
-* :ref:`HTML Component Templates`
-* :ref:`Create an HTML Component`
-* :ref:`Add a Link in an HTML Component`
-* :ref:`Add an Image to an HTML Component`
-* :ref:`Import LaTeX Code`
-
-.. note:: 
- Review :ref:`Developing Your Course Index` and :ref:`Best Practices for HTML
- Markup` before you start working with HTML components.
-
-To add an instant hangout to an HTML component, see :ref:`Google Instant
-Hangout`.
-
-
-.. _Options for Editing HTML Components:
-
-********************************************
-Options for Editing HTML Components
-********************************************
-
-You can work with HTML in two ways:
-
-* :ref:`The Visual Editor`
-  
-  With the Visual editor you can create, edit, and format content in a word
-  processing-like interface, without using HTML code directly. With the Visual
-  editor, you can more easily format your content, and add links and images. The
-  Visual editor provides access to HTML code so you can make small changes to
-  formatting, if required. However, the HTML view in the Visual editor does not
-  provide the detailed control you can get with the Raw HTML editor, and does
-  not support custom formatting or scripts.
-
-* :ref:`The Raw HTML Editor`
-
-  With the Raw HTML Editor, you work directly with HTML code. If you need to use
-  custom formatting or scripts in your content, you should use the Raw HTML
-  Editor.
-
-
-Set the Editor for an HTML Component
-************************************
-
-You set the editor for an HTML component in the **Settings** tab:
-
-.. image:: ../Images/set_html_editor.png
- :alt: The Editor selection drop-down list in the HTML Component Settings tab
-
-Select **Visual** or **Raw**. When you change the editor, you must click
-**Save** and re-open the component to begin using the new editor.
-
-.. warning:: 
- If you work with content in the Raw HTML editor, then switch to the Visual
- editor, you may lose custom HTML that you created. Therefore, it is recommended
- that you start by using the Visual editor, then switch to the Raw HTML editor
- when you need to create custom HTML.
-
-.. _The Visual Editor:
-
-*****************************************
-The Visual Editor
-*****************************************
-
-The Visual editor provides a “what you see is what you get” (WYSIWYG) interface
-that allows you to format text by clicking the formatting buttons at the top of
-the editor.
-
-.. image:: ../Images/HTMLEditor.png
- :alt: Image of the HTML component editor
-
-The following image shows call-outs for the editing options and is followed by
-descriptions.
-
-.. image:: ../Images/HTML_VisualView_Toolbar.png
-  :alt: Image of the HTML editor, with call-outs for formatting buttons
-
-#. Choose a formatting style for the selected paragraph, such as heading 1,
-   heading 2, or paragraph.
-#. Choose a font family for selected text, such as Arial, Courier New, or Times
-   New Roman.
-#. Format selected text in bold.
-#. Format selected text in italics.
-#. Underline selected text.
-#. Apply a color to the selected text.
-#. Format selected text as code.
-#. Create a bulleted list.
-#. Create a numbered list.
-#. Decrease and increased the indentation of the selected paragraph.
-#. Format the selected paragraph as a blockquote.
-#. Create a link from the selected text. See :ref:`Add a Link in an HTML
-   Component`.
-#. Delete the current link.
-#. Insert an image at the cursor. See :ref:`Add an Image to an HTML Component`.
-#. Work with HTML source code, described below.
-
-
-.. _Work with HTML code:
-
-
-Work with HTML code in the Visual editor
-*****************************************
-
-To work with HTML source code for the content you create in the Visual editor,
-click **HTML**  in the editor toolbar. The HTML source code editor opens:
-
-.. image:: ../Images/HTML_source_code.png
- :alt: Image of the HTML source code editor
-
-Edit the HTML code as needed. 
-
-You should not add custom styles or scripts in the HTML code view in the
-Visual editor. Use the Raw HTML editor instead.
-
-Click **OK** to close the source code editor and apply your changes in the
-Visual editor. The Visual editor then attempts to ensure the underlying HTML
-code is valid; for example, if you do not close a paragraph tag, the editor will
-close it for you.
-
-.. warning:: 
- Clicking **OK** in the source code editor does not save your changes to the
- HTML component.  You return to the component editor, where your changes are
- applied.  You must then also click **Save** to save your changes and close the
- component. If you click **Cancel**, the changes you made in the HTML source
- code are lost.
-
-.. _The Raw HTML Editor:
-
-*****************************
-The Raw HTML Editor
-*****************************
-
-When you select the Raw editor for the HTML component, you edit your content in
-a text editor:
-
-.. image:: ../Images/raw_html_editor.png
- :alt: The Raw HTML editor
-
-You must enter valid HTML. The Raw HTML editor does not validate your HTML code.
-Therefore you should thoroughly test the HTML content in your course.
-
-
-.. _HTML Component Templates:
-
-*****************************
-HTML Component Templates
-*****************************
-
-When you create a new HTML component, you select from a list of templates:
-
-.. image:: ../Images/html_templates.png
- :alt: The list of HTML Component templates
-
-The Raw HTML template is set to use the Raw HTML editor. All other templates use
-the Visual editor.
-
-For any HTML component, you can change the editor, regardless of the template
-used to create the component. See `Set the Editor for an HTML Component`_.
-
-
-
-.. _Create an HTML Component:
-
-*****************************
-Create an HTML Component
-*****************************
-
-To create an HTML component:
-
-1. Under **Add New Component**, click **html**.
-
-  .. image:: ../Images/NewComponent_HTML.png
-   :alt: Image of adding a new HTML component
-
-2. Select the template. 
-
-   The rest of these instructions assume you selected
-   **Text**, which creates an empty component with the Visual editor selected.
-
-   An empty component appears at the bottom of the unit.
-
-  .. image:: ../Images/HTMLComponent_Edit.png
-   :alt: Image of an empty HTML component
-
-3. In the component, click **Edit**.
-
-   The HTML component opens in the Visual editor.
-
-  .. image:: ../Images/HTMLEditor_empty.png
-   :alt: Image of the HTML component editor
-
-4. Enter and format your content. You can :ref:`Work with HTML code` if needed.
-
-5. Enter a display name (the name that you want students to see). To do this,
-   click **Settings** in the upper-right corner of the component editor, and
-   then enter text in the **Display Name** field.
-
-   To return to the text editor, click **Editor** in the upper-right corner.
-
-6. Click **Save** to save the HTML component.
-
-When using the Visual editor, you can also:
-
-* :ref:`Add a Link in an HTML Component`
-* :ref:`Add an Image to an HTML Component`
-* :ref:`Import LaTeX Code`
-
-.. _Add a Link in an HTML Component:
-
-***********************************
-Add a Link in an HTML Component
-***********************************
-
-When using the Visual editor, to add a link to a website, course unit, or file
-in an HTML component, you work with the **Insert link** dialog box.
-
-.. image:: ../Images/HTML_Insert-EditLink_DBox.png
- :alt: Image of the Insert link dialog box
-
-You can:
-
-* :ref:`Add a Link to a Website`
-* :ref:`Add a Link to a Course Unit`
-* :ref:`Add a Link to a File`
-
-.. _Add a Link to a Website:
-
-Add a Link to a Website
-***********************************
-
-To add a link to a website:
-
-#. Select the text that you want to make into the link.
-
-#. Click the link icon in the toolbar.
-
-#. In the **Insert link** dialog box, enter the URL of the website that you want
-   in the **URL** field.
-
-   .. image:: ../Images/HTML_Insert-EditLink_Website.png
-    :alt: Image of the Insert link dialog box
-
-#. If you want the link to open in a new window, click the drop-down arrow next
-   to the **Target** field, and then select **New Window**. If not, you can
-   leave the default value.
-
-#. Click **OK**.
-
-#. Save the HTML component and test the link.
-
-
-.. _Add a Link to a Course Unit:
-
-
-Add a Link to a Course Unit
-***********************************
-
-You can add a link to a course unit in an HTML component.
-
-#. Obtain the unit identifier of the unit you're linking to. To do this, open
-   the unit page in Studio, and copy the unit ID from the **Unit Identifier**
-   field under **Unit Location** in the right pane.
-   
-   .. image:: ../Images/UnitIdentifier.png
-    :alt: Image of the unit page with the unit identifier circled
-
-#. Open the HTML component where you want to add the link.
-
-#. Select the text that you want to make into the link.
-
-#. Click the link icon in the toolbar.
-
-#. In the **Insert link** dialog box, enter the following in the **URL** field.
-
-   ``/jump_to_id/<unit identifier>``
-
-   Make sure to replace <unit identifier> (including the brackets) with the unit
-   identifier that you copied in step 2, and make sure to include both forward slashes (/).
-
-   .. image:: ../Images/HTML_Insert-EditLink_CourseUnit.png
-    :alt: Image of the Insert link dialog box with a link to a unit identifier
-
-#. If you want the link to open in a new window, click the drop-down arrow next
-   to the **Target** field, and then select **New Window**. If not, you can
-   leave the default value.
-
-#. Click **Insert**.
-
-#. Save the HTML component and test the link.
-
-.. _Add a Link to a File:
-
-
-Add a Link to a File
-***********************************
-
-You can add a link in an HTML component to any file you've uploaded for the
-course. For more information about uploading files, see :ref:`Add Files to a
-Course`.
-
-#. On the **Files & Uploads** page, copy the **Embed URL** of the file.
-
-
-  .. image:: ../Images/HTML_Link_File.png
-   :alt: Image of Files and Uploads page with the URL field circled 
-  
-  .. note:: 
-   You must use the **Embed URL** to link to the file, not the **External URL**.
-
-2. Select the text that you want to make into the link.
-
-#. Click the link icon in the toolbar.
-
-#. In the **Insert link** dialog box, enter the following in the **URL** field.
-
-   ``/static/FileName.type``
-
-   Make sure to include both forward slashes (/).
-
-   .. image:: ../Images/HTML_Insert-EditLink_File.png
-    :alt: Image of the Insert link dialog box with a link to a file
-
-#. If you want the link to open in a new window, click the drop-down arrow next
-   to the **Target** field, and then select **New Window**. If not, you can
-   leave the default value.
-
-#. Click **Insert**.
-
-#. Save the HTML component and test the link.
-
-.. _Add an Image to an HTML Component:
-
-***********************************
-Add an Image to an HTML Component
-***********************************
-
-When using the Visual editor, you can add any image that you have uploaded for
-the course to an HTML component. For more information about uploading images,
-see :ref:`Add Files to a Course`.
-
-.. note:: 
- Review :ref:`Best Practices for Describing Images` before you add images to
- HTML components.
-
-To add an image, you'll need the URL of the image that you uploaded to the
-course. You'll then create a link to the image in the HTML component.
-
-#. On the **Files & Uploads** page, copy the **Embed URL** of the image that you
-   want.
-
-  .. image:: ../Images/image_link.png
-   :alt: Image of the Files & Upload page with the Embed URL for the image
-       circled
-
-  .. note:: 
-   You must use the **Embed URL** to add the image, not the **External URL**.
-
-2. Click the image icon in the toolbar.
-
-#. In the **Insert image** dialog box, enter the following in the **Source**
-   field.
-
-   ``/static/FileName.type``
-
-   Make sure to include both forward slashes (/).
-
-   .. image:: ../Images/HTML_Insert-Edit_Image.png
-    :alt: Image of the Insert image dialog box with a reference to a file
-
-4. Enter alternative text in the **Image description** field. This text becomes
-   the value of the ``alt`` attribute in HTML and is required for your course to
-   be fully accessible. See :ref:`Best Practices for Describing Images` for more
-   information.
-
-#. As needed, customize the image dimensions. Keep **Constrain proportions**
-   checked to ensure the image keeps the same width and height proportions.
-
-#. To change the spacing and border of the image, click the **Advanced** tab. 
-
-   .. image:: ../Images/HTML_Insert-Edit_Image_Advanced.png
-    :alt: Image of the Insert image dialog box Advanced tab
-
-#. Enter the **Vertical space**, **Horizontal space**, and **Border** as needed.
-   The values you enter are automatically added to the **Style** field.
-
-#. Click **OK** to insert the image in the HTML component.
-
-#. Save the HTML component and test the image.
-
-
-.. _Import LaTeX Code:
-
-****************************************
-Import LaTeX Code into an HTML Component
-****************************************
-
-You can import LaTeX code into an HTML component. You might do this, for
-example, if you want to create "beautiful math" such as the following.
-
-.. image:: ../Images/HTML_LaTeX_LMS.png
- :alt: Image of math formulas created with LaTeX
-
-.. warning:: 
- The LaTeX processor that Studio uses to convert LaTeX code to XML is a third-
- party tool. We recommend that you use this feature with caution. If you do use
- it, make sure to work with your Program Manager.
-
-This feature is not enabled by default. To enable it, you have to change the
-advanced settings in your course.
-
-To create an HTML component that contains LaTeX code:
-
-#. Enable the policy key in your course.
-
-   #. In Studio, click **Settings**, and then click **Advanced Settings**.
-   #. In the field for the **Enable LaTeX Compiler** policy key, change
-      **false** to **true**.
-   #. At the bottom of the page, click **Save Changes**.
-
-#. In the unit where you want to create the component, click **html** under
-   **Add New Component**, and then click **E-text Written in LaTeX**. The new
-   component is added to the unit.
-
-#. Click **Edit** to open the new component. The component editor opens.
-
-  .. image:: ../Images/latex_component.png
-   :alt: Image of the HTML component editor with the LaTeX compiler.
-
-4. In the component editor, click **Launch Latex Source Compiler**. The LaTeX
-   editor opens.
-
-   .. image:: ../Images/HTML_LaTeXEditor.png
-    :alt: Image of the HTML component editor with the LaTeX compiler
-
-#. Write LaTeX code as needed. You can also upload a LaTeX file into the editor
-   from your computer by clicking **Upload** in the bottom right corner.
-
-#. When you have written or uploaded the LaTeX code you need, click **Save &
-   Compile to edX XML** in the lower-left corner.
-
-   The component editor closes. You can see the way your LaTeX content looks.
-
-   .. image:: ../Images/HTML_LaTeX_CompEditor.png
-    :alt: Image of the LaTeX component
-
-#. On the unit page, click **Preview** to verify that your content looks the way
-   you want it to in the LMS.
-
-   If you see errors, go back to the unit page. Click **Edit** to open the
-   component again, and then click **Launch Latex Source Compiler** in the
-   lower-left corner of the component editor to edit the LaTeX code.
diff --git a/docs/en_us/course_authors/source/creating_content/create_problem.rst b/docs/en_us/course_authors/source/creating_content/create_problem.rst
deleted file mode 100644
index b7da289256..0000000000
--- a/docs/en_us/course_authors/source/creating_content/create_problem.rst
+++ /dev/null
@@ -1,697 +0,0 @@
-.. _Working with Problem Components:
-
-################################
-Working with Problem Components
-################################
-
-******************************
-Overview of Problem Components
-******************************
-
-The problem component allows you to add interactive, automatically
-graded exercises to your course content. You can create many different
-types of problems in Studio.
-
-All problems receive a point score, but, by default, problems do not count
-toward a student's grade. If you want the problems to count toward the
-student's grade, change the assignment type of the subsection that contains the
-problems.
-
-This section covers the basics of Problem components: what they look like to
-you and your students, and the options that every problem component has. For
-more information about individual problem types, see :ref:`Create Exercises`.
-
-For more information, see the following topics.
-
-* :ref:`Problem Student View`
-* :ref:`Problem Studio View`
-* :ref:`Problem Settings`
-* :ref:`Modifying a Released Problem`
-* :ref:`Additional Work with Problems`
-* :ref:`Multiple Problems in One Component`
-* :ref:`Problem Randomization`
-
-.. _Problem Student View:
-
-************************************
-The Student View of a Problem
-************************************
-
-All problems on the edX platform have several component parts.
-
-.. image:: ../Images/AnatomyOfExercise1.png
- :alt: Image of a problem from a student's point of view, with callouts for 
-       elements of the problem
-
-#. **Problem text.** The problem text can contain any standard HTML formatting.
-
-#. **Response field with the student’s answer.** Students enter answers
-   in *response fields*. The appearance of the response field depends on
-   the type of the problem.
-
-#. **Rendered answer.** For some problem types, Studio uses MathJax to
-   render plain text as “beautiful math.”
-
-#. **Check button.** The student clicks **Check** to submit a response
-   or find out if his answer is correct. If the answer is correct, a green
-   check mark appears. If it is incorrect, a red X appears. When the
-   student clicks the **Check button**, Studio saves the grade and current
-   state of the problem.
-
-#. **Save button.** The student can click **Save** to save his current
-   response without submitting it for a grade. This allows the student to
-   stop working on a problem and come back to it later.
-
-#. **Show Answer button.** This button is optional. When the student
-   clicks **Show Answer**, the student sees both the correct answer (see 2
-   above) and the explanation (see 10 below). The instructor sets whether
-   the **Show Answer** button is visible.
-
-#. **Attempts.** The instructor may set a specific number of attempts or allow
-   unlimited attempts for a problem. By default, the course-wide **Maximum
-   Attempts** advanced setting is null, meaning that the maximum number of
-   attempts for problems is unlimited. If the course-wide **Maximum Attempts**
-   setting is changed to a specific number, the **Maximum Attempts** setting
-   for individual problems defaults to that number, and cannot be set to
-   unlimited.
-
-   .. image:: ../Images//AnatomyOfExercise2.png
-    :alt: Image of a problem from a student's point of view, with callouts for 
-          attempts and showing the answer
-
-#. **Feedback.** After a student clicks **Check**, all problems return a
-   green check mark or a red X.
-
-   .. image:: ../Images//AnatomyofaProblem_Feedback.png
-    :alt: Image of feedback checkmark and x from a student's point of view
-
-#. **Correct answer.** Most problems require that the instructor specify
-   a single correct answer.
-
-#. **Explanation.** The instructor may include an explanation that
-   appears when a student clicks **Show Answer**.
-
-#. **Reset button.** This button clears the student input, so that the
-   problem looks the way it did originally.
-
-#. **Hide Answer button.**
-
-   .. image:: ../Images//AnatomyOfExercise3.png
-    :alt: Image of a problem in the course accordian
-
-#. **Grading.** The instructor may specify whether a group of problems
-   is graded. If a group of problems is graded, a clock icon appears for
-   that assignment in the course accordion.
-
-   .. image:: ../Images//clock_icon.png
-
-#. **Due date.** The date that the problem is due. A problem that is
-   past due does not have a **Check** button. It also does not accept
-   answers or provide feedback.
-
-.. note:: Problems can be **open** or **closed.** Closed problems do not 
-          have a **Check** button. Students can still see questions, solutions,
-          and revealed explanations, but they cannot check their work, submit
-          responses, or change an earlier score.
-
-There are also some attributes of problems that are not immediately
-visible. You can set these attributes in Studio.
-
-*  **Randomization.** For some problems, the instructor can specify
-   whether a problem will use randomly generated numbers that vary from
-   student to student.
-
-*  **Weight.** Different problems in a particular problem set may be
-   given different weights.
-
-*  **Label.** To improve accessibility for students who have disabilities, each
-   problem needs a descriptive label. The label typically contains part or all
-   of the text of the question in the problem. Most templates include a space
-   for a label. You can find example labels in the documentation for each
-   problem or tool type.
-
-.. _Problem Studio View:
-
-************************************
-The Studio View of a Problem
-************************************
-
-All problems are written in XML. However, Studio offers two interfaces for
-editing problem components: the Simple Editor and the Advanced Editor.
-
-*  The **Simple Editor** allows you to edit problems visually, without
-   having to work with XML.
-
-*  The **Advanced Editor** converts the problem to edX’s XML standard and
-   allows you to edit that XML directly.
-
-You can switch at any time from the Simple Editor to the Advanced Editor by
-clicking **Advanced Editor** in the top right corner of the Simple Editor
-interface. However, it is not possible to switch from the Advanced Editor to
-the Simple Editor.
-
-.. _Simple Editor:
-
-=================
-The Simple Editor
-=================
-
-Several problem templates, including multiple choice and text input problem
-templates, open in the Simple Editor. The following image shows a multiple
-choice problem in the Simple Editor.
-
-.. image:: ../Images//MultipleChoice_SimpleEditor.png
- :alt: Image of a problem in the simple editor
-
-The Simple Editor includes a toolbar that helps you format the text of your
-problem. When you select text and then click the formatting buttons, the Simple
-Editor formats the text for you automatically. The toolbar buttons are the
-following:
-
-1. Create a level 1 heading.
-2. Create multiple choice options.
-3. Create checkbox options.
-4. Create text input options.
-5. Create numerical input options.
-6. Create dropdown options.
-7. Create an explanation that appears when students click **Show Answer**.
-8. Open the problem in the Advanced Editor.
-9. Open a list of formatting hints.
-
-The following problem templates open in the Simple Editor.
-
-*  :ref:`Checkbox` In checkbox problems, students select one or more options
-   from a list of possible answers.
-
-*  :ref:`Dropdown` In dropdown problems, students select one answer from a
-   dropdown list.
-
-*  :ref:`Multiple Choice` Multiple choice problems require students to
-   select one answer from a list of choices that appear directly below
-   the question.
-
-*  :ref:`Numerical Input` Numerical input problems require answers that
-   include only integers, fractions, and a few common constants and
-   operators.
-
-*  :ref:`Text Input` In text input problems, students enter a short text
-   answer to a question.
-
-
-.. _Advanced Editor:
-
-===================
-The Advanced Editor
-===================
-The **Advanced Editor** opens a problem in XML. Templates for problems such as
-such as drag and drop and math expression input open directly in the Advanced
-Editor.
-
-The following image shows the multiple choice problem above in the Advanced
-Editor instead of the Simple Editor.
-
-.. image:: ../Images//MultipleChoice_AdvancedEditor.png
- :alt: Image of a problem in the advanced editor
-
-The following problem templates open in the Advanced Editor.
-
-* :ref:`Circuit Schematic Builder` In circuit schematic problems, students
-  create and modify circuits on an interactive grid and submit computer-
-  generated analyses of the circuits for grading.
-
-* :ref:`Custom JavaScript` With custom JavaScript display and grading problems,
-  you can incorporate problem types that you've created in HTML into Studio via
-  an IFrame.
-
-* :ref:`Drag and Drop` Drag and drop problems require students to drag text or
-  objects to a specific location on an image.
-
-* :ref:`Image Mapped Input` Image mapped input problems require students to
-  click a specific location on an image.
-
-* :ref:`Math Expression Input` Math expression input problems require students
-  to enter a mathematical expression as text, such as e=m\*c^2.
-
-* :ref:`Problem with Adaptive Hint` These problems can give students feedback
-  or hints based on their responses. Problems with adaptive hints can be text
-  input or multiple choice problems.
-
-* :ref:`Problem Written in LaTeX` This problem type allows you to convert
-  problems that you’ve already written in LaTeX into the edX format. Note that
-  this problem type is still a prototype, however, and may not be supported in
-  the future.
-
-* :ref:`Write Your Own Grader` Custom Python-evaluated input (also called
-  "write-your-own-grader" problems evaluate students' responses using an
-  embedded Python script that you create. These problems can be any type.
-
-.. _Problem Settings:
-
-******************
-Problem Settings
-******************
-
-In addition to the text of the problem, problems that you create using a
-Problem component have the following settings. These settings appear on the
-**Settings** tab in the component editor.
-
-*  **Display Name**
-*  **Maximum Attempts**
-*  **Problem Weight**
-*  **Randomization**
-*  **Show Answer**
-
-.. image:: ../Images/ProbComponent_Attributes.png
- :alt: Image of the Settings tab in a Problem component
-
-===============
-Display Name
-===============
-
-This setting indicates the name of your problem. The display name
-appears as a heading over the problem in the LMS and in the course
-ribbon at the top of the page.
-
-.. image:: ../Images/ProbComponent_LMS_DisplayName.png
- :alt: Image of the problem in a unit page from a student's point of view
-
-==============================
-Maximum Attempts
-==============================
-
-This setting specifies the number of times a student is allowed to attempt
-answering the problem. By default, the course-wide **Maximum Attempts**
-advanced setting is null, meaning that the maximum number of attempts for
-problems is unlimited. If the course-wide **Maximum Attempts** setting is
-changed to a specific number, the **Maximum Attempts** setting for individual
-problems defaults to that number, and cannot be set to unlimited.
-
-.. note:: Only questions that have a **Maximum Attempts** setting of 1 or 
- higher are included on the Student Answer Distribution report that you can
- download during your course.
-
-.. _Problem Weight:
-
-==============================
-Problem Weight
-==============================
-
-.. note:: Studio stores scores for all problems, but scores only count 
-          toward a student’s final grade if they are in a subsection that is
-          graded.
-
-This setting specifies the maximum number of points possible for the
-problem. The problem weight appears next to the problem title.
-
-.. image:: ../Images/ProblemWeight_DD.png
- :alt: Image of a problem from a student's point of view, with the possible 
-       points circled
-
-By default, each response field, or “answer space,” in a Problem
-component is worth one point. Any Problem component can have multiple
-response fields. For example, the Problem component above
-contains one dropdown problem that has three separate questions for students
-to answer, and thus has three response fields.
-
-The following Problem component contains one text input problem,
-and has just one response field.
-
-.. image:: ../Images/ProblemWeight_TI.png
- :alt: Image of a text input problem from a student's point of view
-
-Computing Scores
-****************
-
-The score that a student earns for a problem is the result of the
-following formula:
-
-**Score = Weight × (Correct answers / Response fields)**
-
-*  **Score** is the point score that the student receives.
-
-*  **Weight** is the problem’s maximum possible point score.
-
-*  **Correct answers** is the number of response fields that contain correct
-   answers.
-
-*  **Response fields** is the total number of response fields in the problem.
-
-**Examples**
-
-The following are some examples of computing scores.
-
-*Example 1*
-
-A problem’s **Weight** setting is left blank. The problem has two
-response fields. Because the problem has two response fields, the
-maximum score is 2.0 points.
-
-If one response field contains a correct answer and the other response
-field contains an incorrect answer, the student’s score is 1.0 out of 2
-points.
-
-*Example 2*
-
-A problem’s weight is set to 12. The problem has three response fields.
-
-If a student’s response includes two correct answers and one incorrect
-answer, the student’s score is 8.0 out of 12 points.
-
-*Example 3*
-
-A problem’s weight is set to 2. The problem has four response fields.
-
-If a student’s response contains one correct answer and three incorrect
-answers, the student’s score is 0.5 out of 2 points.
-
-===============
-Randomization
-===============
-
-This setting specifies whether certain values in your problem change each time
-a different student accesses the problem, or each time a single student tries
-to answer the problem. For example, the highlighted values in the problem below
-change each time a student submits an answer to the problem.
-
-.. image:: ../Images/Rerandomize.png
- :alt: The same problem shown twice, with color highlighting on values that 
-       can change
-
-If you want to change, or "randomize," specific values in your problem, you
-have to do both the following:
-
-* Make sure that your problem contains a Python script that randomizes the
-  values that you want.
-
-* Enable randomization in the Problem component. 
-
-.. note:: Note that specifying this **Randomization** setting is different 
- from *problem randomization*. The **Randomization** setting randomizes
- variables within a single problem. Problem randomization offers different
- problems or problem versions to different students. For more information, see
- :ref:`Problem Randomization`.
-
-To enable randomization, select an option for the **Randomization** setting.
-This setting has the following options.
-
-+-------------------+--------------------------------------+
-| **Always**        | Students see a different version of  |
-|                   | the problem each time they click     |
-|                   | **Check**.                           |
-+-------------------+--------------------------------------+
-| **On Reset**      | Students see a different version of  |
-|                   | the problem each time they click     |
-|                   | **Reset**.                           |
-+-------------------+--------------------------------------+
-| **Never**         | All students see the same version    |
-|                   | of the problem. This is the default. |
-+-------------------+--------------------------------------+
-| **Per Student**   | Individual students see the same     |
-|                   | version of the problem each time     |
-|                   | they look at it, but that version    |
-|                   | is different from the version that   |
-|                   | other students see.                  |
-+-------------------+--------------------------------------+
-
-===============
-Show Answer
-===============
-
-This setting defines when the problem shows the answer to the student.
-This setting has the following options.
-
-+-------------------+--------------------------------------+
-| **Always**        | Always show the answer when the      |
-|                   | student clicks the **Show Answer**   |
-|                   | button.                              |
-+-------------------+--------------------------------------+
-| **Answered**      | Show the answer after the student    |
-|                   | has submitted her final answer.      |
-+-------------------+--------------------------------------+
-| **Attempted**     | Show the answer after the student    |
-|                   | has tried to answer the problem one  |
-|                   | time, whether or not the student     |
-|                   | answered the problem correctly.      |
-+-------------------+--------------------------------------+
-| **Closed**        | Show the answer after the student    |
-|                   | has used up all his attempts to      |
-|                   | answer the problem or the due date   |
-|                   | has passed.                          |
-+-------------------+--------------------------------------+
-| **Finished**      | Show the answer after the student    |
-|                   | has answered the problem correctly,  |
-|                   | the student has no attempts left, or |
-|                   | the problem due date has passed.     |
-+-------------------+--------------------------------------+
-| **Correct or      | Show the answer after the student    |
-| Past Due**        | has answered the problem correctly   |
-|                   | or the problem due date has passed.  |
-+-------------------+--------------------------------------+
-| **Past Due**      | Show the answer after the due date   |
-|                   | for the problem has passed.          |
-+-------------------+--------------------------------------+
-| **Never**         | Never show the answer. In this case, |
-|                   | the **Show Answer** button does not  |
-|                   | appear next to the problem in Studio |
-|                   | or in the LMS.                       |
-+-------------------+--------------------------------------+
-
-.. _Modifying a Released Problem:
-
-*********************************
-Modifying a Released Problem
-*********************************
-
-.. warning:: Be careful when you modify problems after they have been 
- released! Changes that you make to published problems can affect the student
- experience in the course and analysis of course data.
-
-After a student submits a response to a problem, the edX Learning Management
-System (LMS) stores the student’s response, the score that the student
-received, and the maximum score for the problem. For problems with a **Maximum
-Attempts** setting greater than 1, the LMS updates these values each time the
-student submits a new response to a problem. However, if an instructor changes
-a problem or its attributes, existing student information for that problem is
-not automatically updated.
-
-For example, you may release a problem and specify that its answer is 3.
-After some students have submitted responses, you notice that the answer
-should be 2 instead of 3. When you update the problem with the correct
-answer, the LMS doesn’t update scores for students who answered 2 for the
-original problem and thus received the wrong score.
-
-For another example, you may change the number of response fields to
-three. Students who submitted answers before the change have a score of
-0, 1, or 2 out of 2.0 for that problem. Students who submitted answers
-after the change have scores of 0, 1, 2, or 3 out of 3.0 for the same
-problem.
-
-If you change the weight setting for the problem in Studio, however, existing
-student scores update when the student's **Progress** page is refreshed. In a
-live section, students will see the effect of these changes.
-
-===============
-Workarounds
-===============
-
-If you have to modify a released problem in a way that affects grading, you
-have two options within Studio to assure that every student has the opportunity
-to submit a new response and be regraded. Note that both options require you to
-ask your students to go back and resubmit answers to a problem.
-
-*  In the Problem component that you changed, increase the number of attempts
-   for the problem. Then ask all your students to redo the problem.
-
-*  Delete the entire Problem component in Studio and create a new Problem
-   component with the content and settings that you want. (If the revisions you
-   must make are minor, duplicate the Problem component before you delete it
-   and revise the copy.) Then ask all your students to complete the new
-   problem.
-
-For information about how to review and adjust student grades in the LMS, see
-:ref:`Grades`.
-
-.. _Additional Work with Problems:
-
-************************************
-Additional Work with Problems
-************************************
-
-You have some further options when you work with problems. You can include more
-than one problem in a single problem component, or you can set up a problem
-that presents different versions to different students.
-
-.. _Multiple Problems in One Component:
-
-====================================
-Multiple Problems in One Component
-====================================
-
-You may want to create a problem that has more than one response type. For
-example, you may want to create a numerical input problem, and then include a
-multiple choice question about the numerical input problem. Or, you may want a
-student to be able to check the answers to many problems at one time. To do
-this, you can include multiple problems inside a single Problem component. The
-problems can be different types.
-
-To create multiple problems in one component, create a new Blank Advanced
-Problem component, and then add the XML for each problem in the component
-editor. You only need to include the XML for the problem and its answers. You
-don’t have to include the code for other elements, such as the **Check**
-button.
-
-Elements such as the **Check**, **Show Answer**, and **Reset** buttons, as well
-as the settings that you select for the Problem component, apply to all of the
-problems in that component. Thus, if you set the maximum number of attempts to
-3, the student has three attempts to answer the entire set of problems in the
-component as a whole rather than three attempts to answer each problem
-individually. If a student clicks **Check**, the LMS scores all of the problems
-in the component at once. If a student clicks **Show Answer**, the answers for
-all the problems in the component appear.
-
-.. _Problem Randomization:
-
-===========================
-Problem Randomization
-===========================
-
-You may want to present different students with different problems, or
-different versions of the same problem. To do this, you'll create a Problem
-component for each problem or version in Studio, and then edit your course
-outside of Studio to randomize the problem that students see.
-
-Note that *problem randomization* is different from the **Randomization**
-setting in Studio. The **Randomization** setting randomizes variables within a
-single problem. Problem randomization offers different problems or problem
-versions to different students.
-
-.. note:: Creating problems with versions that can be randomized requires you 
- to export your course, edit some of your course's XML files in a text editor,
- and then re-import your course. We recommend that you create a backup copy of
- your course before you do this. We also recommend that you only edit your
- course files in the text editor if you're very familiar with editing XML.
-
-Terminology
-************
-
-Sections, subsections, units, and components have different names in the
-**Course Outline** view and in the list of files that you'll see after you
-export your course and open the .xml files for editing. The following table
-lists the names of these elements in the **Course Outline** view and in a list
-of files.
-
-.. list-table::
-   :widths: 15 15
-   :header-rows: 0
-
-   * - Course Outline View
-     - File List
-   * - Section
-     - Chapter
-   * - Subsection
-     - Sequential
-   * - Unit
-     - Vertical
-   * - Component
-     - Discussion, HTML, problem, or video
-
-For example, when you want to find a specific section in your course, you'll
-look in the **Chapter** folder when you open the list of files that your course
-contains. To find a unit, you'll look in the **Vertical** folder.
-
-.. _Create Randomized Problems:
-
-Create Randomized Problems
-****************************
-
-#. In the unit where you want to create a randomized problem, create a separate
-   Problem component for each version or problem that you want to randomize.
-   For example, if you want to offer four versions or problems, you'll create
-   four separate Problem components. Make a note of the 32-digit unit ID that
-   appears in the **Unit Identifier** field under **Unit Location**.
-
-#. Export your course. For information about how to do this, see
-   :ref:`Exporting and Importing a Course`. Save the .tar.gz file that contains
-   your course in a memorable location so that you can find it easily.
-
-#. Locate the .tar.gz file that contains your course, and then unpack the
-   .tar.gz file so that you can see its contents in a list of folders and
-   files.
-
-   To do this on a Windows computer, you'll need to download a third-party
-   program. For more information, see `How to Unpack a tar File in Windows
-   <http://www.haskell.org/haskellwiki/How_to_unpack_a_tar_file_in_Windows>`_,
-   `How to Extract a Gz File <http://www.wikihow.com/Extract-a-Gz-File>`_, `The
-   gzip Home Page <http://www.gzip.org/>`_, or the `Windows
-   <http://www.ofzenandcomputing.com/how-to-open-tar-gz-files/#windows>`_
-   section of the `How to Open .tar.gz Files <http://www.ofzenandcomputing.com
-   /how-to-open-tar-gz-files/>`_ page.
-
-   For information about how to do this on a Mac, see the `Mac OS X
-   <http://www.ofzenandcomputing.com/how-to-open-tar-gz-files/#mac-os-x>`_
-   section of the `How to Open .tar.gz Files <http://www.ofzenandcomputing.com
-   /how-to-open-tar-gz-files/>`_ page.
-
-#. In the list of folders and files, open the **Vertical** folder.
-
-   .. note:: If your unit is not published, open the **Drafts** folder, and 
-    then open the **Vertical** folder in the **Drafts** folder.
-
-#. In the **Vertical** folder, locate the .xml file that has the same name as
-   the unit ID that you noted in step 1, and then open the file in a text
-   editor such as Sublime 2. For example, if the unit ID is
-   e461de7fe2b84ebeabe1a97683360d31, you'll open the
-   e461de7fe2b84ebeabe1a97683360d31.xml file.
-
-   The file contains a list of all the components in the unit, together with
-   the URL names of the components. For example, the following file contains
-   four Problem components.
-
-   .. code-block:: xml
-     
-       <vertical display_name="Test Unit">
-          <problem url_name="d9d0ceb3ffc74eacb29501183e26ad6e"/>
-          <problem url_name="ea66d875f4bf4a9898d8e6d2cc9f3d6f"/>
-          <problem url_name="2616cd6324704f85bc315ec46521485d"/>
-          <problem url_name="88987707294d4ff0ba3b86921438d0c0"/>
-       </vertical>
-
-#. Add ``<randomize> </randomize>`` tags around the components for the problems
-   that you want to randomize.
-
-   .. code-block:: xml
-      
-       <vertical display_name="Test Unit">
-         <randomize>
-            <problem url_name="d9d0ceb3ffc74eacb29501183e26ad6e"/>
-            <problem url_name="ea66d875f4bf4a9898d8e6d2cc9f3d6f"/>
-            <problem url_name="2616cd6324704f85bc315ec46521485d"/>
-            <problem url_name="88987707294d4ff0ba3b86921438d0c0"/>
-         </randomize>
-       </vertical>
-
-#. After you add the ``<randomize> </randomize>`` tags, save and close the .xml
-   file.
-
-#. Re-package your course as a .tar.gz file.
-
-   For information about how to do this on a Mac, see `How to Create a Tar GZip
-   File from the Command Line <http://osxdaily.com/2012/04/05/create- tar-
-   gzip/>`_.
-
-   For information about how to do this on a Windows computer, see `How to Make
-   a .tar.gz on Windows <http://stackoverflow.com/questions/12774707 /how-to-
-   make-a-tar-gz-on-windows>`_.
-
-#. In Studio, re-import your course.
-
-.. note::
-
-  * Once you've implemented randomization, you can only see one of the versions
-    or problems in Studio. You can edit that single problem directly in Studio,
-    but to edit any of the other problems, you'll have to export your course,
-    edit the problems in a text editor, and then re-import the course. This is
-    true for instructors as well as course teams.
-  
-  * A .csv file for student responses contains the responses to each of the
-    problems in the problem bank.
diff --git a/docs/en_us/course_authors/source/creating_content/create_video.rst b/docs/en_us/course_authors/source/creating_content/create_video.rst
deleted file mode 100644
index f418d31c8b..0000000000
--- a/docs/en_us/course_authors/source/creating_content/create_video.rst
+++ /dev/null
@@ -1,430 +0,0 @@
-.. _Working with Video Components:
-
-#############################
-Working with Video Components
-#############################
-
-
-**********************
-Introduction to Videos
-**********************
-You can create a video of your lecture and add it to your course with other
-components—such as discussions and problems—to promote active learning. Adding a video to your course has several steps.
-
-#. :ref:`Create the Video`.
-#. :ref:`Create Transcript`.
-#. :ref:`Post the Video Online`.
-#. :ref:`Create a Video Component`.
-
-Also see:
-
-* :ref:`Video TOC`
-* :ref:`Additional Transcripts`
-* :ref:`Steps for sjson files`
-
-.. note:: Review :ref:`Best Practices for Accessible Media` before adding videos
- to your course.
-
-note:: To help course teams protect video assets, the edX video player hides video URLs from students by default. This functionality is in effect for all video files, including YouTube videos and videos that you have posted in other locations. Students can still download videos if you select the **Video Download Allowed** option for your Video components. For more information about posting non-YouTube videos online, see :ref:`Post the Video Online`. For more information about options that you can set when you create a video component, see :ref:`Video Advanced Options` under :ref:`Create a Video Component`.
-
-.. _Create the Video:
-
-************************
-Step 1. Create the Video
-************************
-
-Your video can contain whatever content you want. The `Producing Videos <https:/
-/edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/courseware/93451eee
-15ed47b0a310c19020e8dc64/a1b0835e986b4283b0f8871d97babb9a/>`_ section of our
-`edX101
-<https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/about>`_
-course has some helpful pointers for creating good video content.
-
-.. _Compression Specifications:
-
-====================================
-Compression Specifications
-====================================
-
-When you create your video, edX recommends the following compression specs.
-(Note that these are recommended but not required.)
-
-.. list-table::
-   :widths: 10 20 20 20
-   :header-rows: 0
-   :stub-columns: 1
-
-   * - Output
-     - Edited Files
-     - Publish to YouTube
-     - Publish downloadable file to AWS S3
-   * - Codec
-     - H.264 .mp4
-     - H.264 "main concept" .mp4
-     - H.264 "x264" .mp4
-   * - Resolution and Frame Rate
-     - 1920x1080, progressive, 29.97 fps
-     - 1920x1080, progressive, 29.97 fps 
-     - 1280x720, progressive, 29.97 fps
-   * - Aspect
-     - 1.0
-     - 1.0
-     - 1.0
-   * - Bit Rate
-     - VBR, 2 pass 
-     - VBR, 2 pass 
-     - VBR, 2 pass  
-   * - Target VBR
-     - 32 mbps
-     - 5 mbps
-     - 1 mbps
-   * - Max VBR
-     - 40 mbps
-     - 7.5 mbps
-     - 1.5 mbps
-   * - Audio
-     - Linear AAC 48kHz / 256 kbps
-     - AAC 44.1 / 192 kbps
-     - AAC 44.1 / 192 kbps
-
-.. _Video Formats:
-
-==================
-Video Formats
-==================
-
-The edX video player supports videos in .mp4, .webm, .mpeg, and .ogg format. **However, to help make sure all standard browsers can play your video, we strongly recommend that you use the .mp4 or .webm format.**
-
-.. _Create Transcript:
-
-*********************************************
-Step 2. Create or Obtain a Video Transcript
-*********************************************
-
-We strongly recommend that you associate a timed transcript with your video.
-Transcripts can be helpful for students whose first language isn't English, who
-can't watch the video, or who want to review the video's content. The transcript
-scrolls automatically while your video plays. When a student clicks a word in
-the transcript, the video opens to that word. You can also allow your students
-to download the transcript so that they can read it offline. You'll associate
-the transcript with the video when you create the Video component.
-
-**To play automatically with the video, your transcript file must be an .srt
-file.** To create or obtain a transcript in .srt format, you can work with a
-company that provides captioning services. EdX works with `3Play Media
-<http://www.3playmedia.com>`_. `YouTube <http://www.youtube.com/>`_ also
-provides captioning services.
-
-When you upload an .srt file, a .txt file is created automatically. You can allow students to download either the .srt file or the .txt file. You can also provide transcripts in different formats, such as .pdf, and you can provide transcripts in different languages. For more information, see :ref:`Additional Transcripts`.
-
-If you allow your students to download transcripts, a **Download transcript**
-button appears under the video. Students can then select either **SubRip (.srt)
-file** or **Text (.txt) file** to download the .srt or .txt transcript.
-
-.. image:: /Images/Video_DownTrans_srt-txt.png
-   :width: 500
-   :alt: Video status bar showing srt and txt transcript download options
-
-.. note:: Some past courses have used .sjson files for video transcripts. If
- transcripts in your course uses this format, see :ref:`Steps for sjson
- files`. We don't recommend that you use .sjson files.
-
-.. _Post the Video Online:
-
-*****************************
-Step 3. Post the Video Online
-*****************************
-
-All course videos should be posted to YouTube. By default, the edX video player
-accesses your YouTube videos.
-
-Because YouTube is not available in all locations, however, we recommend that
-you also post copies of your videos on a third-party site such as `Amazon S3
-<http://aws.amazon.com/s3/>`_. When a student views  a video in your course, if
-YouTube is not available in that student’s location or if the YouTube video
-doesn’t play, the video on the backup site starts playing automatically. You can also allow the
-student to download the video from the backup site.
-
-After you post your video online, make sure you have the URL for the video. If
-you host copies of your video in more than one place, make sure you have the URL
-for each video location.
-
-==================
-YouTube
-==================
-
-After you've created your video, upload the video to `YouTube
-<http://www.youtube.com/>`_.
-
-.. note:: YouTube only hosts videos of up to 15 minutes. If you create a
- 0.75-speed option, you must make sure that your 1.0-speed video segments are
- only 11.25 minutes long so that YouTube can host all speeds. YouTube offers
- paid accounts that relax this restriction.
-
-==================
-Other Sites
-==================
-
-You can use any video backup site that you want. However, keep in mind that the
-site where you post the videos may have to handle a lot of traffic.
-
-.. note:: The URL for the video that you post on a third-party site must end in
- .mp4, .webm, .mpeg, or .ogg. (To help make sure all standard browsers can play your video, we **strongly** recommend that you use .mp4 or .webm format.) EdX can't support videos that you post on sites
- such as Vimeo.
-
-.. _Create a Video Component:
-
-********************************
-Step 4. Create a Video Component
-********************************
-
-#. Under **Add New Component**, click **Video**.
-
-#. When the new video component appears, click **Edit**. The video editor opens
-   to the **Basic** tab.
-
-   .. image:: ../Images/VideoComponentEditor.png
-    :alt: Image of the video component editor
-    :width: 500
-
-   You'll replace the default values with your own. 
-   
-#. In the **Component Display Name** field, enter the name you want students to see when
-   they hover the mouse over the unit in the course ribbon. This text also
-   appears as a header for the video.
-
-#. In the **Default Video URL** field, enter the URL of the video. For example, the URL
-   may resemble one of the following.
-
-   ::
-   
-      http://youtu.be/OEoXaMPEzfM
-      http://www.youtube.com/watch?v=OEoXaMPEzfM
-      https://s3.amazonaws.com/edx-course-videos/edx-edx101/EDXSPCPJSP13-G030300.mp4
-      https://s3.amazonaws.com/edx-videos/edx101/video4.webm	
-
-   .. note:: To be sure all students can access the video, we recommend providing both an .mp4 and a .webm version of your video. To do this, you can post additional versions of your videos on the Internet, then add the URLs for these versions below the default video URL. **These URLs cannot be YouTube URLs**. To add a URL for another version, click **Add URLs for additional versions**. The first listed video that's compatible with the student's computer will play.
-
-#. Next to **Default Timed Transcript**, select an option.
-
-   - If edX already has a transcript for your video--for example, if you're
-     using a video from an existing course--Studio automatically finds the
-     transcript and associates the transcript with the video.
-     
-     If you want to modify the transcript, click **Download Transcript for Editing**. You can then make your changes and upload the new file by clicking **Upload New Transcript**.
-
-   - If edX doesn't have a transcript for the video, but YouTube has a transcript, Studio automatically finds the YouTube
-     transcript and asks if you want to import it. To use this YouTube
-     transcript, click **Import YouTube Transcript**. (If you want to modify the
-     YouTube transcript, import the YouTube transcript into Studio, and then click **Download Transcript for Editing**. You can then make your changes and upload the new file by
-     clicking **Upload New Transcript**.)
-
-   - If both edX and YouTube have a transcript for your video, but the edX transcript is out of date, you'll receive a message asking if you want to replace the edX transcript with the YouTube transcript. To use the YouTube transcript, click **Yes, replace the edX transcript with the YouTube transcript**.
-
-   - If neither edX nor YouTube has a transcript for your video, and your
-     transcript uses the .srt format, click **Upload New Transcript** to
-     upload the transcript file from your computer.
-
-     .. note:: 
-
-        * If your transcript uses the .sjson format, do not use this setting.
-          For more information, see :ref:`Steps for sjson files`.
-
-        * If you want to provide a transcript in a format such as .pdf,
-          do not use this setting to upload the transcript. For more
-          information, see :ref:`Additional Transcripts`.
-    
-
-#. Optionally, click **Advanced** to set more options for the video. For a
-   description of each option, see :ref:`Video Advanced Options`.
-
-#. Click **Save.**
-  
-.. _Video Advanced Options:
-
-==================
-Advanced Options
-==================
-
-The following options appear on the **Advanced** tab in the Video component.
-
-.. list-table::
-    :widths: 30 70
-
-    * - **Component Display Name**
-      - The name that you want your students to see. This is the same as the **Display Name** field on the **Basic** tab.
-    * - **Default Timed Transcript**
-      -  The name of the transcript file that's used in the **Default Timed Transcript** field on the **Basic** tab. This field is auto-populated. You don't have to change this setting.
-    * - **Download Transcript Allowed**
-      - Specifies whether you want to allow students to download the timed transcript. If you set this value to **True**, a link to download the file appears below the video. 
-
-        By default, Studio creates a .txt transcript when you upload an .srt transcript. Students can download the .srt or .txt versions of the transcript when you set **Download Transcript Allowed** to **True**. If you want to provide the transcript for download in a different format as well, such as .pdf, upload a file to Studio by using the **Upload Handout** field. 
-
-    * - **Downloadable Transcript URL**
-      - The URL for a non-.srt version of the transcript file posted on the **Files & Uploads** page or on the Internet. Students see a link to download the non-.srt transcript below the video. 
-
-        .. note:: When you add a transcript to this field, only the transcript that you add is available for download. The .srt and .txt transcripts become unavailable. If you want to provide a downloadable transcript in a format other than .srt, we recommend that you upload a handout for students by using the **Upload Handout** field. For more information, see :ref:`Additional Transcripts`.
-
-    * - **Show Transcript**
-      - Specifies whether the transcript plays along with the video by default.
-    * - **Transcript Languages**
-      - The transcript files for any additional languages. For more information, see :ref:`Transcripts in Additional Languages`.
-    * - **Upload Handout**
-      - Allows you to upload a handout to accompany this video. Your handout can be in any format. Students can download the handout by clicking **Download Handout** under the video.
-    * - **Video Download Allowed**
-      - Specifies whether students can download versions of this video in different formats if they cannot use the edX video player or do not have access to YouTube. If you set this value to **True**, you must add at least one non-YouTube URL in the **Video File URLs** field. 
-    * - **Video File URLs**
-      - The URL or URLs where you've posted non-YouTube versions of the video. Every URL should end in .mpeg, .webm, .mp4, or .ogg and cannot be a YouTube URL. Each student will be able to view the first listed video that's compatible with the student's computer. To allow students to download these videos, you must set **Video Download Allowed** to **True**.
-
-        .. note:: To help make sure all standard browsers can play your video, we **strongly** recommend that you use the .mp4 or .webm format.
-
-    * - **Video Start Time**
-      - The time you want the video to start if you don't want the entire video to play. Formatted as HH:MM:SS. The maximum value is 23:59:59.
-    * - **Video Stop Time**
-      - The time you want the video to stop if you don't want the entire video to play. Formatted as HH:MM:SS. The maximum value is 23:59:59.
-    * - **YouTube ID, YouTube ID for .75x speed, YouTube ID for 1.25x speed, YouTube ID for 1.5x speed**
-      - If you have uploaded separate videos to YouTube for different speeds of your video, enter the YouTube IDs for these videos in these fields. These settings are optional, for older browsers.
-
-
-.. _Video TOC:
-
-***************************
-Video Table of Contents
-***************************
-
-You can add a table of contents for your video by adding an .srt transcript file that contains clickable links to different parts of the video. When your students view the video, they can click the **CC** button at the bottom of the video player to switch between the main transcript for the video and the table of contents. 
-
-To add a table of contents, you'll work with a third-party service to create the .srt transcript file. Then, you'll use the **Transcript Languages** setting in the Video component to associate the .srt file with the video.
-
-.. image:: /Images/VideoTOC.png
-   :alt: Image of a video with a transcript that has links to different parts of the video
-   :width: 500
-
-#. After you've obtained the .srt transcript file that will function as the table of contents, open the Video component for the video.
-
-#. On the **Advanced** tab, scroll down to **Transcript Languages**, and then
-   click **Add**. 
-
-#. In the drop-down list that appears, select **Table of Contents**. 
-
-   An **Upload** button appears.
-
-#. Click **Upload**, browse to the .srt file for the transcript, and then click **Open**.
-
-#. In the **Upload translation** dialog box, click **Upload**.
-
-
-
-
-.. _Additional Transcripts:
-
-**********************
-Additional Transcripts
-**********************
-
-By default, a .txt file is created when you upload an .srt file, and students can download an .srt or .txt transcript when you set **Download Transcript Allowed** to **True**. The **Download Transcript** button appears below the video, and students see the .srt and .txt options when they hover over the button.
-
-.. image:: /Images/Video_DownTrans_srt-txt.png
-   :width: 500
-   :alt: Video status bar showing srt and txt transcript download options
-
-If you want to provide a downloadable transcript in a format such as .pdf along with the .srt and .txt transcripts, we recommend that you use the **Upload Handout** field. When you do this, a **Download Handout** button appears to the right of the **Download Transcript** button, and students can download the .srt, .txt, or handout version of the transcript.
-
-.. image:: /Images/Video_DownTrans_srt-handout.png
-   :width: 500
-   :alt: Video status bar showing srt, txt, and handout transcript download options
-
-To add a downloadable transcript by using the **Upload Handout** field:
-
-#. Create or obtain your transcript as a .pdf or in another format.
-#. In the Video component, click the **Advanced** tab.
-#. Locate **Upload Handout**, and then click **Upload**.
-#. In the **Upload File** dialog box, click **Choose File**.
-#. In the dialog box, select the file on your computer, and then click **Open**.
-#. In the **Upload File** dialog box, click **Upload**.
-
-Before Studio added the **Upload Handout** feature, some courses posted transcript files on the **Files & Uploads** page or on the Internet, and then added a link to those files in the Video component. **We no longer recommend this method.**  When you use this method, the **Download Transcript** button appears, but only the transcript that you add is available for download. The .srt and .txt transcripts become unavailable. 
-
-.. image:: /Images/Video_DownTrans_other.png
-   :width: 500
-   :alt: Video status bar showing Download Transcript button without srt and txt options
-
-If you want to use this method, you can post your transcript online, and then add the URL to the transcript in the **Downloadable Transcript URL** field. However, bear in mind that students will not be able to download .srt or .txt transcripts.
-
-.. _Transcripts in Additional Languages:
-
-====================================
-Transcripts in Additional Languages
-====================================
-
-You can provide transcripts for your video in other languages. To do this,
-you'll work with a third-party service to obtain an .srt transcript file for
-each language, and then associate the .srt file with the video in Studio.
-
-#. After you've obtained the .srt files for additional languages, open the Video component for the video.
-
-#. On the **Advanced** tab, scroll down to **Transcript Languages**, and then
-   click **Add**. 
-
-#. In the drop-down list that appears, select the language for the transcript that you want to add. 
-
-   An **Upload** button appears below the language.
-
-#. Click **Upload**, browse to the .srt file for the language that you want, and then click **Open**.
-
-#. In the **Upload translation** dialog box, click **Upload**.
-
-#. Repeat steps 2 - 5 for any additional languages. 
-
-.. note:: Make sure that all your transcript file names are unique to each video
- and language. If you use the same transcript name in more than one Video
- component, the same transcript will play for each video. To avoid this
- problem, you could name your foreign language transcript files according to
- the video's file name and the transcript language.
-
- For example, you have two videos, named video1.mp4 and video2.mp4. Each video has a Russian transcript and a Spanish transcript. You can name the transcripts for the first video video1_RU.srt and video1_ES.srt, and name the transcripts for the second video video2_RU.srt and video2_ES.srt.
-
-When your students view the video, they can click the **CC** button at the bottom of the video player to select a language.
-
-.. image:: ../Images/Video_LanguageTranscripts_LMS.png
-   :alt: Video playing with language options visible
-
-.. _Steps for sjson files:
-
-**********************
-Steps for .sjson Files
-**********************
-
-If your course uses .sjson files, you'll upload the .sjson file for the video to
-the **Files & Uploads** page, and then specify the name of the .sjson file in
-the Video component.
-
-.. note:: Only older courses that have used .sjson files in the past should use
- .sjson files. All new courses should use .srt files.
-
-#. Obtain the .sjson file from a media company such as 3Play.
-#. Change the name of the .sjson file to use the following format:
-   
-   ``subs_FILENAME.srt.sjson``
-   
-   For example, if the name of your video is **Lecture1a**, the name of your
-   .sjson file must be **subs_Lecture1a.srt.sjson**.
-#. Upload the .sjson file for your video to the **Files & Uploads** page.
-#. Create a new video component.
-#. On the **Basic** tab, enter the name that you want students to see in the
-   **Component Display Name** field.
-#. In the **Video URL** field, enter the URL of the video. For example, the URL
-   may resemble one of the following.
-
-   ::
-   
-      http://youtu.be/OEoXaMPEzfM
-      http://www.youtube.com/watch?v=OEoXaMPEzfM
-      https://s3.amazonaws.com/edx-course-videos/edx-edx101/EDXSPCPJSP13-G030300.mp4
-
-#. Click the **Advanced** tab.
-#. In the **Default Timed Transcript** field, enter the file name of your video. Do
-   not include `subs_` or `.sjson`. For the example in step 2, you would only
-   enter **Lecture1a**.
-#. Set the other options that you want.
-#. Click **Save**.
diff --git a/docs/en_us/course_authors/source/creating_content/index.rst b/docs/en_us/course_authors/source/creating_content/index.rst
deleted file mode 100644
index 6a3cafea0b..0000000000
--- a/docs/en_us/course_authors/source/creating_content/index.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-.. _Creating Course Content Index:
-
-############################
-Creating Course Content
-############################
-
-Use the chapters in this section to understand how to create course content of
-different types.
-
-For information on how to develop your course content in the Studio Outline
-page, see :ref:`Developing Your Course Index`.
-
-For information on creating exercises and tools, see :ref:`Exercises and Tools
-Index`.
-
-.. toctree::
-   :maxdepth: 2
-   
-   create_html_component
-   create_video
-   create_discussion
-   create_problem
diff --git a/docs/en_us/course_authors/source/developing_course/controlling_content_visibility.rst b/docs/en_us/course_authors/source/developing_course/controlling_content_visibility.rst
deleted file mode 100644
index 72616376a1..0000000000
--- a/docs/en_us/course_authors/source/developing_course/controlling_content_visibility.rst
+++ /dev/null
@@ -1,95 +0,0 @@
-.. _Controlling Content Visibility:
-
-###################################
-Controlling Content Visibility
-###################################
-
-As course staff, you must carefully control which content is visible to
-students and when.
-
-You control content visibility through these features in Studio:
-
-* `Release Dates`_
-* `Unit Publishing Status`_
-* `Content Hidden from Students`_
-  
-These features work together to control content visibility for students.
-
-.. _Release Dates:
-
-***********************
-Release Dates
-***********************
-
-You schedule release dates for sections and subsections. By default, a
-subsection inherits the release date of the section it is in, though you can
-change it to another date.
-
-By defining release dates, you can ensure that content is available to students
-as planned without requiring manual intervention at that future time.
-
-Published units are not visible to students until the scheduled release date.
-When the section and subsection have different release dates, published units
-are not visible until both dates have passed.
-
-Prior to the release date, content is visible to course staff
-:ref:`previewing the course <Preview Course Content>` or :ref:`viewing the live
-course as staff<View Your Live Course>`.
-
-See:
-
-* :ref:`Set a Section Release Date`
-* :ref:`Set a Subsection Release Date`
-
-***********************
-Unit Publishing Status
-***********************
-
-You publish units to make them visible to students. Students see the last
-published version of a unit if the section and subsection it is in are
-released.
-
-Students do not see units that have never been published, and they do not see
-unpublished changes to units or components within units.  Therefore, you can
-make changes to units in released subsections without disrupting the student
-experience.
-
-For more information, see :ref:`Unit Publishing Status`.
-
-You can publish all changes in a section or subsection at once, or publish
-changes to individual units.  See:
-
-* :ref:`Publish all Units in a Section`
-* :ref:`Publish all Units in a Subsection`
-* :ref:`Publish a Unit`
-
-
-.. _Content Hidden from Students:
-
-*****************************
-Content Hidden from Students
-*****************************
-
-You can hide content from students. Such content is never visible to students,
-regardless of the release and publishing status.
-
-You might hide a unit from students, for example, when that unit contains an
-answer to a problem in another unit of that subsection. After the problem's due
-date, you could make the unit with the answer visible.
-
-You could also hide a unit from students if you wanted to use that unit to
-provide instructions or guidance meant only for course staff. Only course staff
-would see that unit in the course.
-
-You can hide content at different levels:
-
-* :ref:`Sections<Hide a Section from Students>`
-* :ref:`Subsections<Hide a Subsection from Students>`
-* :ref:`Units<Hide a Unit from Students>`
-
-.. warning::
- When you make a previously hidden section or subsection visible to students,
- not all content in the section or subsection is necessarily made visible to
- students. If you also explicitly set a child subsection or unit to be hidden
- from students, it remains hidden from students. Unpublished units remain
- unpublished, and changes to published units remain unpublished.
diff --git a/docs/en_us/course_authors/source/developing_course/course_components.rst b/docs/en_us/course_authors/source/developing_course/course_components.rst
deleted file mode 100644
index aa6428bbe0..0000000000
--- a/docs/en_us/course_authors/source/developing_course/course_components.rst
+++ /dev/null
@@ -1,330 +0,0 @@
-.. _Developing Course Components:
-
-###################################
-Developing Course Components
-###################################
-
-This chapter describes how you develop course components. See:
-
-* `What is a Component?`_
-* `Add a Component`_
-* `Edit a Component`_
-* `Duplicate a Component`_
-* `Delete a Component`_
-* `Components that Contain Other Components`_
-
-For more information about specific component types, see:
-
-* :ref:`Creating Course Content Index`
-* :ref:`Exercises and Tools Index`
-
-********************
-What is a Component?
-********************
-
-A component is the part of a unit that contains your actual course content. A
-unit can contain one or more components.
-
-A student can view the name of all components in a unit by hovering over the
-unit in the ribbon at the top of the page.
-
-.. image:: ../Images/ComponentNames_CourseRibbon.png
- :alt: Image of the component list for a unit
-
-By default, Studio includes four types of components.
-
-* **Discussion components** provide discussion spaces in the body of your
-  course. Students can explore ideas about a lesson with their peers in a
-  discussion space.
-* **HTML components** allow you to add text, images, and some types of learning
-  tools to your course. Content in HTML components is formatted as HTML.
-* **Problem components** enable you to add many different types of exercises
-  and problems to you course, from simple multiple choice problems to complex
-  circuit schematic exercises.
-* **Video components** contain the videos that you want to include in your
-  course.
-
-.. _Add a Component:
-
-********************
-Add a Component
-********************
-
-To add a component to the unit, click the component type that you want under
-**Add New Component**.
-
-.. image:: ../Images/AddNewComponent.png
-  :alt: Image of adding a new component
-
-For more information, see the documentation for the specific component type
-that you want:
-
-- :ref:`Working with Discussion Components`
-- :ref:`Working with HTML Components`
-- :ref:`Working with Problem Components`
-- :ref:`Working with Video Components`
-  
-After you add a component, it is not visible to students until you
-:ref:`publish the unit<Publish a Unit>`.
-
-.. _Edit a Component:
-
-********************
-Edit a Component
-********************
-
-To edit a component, click **Edit**:
-
-.. image:: ../Images/unit-edit.png
-  :alt: Image of a unit with Edit icon circled
-
-Then follow instructions for the type of component you are editing.
-
-After you edit a component, the changes are not visible to students until you
-:ref:`publish the unit<Publish a Unit>`.
-
-=====================================
-Set the Display Name for a Component
-=====================================
-
-Each component has a display name that shows in the component header when you
-can edit the component. The display name also shows to students when they hover
-the cursor over the unit icon in the course ribbon.
-
-To set the display name for a component:
-
-#. Edit the component.
-#. Click **Settings**.
-#. Edit the **Display Name** field.
-
-  .. image:: ../Images/display-name.png
-   :alt: Image of the Display Name field for a component.
-
-4. Click **Save**.
-
-Different types of components have different fields in the Settings dialog box,
-but all have the **Display Name** field.
-
-.. _Duplicate a Component:
-
-**********************
-Duplicate a Component
-**********************
-
-When you duplicate a component, a new copy of that component is added directly
-beneath the first component. You can then modify the duplicate. In many cases,
-duplicating a component and editing a copy is a faster way to create new
-content.
-
-To duplicate a component, click the Duplicate icon in the component header:
-
-.. image:: ../Images/unit-dup.png
-  :alt: Image of a unit with Duplicate icon circled
-
-Then follow instructions for the type of component you are editing.
-
-After you duplicate a component, the new component is not visible to students
-until you :ref:`publish the unit<Publish a Unit>`.
-
-.. note::  You cannot duplicate a content experiment.
-
-.. _Delete a Component:
-
-**********************
-Delete a Component
-**********************
-
-.. caution:: 
- Be sure you want to delete the component. You can not undo the deletion.
-
-To delete a component:
-
-#. Click the Delete icon in the component header:
-
-.. image:: ../Images/unit-delete.png
-  :alt: Image of a unit with Delete icon circled
-
-2. When you receive the confirmation prompt, click **Yes, delete this
-   component**.
-
-After you delete a component, the component remians visible to students until you :ref:`publish the unit<Publish a Unit>`.
-
-.. _Components that Contain Other Components:
-
-******************************************
-Components that Contain Other Components
-******************************************
-
-For specific use cases, you configure course content so that components contain
-other components.  For example, if you want to include conditional components
-or content experiments, you have to create components inside components. See
-:ref:`Creating Content Experiments` for more information.
-
-The component that contains other components is referred to as the *parent*;
-the contained components are referred to as *children*.
-
-In the unit page, a parent component appears with the display name and a
-**View** link. For example:
-
-.. image:: ../Images/component_container.png
- :alt: Image of a unit page with a parent component
-
-
-==================================================
-Edit a Parent Component
-==================================================
-
-A parent component does not directly contain content. Content such as HTML,
-videos, or problems are in the child components.
-
-A parent component has a display name. When the unit is private or in draft,
-click **Edit** in the parent component to change the display name.
-
-.. note:: 
-  Parent components of a specific type, such as content experiments, have
-  additional attributes that you edit.
-
-
-======================================
-View Child Components
-======================================
-
-When you click **View** in the parent component, the parent component page
-opens, showing all child components. In this example, Child Component A
-contains an HTML component and a video:
-
-.. image:: ../Images/child-components-a.png
- :alt: Image of an expanded child component
-
-Click the arrow next to a child component name to collapse it and hide the
-component's contents:
-
-.. image:: ../Images/child-components.png
- :alt: Image of a child component page
-
-Click the arrow again to expand the component.
-
-See:
-
-* `Edit a Component`_
-* `Set the Display Name for a Component`_
-* `Duplicate a Component`_
-* `Delete a Component`_
-
-======================================
-Add a Child Component
-======================================
-
-If the containing unit is private or in draft, you can add a child component in
-its parent component.
-
-To add a child component, open and expand the parent component. Then click the
-component type that you want under **Add New Component** within the parent
-component.
-
-.. image:: ../Images/AddNewComponent.png
-  :alt: Image of adding a new component
-
-For more information, see the documentation for the specific component type
-that you want:
-
-- :ref:`Working with Discussion Components`
-- :ref:`Working with HTML Components`
-- :ref:`Working with Problem Components`
-- :ref:`Working with Video Components`
-
-
-======================================
-XML for Parent and Child Components
-======================================
-
-You develop parent and child components in XML, then import the XML course into
-Studio to verify that the structure is as you intended. 
-
-For more information about working with your course's XML files, including
-information about terminology, see the `edX XML Tutorial <http://edx.readthedoc
-s.org/projects/devdata/en/latest/course_data_formats/course_xml.html>`_.
-
-The following examples show the XML used to create the unit and components
-shown in Studio above.
-
-The XML for the unit is:
-
-.. code-block:: xml
-
-    <vertical display_name="Unit 1">
-        <html url_name="6a5cf0ea41a54b209e0815147896d1b2"/>
-        <vertical url_name="131a499ddaa3474194c1aa2eced34455"/>
-    </vertical>
-
-The ``<vertical url_name="131a499ddaa3474194c1aa2eced34455"/>`` element above
-references the parent component file that contains the child components:
- 
-.. code-block:: xml
-
-    <vertical display_name="Parent Component">
-        <vertical url_name="2758bbc495dd40d59050da15b40bd9a5"/>
-        <vertical url_name="c5c8b27c2c5546e784432f3b2b6cf2ea"/>
-    </vertical>
-
-The two verticals referenced by the parent component refer to the child
-components, which contain the actual content of your course:
-
-.. code-block:: xml
-
-    <vertical display_name="Child Component A">
-        <html url_name="4471618afafb45bfb86cbe511973e225"/>
-        <video url_name="fbd800d0bdbd4cb69ac70c47c9f699e1"/>
-    </vertical>
-
-.. code-block:: xml
-
-    <vertical display_name="Child Component B">
-        <html url_name="dd6ef295fda74a639842e1a49c66b2c7"/>
-        <problem url_name="b40ecbe4ed1b4280ae93e2a158edae6f"/>
-    </vertical>
-
-Theoretically, there is no limit to the levels of component nesting you can use
-in your course.
-
-
-======================================
-The Student View of Nested Components
-======================================
-
-For students, all parent and child components are displayed on the unit page.
-The following example shows the student view of the unit described above:
-
-.. image:: ../Images/nested_components_student_view.png
- :alt: Image of the student's view of nested components
-
-.. note:: The visibility of nested components depends on the visibility of 
- the parent unit. The parent unit must be public for students to see nested
- components. For more information, see :ref:`Unit Publishing Status`.
-
-
-*******************************
-Reorganizing Child Components
-*******************************
-
-You can reorganize child components through the same drag and drop process you
-use for other objects in your course outline. You hover over the element handle
-on the right side of the screen until the mouse pointer changes to a four-
-headed arrow. Then, click and drag the element to the location that you want.
-
-Furthermore, when you have multiple levels of nesting, you can drag a child
-component into a different parent component, if both parents are expanded. For
-example, you can select the video component that is in Child Component A and
-drag it into Child Component B. Select the video component, and as you drag it
-into Child Component B, release the mouse button when a dashed outline of the
-component you are moving appears in the new location:
-
-.. image:: ../Images/drag_child_component.png
- :alt: Image of dragging a child component to a new location
-
-You can also drag a child component outside of a parent, so that the child
-moves to the same level as the parent.
-
-.. note:: 
-  For content experiments, you cannot drag a child component outside of a test
-  group.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/developing_course/course_outline.rst b/docs/en_us/course_authors/source/developing_course/course_outline.rst
deleted file mode 100644
index a065fa99ad..0000000000
--- a/docs/en_us/course_authors/source/developing_course/course_outline.rst
+++ /dev/null
@@ -1,246 +0,0 @@
-.. _Developing Your Course Outline:
-
-###################################
-Developing Your Course Outline
-###################################
-
-As you develop your course, you work primarily in the edX Studio course
-outline.  This chapter includes the following information about working with
-the course outline:
-
-* `Open the Course Outline`_
-* `Example of a Developed Course in the Outline`_
-* `View the Course Organization as a Student`_
-* `Navigate the Course Outline`_
-* `Add Content in the Course Outline`_
-* `Modify Settings for Objects in the Course Outline`_
-* `Publish Content from the Course Outline`_
-* `Reorganize the Course Outline`_
-* `Delete Content in the Course Outline`_
-  
-See the following chapters for information about working with the course
-building blocks in the course outline:
-
-* :ref:`Developing Course Sections`
-* :ref:`Developing Course Subsections`
-* :ref:`Developing Course Units`
-* :ref:`Developing Course Components`
-
-****************************
-Open the Course Outline
-****************************
-
-To view the course outline:
-
-#. Log in to edX Studio.
-#. In the **My Courses** page, select the course you want to develop.
-
-   The course outline opens by default when you open a course.
-
-When working in a course, to open the outline, from the **Content** menu,
-select **Outline**.
-   
-The first time you view an outline for a course, it contains no content. 
-
-.. image:: ../Images/outline_empty.png
- :alt: An empty course outline
-
-You must :ref:`create the first section<Create a Section>`.
-  
-********************************************************
-Example of a Developed Course in the Outline
-********************************************************
-
-The following example shows a sample course in the outline, with indications
-for sections, subsections, and units. As you develop your course, it will begin
-to look like this example:
-
-.. image:: ../Images/outline-callouts.png
- :alt: An outline with callouts for sections, subsections, and units
-
-As this example shows, the course is organized into the following levels:
-
-#. :ref:`Sections<Developing Course Sections>`
-#. :ref:`Subsections<Developing Course Subsections>`
-#. :ref:`Units<Developing Course Units>`
-
-:ref:`Components<Developing Course Components>` are not shown in the outline. You add or access components by clicking on the units that contain them.
-  
-Use the links above for more information and instructions on working with each
-type of object in the course. The rest of this chapter provides more detail
-about the course outline.
-
-********************************************************
-View the Course Organization as a Student
-********************************************************
-
-The content you see in the outline in Studio is displayed to students in the
-Courseware tab in the LMS. The following image shows how a student sees your
-course content:
-
-.. image:: ../Images/Course_Outline_LMS.png
- :alt: Image of course conent from student's point of view
-
-.. _Navigating the Course Outline:
-
-*******************************
-Navigate the Course Outline
-*******************************
-
-In Studio, you navigate the course outline by expanding and collapsing sections
-and subsections.  Use the drop-down icon next to a section or subsection name
-to expand or collapse its contents:
-
-.. image:: ../Images/outline-expand-collapse.png
- :alt: The outline with expand and collapse icons circled
-
-When you expand a subsection, all units in the subsection are visible:
-
-.. image:: ../Images/outline-with-units.png
- :alt: The outline with an expanded subsection
-
-Click the name of a unit to open the :ref:`unit page<Developing Course Units>`.
-
-.. _Add Content in the Course Outline:
-
-************************************************
-Add Content in the Course Outline
-************************************************
-
-You add sections, subsections, and units directly in the outline.
-
-To add a section to the end of the outline, click **New Section** at the top of
-the outline page or at the bottom of the outline:
-
-.. image:: ../Images/outline-create-section.png
- :alt: The outline with the New Section buttons circled
-
-To add a subsection to the end of the section, expand the section and click
-**New Subsection**:
-
-.. image:: ../Images/outline-new-subsection.png
- :alt: The outline with the New Subsection button circled
-
-To add a unit to the end of a subsection, expand the subsection and click **New
-Unit**:
-
-.. image:: ../Images/outline-new-unit.png
- :alt: The outline with the New Subsection button circled
-
-The :ref:`unit<Developing Course Units>` page opens.
-
-
-.. _Modify Settings for Objects in the Course Outline:
-
-***************************************************
-Modify Settings for Objects in the Course Outline
-***************************************************
-
-You modify settings for sections, subsections, and units in the course outline.
-Specifically, you can complete the following tasks:
-
-* :ref:`Set a Section Release Date`
-* :ref:`Hide a Section from Students`
-* :ref:`Set a Subsection Release Date`
-* :ref:`Set the Assignment Type and Due Date for a Subsection`
-* :ref:`Hide a Subsection from Students`
-* :ref:`Hide a Unit from Students`
-
-To modify settings for a section, subsection, or unit, click the settings icon
-for that object. In the following example, the settings icon is circled for a
-section, a subsection, and two units:
-
-.. image:: ../Images/settings-icons.png
- :alt: Settings icons in the course outline
-
-For more information, see the links above.
-
-
-.. _Publish Content from the Course Outline:
-
-************************************************
-Publish Content from the Course Outline
-************************************************
-
-You can publish new and changed units for an entire section or subsection. You
-can also publish individual units.
-
-To publish new and changed units, click the publish icon for a section,
-subsection, or unit. In the following example, the publish icon is circled for
-a section, subsection, and unit:
-
-.. image:: ../Images/outline-publish-icons.png
- :alt: Publishing icons in the course outline
-
-.. note:: 
- The publish icon only appears when there is new or changed content within the
- object.
-
-For more information, see:
-
-* :ref:`Unit Publishing Status`
-* :ref:`Publish all Units in a Section`
-* :ref:`Publish all Units in a Subsection`
-* :ref:`Publish a Unit`
-
-.. _Reorganize the Course Outline:
-
-************************************************
-Reorganize the Course Outline
-************************************************
-
-You can reorganize your course content by dragging and dropping sections,
-subsections, and units to new locations in the outline.
-
-To move a section, subsection, or unit, hover over the handle on the right of
-the object's box until the cursor changes to a four-headed arrow. For example,
-in the image below, the handle for the subsection Lesson 1 - Getting Started is
-selected:
-
-.. image:: ../Images/outline-drag-select.png
- :alt: A subsection handle selected to drag it
-
-Then, click and drag the object to the location that you want. 
-
-If you expanded the section or subsection you are moving the object to, when
-you move the object, a blue line indicates where the object will land when you
-release the mouse button. For example, in the image below, the subsection
-Lesson 1 - Getting Started is being moved to the end of the section
-Introduction:
-
-.. image:: ../Images/outline-drag-new-location.png
- :alt: A subsection being dragged to a new section 	
-
-If you did not expand the section or subsection you are moving the object to,
-the outline of that section or subsection turns blue when you have moved the
-object to a valid location. You can then release the mouse button. For example,
-in the image below, the subsection Lesson 1 - Getting Started is being moved to
-the collapsed section Introduction:
-
-.. image:: ../Images/outline-drag-new-location-collapsed.png
- :alt: A subsection being dragged to a new section 
-
-.. _Delete Content in the Course Outline:
-
-************************************************
-Delete Content in the Course Outline
-************************************************
-
-You delete sections, subsections, and units from the course outline.
-
-.. warning::  
- You cannot restore course content after you delete it. To ensure you do not
- delete content you may need later, you can move any unused content to a
- section in your course that you set to never release.
-
-Click the delete icon in the box for the object you want to delete:
-
-.. image:: ../Images/outline-delete.png
- :alt: The outline with Delete icons circled
-
-You are prompted to confirm the deletion.
-
-.. note::
- When you delete an object, all objects that it contains are deleted. For
- example, when you delete a subsection, all units in that subsection are
- deleted.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/developing_course/course_sections.rst b/docs/en_us/course_authors/source/developing_course/course_sections.rst
deleted file mode 100644
index 0417ad3808..0000000000
--- a/docs/en_us/course_authors/source/developing_course/course_sections.rst
+++ /dev/null
@@ -1,313 +0,0 @@
-.. _Developing Course Sections:
-
-###################################
-Developing Course Sections
-###################################
-
-To develop sections in your course, you must first understand the following:
-
-* `What is a Section?`_
-* `Viewing Sections in the Outline`_
-* `The Student View of a Section`_
-* `Sections and Visibility to Students`_
-* `Release Statuses of Sections`_
-
-  
-Section tasks:
-
-* `Create a Section`_
-* `Change a Section Name`_
-* `Set a Section Release Date`_
-* `Publish all Units in a Section`_
-* `Hide a Section from Students`_
-* `Delete a Section`_
-
-
-****************************
-What Is a Section?
-****************************
-
-A section is the topmost category in your course. A section can represent a
-time period in your course, a chapter, or another organizing principle. A
-section contains one or more subsections.
-
-********************************
-Viewing Sections in the Outline
-********************************
-
-The follow example shows four sections, all collapsed, in the course outline:
-
-.. image:: ../Images/sections-outline.png
- :alt: Four sections in the outline
-
-******************************
-The Student View of a Section
-******************************
-
-Students see sections in the **Courseware** tab. Students can expand one
-section at a time to see its contents. In the following example, three sections
-are circled, and the third one is expanded to show its subsections:
-
-.. image:: ../Images/sections_student.png
- :alt: The students view of the course with two sections circled
-
-************************************************
-Sections and Visibility to Students
-************************************************
-
-Students cannot see any content in the section if the section's release date is
-unscheduled or has not passed.
-
-If a section's release date has passed, students can see content in the section
-if:
-
-* The release date for the subsection that contains that content has passed.
-* The unit has been published.
-* The unit is not hidden from students.
-
-************************************************
-Release Statuses of Sections
-************************************************
-
-As an course author, you control the release status of sections.  For the
-content of a section to be visible to students, the section must be released.
-See the following for more information about the possible releases statuses of
-sections:
-
-* `Unscheduled`_
-* `Scheduled`_
-* `Released`_
-* `Released with Unpublished Changes`_
-* `Staff Only Content`_
-
-========================
-Unscheduled
-========================
-
-If you do not change the :ref:`course start date<The Course Start Date>`
-default value, ``1/1/2030 00:00:00 UTC``, when you create a new section, its
-release date will appear as ``Unscheduled``. When the section release date is
-unscheduled, students cannot see any content in that section, regardless of
-the publishing status of that content.
-
-If you have modified the course start date, when you create a new section, the
-default release date is the course start date.
-
-The following example shows how an unscheduled section is displayed in the
-outline, summarized with a gray bar:
-
-.. image:: ../Images/section-unscheduled.png
- :alt: An unscheduled section
-
-To make the content available to students, you must schedule the release date.
-
-==========
-Scheduled
-==========
-
-A section that is scheduled for release on a future date will not be visible to
-students until after the release date. Regardless of the publishing status of
-content within the section, the entire section will not visible to students.
-
-The following example shows how a section that is scheduled for release is
-displayed in the outline, summarized with a green bar:
-
-.. image:: ../Images/section-future.png
- :alt: An section scheduled to release in the future
-
-The scheduled date must pass for the section to be visible to students.
-
-===========================
-Released
-===========================
-
-A section that is released is visible to students; however, students see only
-subsections within the section that are also released, and units that are
-published.
-
-The following example shows how a released section is displayed in the outline,
-summarized with a blue bar:
-
-.. image:: ../Images/section-released.png
- :alt: An unscheduled section
-
-==================================
-Released with Unpublished Changes
-==================================
-
-If you change a unit in a released section but do not publish the changes,
-students see the last published version of the modified unit.
-
-The following example shows how a released section with unpublished changes is
-displayed in the outline, with a yellow bar. The section is expanded to show
-the unit with unpublished changes:
-
-.. image:: ../Images/section-unpublished-changes.png
- :alt: A section with unpublished changes
-
-You must publish the unit for students to see the updates.
-
-===========================
-Staff Only Content
-===========================
-
-A section can contain a unit that is hidden from students and available to
-staff only. That unit is not visible to students, regardless of the release
-date of the section or subsection.
-
-The following example shows how a section that contains a unit that is hidden
-from students is displayed in the outline, summarized with a black bar:
-
-.. image:: ../Images/section-hidden-unit.png
- :alt: A section with a hidden unit 
-
-
-.. _Create a Section:
-
-****************************
-Create a Section
-****************************
-
-If you do not change the :ref:`course start date<The Course Start Date>`
-default value, ``1/1/2030``, when you create a new section, its release date
-will be ``Unscheduled``. 
-
-If you have modified the course start date, when you create a new section, the
-default release date is the course start date.
-
-.. caution:: 
- If the course start date is in the past, newly created sections are
- immediately visible to students.
-
-To create a new section:
-
-#. Click **New Section** at the top or bottom of the outline: 
-   
-   .. image:: ../Images/outline-create-section.png
-     :alt: The outline with the New Section buttons circled
-
-   A new section is added at the end of the course content, with the section
-   name selected.
-
-#. Enter the name for the new section. Remember that students see the section
-   name in the courseware.
-
-#. :ref:`Add subsections<Create a Subsection>` to the new section as needed.
-   
-It is recommended that you :ref:`test course content <Testing Your Course
-Content>` as you create new sections.
-
-********************************
-Change a Section Name
-********************************
-
-To edit a section name, hover over the section name to show the Edit icon:
-
-.. image:: ../Images/section-edit-icon.png
-  :alt: The Edit Section Name icon
-
-Click the Edit icon next to the section name. The name field becomes editable.
-Enter the new name and tab or click out of the field to save the name.
-
-.. _Set a Section Release Date:
-
-********************************
-Set a Section Release Date
-********************************
-
-To set the section release date:
-
-#. Click the Settings icon in the section box:
-   
-   .. image:: ../Images/section-settings-box.png
-    :alt: The section settings icon circled
-
-   The **Settings** dialog box opens.
-
-#. Enter the release date and time for the section:
-   
-   .. image:: ../Images/section-settings-release-date.png
-    :alt: The section release date settings
-
-#. Click **Save**.
-
-For more information, see :ref:`Release Dates`.
-
-.. _Publish all Units in a Section:
-
-********************************
-Publish all Units in a Section
-********************************
-
-To publish all new and changed units in a section, click the publish icon in
-the box for the section:
-
-.. image:: ../Images/outline-publish-icon-section.png
- :alt: Publishing icon for a section
-
-.. note:: 
- The publish icon only appears when there is new or changed content within the
- section.
-
-See :ref:`Unit Publishing Status` for information about statuses and visibility
-to students.
-
-
-.. _Hide a Section from Students:
-
-********************************
-Hide a Section from Students
-********************************
-
-You can hide all content in a section from students, regardless of the status
-of subsections and units within the section.
-
-To hide a section from students:
-
-#. Click the Settings icon in the section box:
-   
-   .. image:: ../Images/section-settings-box.png
-    :alt: The section settings icon circled
-
-   The **Settings** dialog box opens.
-
-#. Check **Hide from students**.
-
-   .. image:: ../Images/section-settings-hide.png
-    :alt: The section hide from students setting
-
-#. Click **Save**.
-
-Now, no content in the section is visible to students.
-
-To make the section visible to students, repeat these steps and clear the
-**Hide from students** checkbox.
-
-.. warning::
- When you clear the **Hide from students** checkbox for a section, not all
- content in the section is necessarily made visible to students. If you
- explicitly set a subsection or unit to be hidden from students, it remains
- hidden from students. Unpublished units remain unpublished, and changes to
- published units remain unpublished.
-
-********************************
-Delete a Section
-********************************
-
-When you delete a section, you delete all subsections and units within the
-section.
-
-.. warning::  
- You cannot restore course content after you delete it. To ensure you do not
- delete content you may need later, you can move any unused content to a
- section in your course that you set to never release.
-
-To delete a section:
-
-#. Click the delete icon in the section that you want to delete:
-
-  .. image:: ../Images/section-delete.png
-   :alt: The section with Delete icon circled
-
-2. When you receive the confirmation prompt, click **Yes, delete this
-   section**.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/developing_course/course_subsections.rst b/docs/en_us/course_authors/source/developing_course/course_subsections.rst
deleted file mode 100644
index c8e1ad864b..0000000000
--- a/docs/en_us/course_authors/source/developing_course/course_subsections.rst
+++ /dev/null
@@ -1,361 +0,0 @@
-.. _Developing Course Subsections:
-
-###################################
-Developing Course Subsections
-###################################
-
-To develop subsections in your course, you must first understand the
-following:
-
-* `What is a Subsection?`_
-* `Viewing Subsections in the Outline`_
-* `The Student View of a Subsection`_
-* `Subsections and Visibility to Students`_
-* `Release Statuses of Subsections`_
-  
-Subsection tasks:
-
-* `Create a Subsection`_
-* `Change a Subsection Name`_
-* `Set a Subsection Release Date`_
-* `Set the Assignment Type and Due Date for a Subsection`_
-* `Publish all Units in a Subsection`_
-* `Hide a Subsection from Students`_
-* `Delete a Subsection`_
-
-
-****************************
-What Is a Subsection?
-****************************
-
-Sections are divided into subsections, which in turn contain one or more units.
-A subsection may represent a topic in your course, or another organizing
-principle. Subsections are sometimes called “lessons” or “learning sequences.”
-
-
-***********************************
-Viewing Subsections in the Outline
-***********************************
-
-The following example shows three subsections in a section, all collapsed, in
-the course outline:
-
-.. image:: ../Images/subsections.png
- :alt: Three collapsed subsections in the outline
-
-
-*********************************
-The Student View of a Subsection
-*********************************
-
-Students see subsections in the Courseware tab, listed beneath the expanded
-section. In the following example, seven subsections are circled, and the first
-is open.
-
-.. image:: ../Images/subsections_student.png
- :alt: The student view of the outline
-
-
-************************************************
-Subsections and Visibility to Students
-************************************************
-
-Students cannot see any content in a subsection if the subsection's release
-date is unscheduled or has not passed.
-
-If a subsection's release date has passed, students can see content in the
-subsection if the following three conditions are met:
-
-* The release date of the parent section has passed.
-* The units have been published.
-* The units are not hidden from students.
-
-************************************************
-Release Statuses of Subsections
-************************************************
-
-As a course author, you control the release status of subsections.  For the
-content of a subsection to be visible to students, the subsection must be
-released. See the following for more information about the possible releases
-statuses of subsections:
-
-* `Scheduled with the Section`_
-* `Unscheduled`_
-* `Scheduled Later than the Section`_
-* `Scheduled with Unpublished Changes`_
-* `Released with Unpublished Changes`_
-* `Released`_
-
-==========================
-Scheduled with the Section
-==========================
-
-When you create a subsection, it is set by default to release at the same time
-as the section it is in. Therefore, published content in the subsection is
-visible to students at the date and time the section is released.
-
-The following example shows how an subsection in the Scheduled with Section
-state is displayed in the outline, summarized with a green bar:
-
-.. image:: ../Images/subsection-scheduled.png
- :alt: A subsection scheduled to release with the section
-
-
-========================
-Unscheduled
-========================
-
-If the parent section is unscheduled, when you create a new subsection it
-will also be unscheduled.
-
-Regardless of the publishing status of units within the subsection, no content
-in an unscheduled subsection is visible to students.
-
-The following example shows how an unscheduled subsection is displayed in the
-outline, summarized with a gray bar:
-
-.. image:: ../Images/subsection-unscheduled.png
- :alt: An unscheduled subsection
-
-Content in the subsection is not visible to students until you set a release
-date and the date passes.
-
-
-===================================
-Scheduled Later than the Section
-===================================
-
-You can set a subsection to release on a date after the section releases. 
-
-Content in a subsection that is scheduled for release on a future date is not
-visible to students, even if some or all of the units in the subsection are
-published.
-
-The following example shows the way that a subsection that will release after
-its parent subsection appears in the course outline:
-
-.. image:: ../Images/subsection-scheduled-different.png
- :alt: A subsection scheduled to release later than the section
-
-The scheduled date must pass for the subsection to be visible to students.
-
-==================================
-Scheduled with Unpublished Changes
-==================================
-
-You can make changes to a published unit before its parent subsection
-is released. 
-
-In this situation, when the release date for the subsection passes, the last
-published version of units within the subsection are made visible to students.
-The changes in units are not visible to students until you publish them.
-
-The following example shows how a scheduled subsection with unpublished changes
-is displayed in the outline, summarized with a yellow bar:
-
-.. image:: ../Images/section-scheduled-with-changes.png
- :alt: A scheduled subsection with unpublished changes
-
-
-==================================
-Released with Unpublished Changes
-==================================
-
-If you modify a unit within a released subsection, those modifications are not
-visible to students until you publish them.
-
-The following example shows how a released section that has unpublished changes
-appears in the outline, summarized with a yellow bar:
-
-.. image:: ../Images/section-released-with-changes.png
- :alt: A released subsection with unpublished changes
-
-===========================
-Released
-===========================
-
-A subsection that is released is visible to students; however, students see
-only units within the subsection that are published.
-
-The following example shows how a released subsection is displayed in the
-outline, summarized with a blue bar:
-
-.. image:: ../Images/subsection-released.png
- :alt: A released subsection
-
-===========================
-Staff Only Content
-===========================
-
-A subsection can contain a unit that is hidden from students and available to
-staff only. That unit is not visible to students, even if the subsection has
-been released.
-
-The following example shows how an subsection that contains a unit that is
-hidden from students is displayed in the outline, summarized with a black bar:
-
-.. image:: ../Images/section-hidden-unit.png
- :alt: A section with a hidden unit 
-
-.. _Create a Subsection:
-
-****************************
-Create a Subsection
-****************************
-
-To create a new subsection:
-
-#. In the outline, expand the section in which you want to create a new
-   subsection.
-#. Click **New Subsection** at the bottom of the expanded section. A new
-   subsection is added at the end of the section, with the subsection name
-   selected.
-#. Enter the name for the new subsection. Remember that students see the
-   subsection name in the courseware.
-#. :ref:`Add units<Create a Unit>` to the new subsection as needed.
-   
-It is recommended that you :ref:`test course content <Testing Your Course
-Content>` as you create new subsections.
-
-********************************
-Change a Subsection Name
-********************************
-
-To change a subsection name, click the Edit icon next to the subsection name.
-The name field becomes editable. Enter the new name and tab or click out of the
-field to save the name.
-
-.. _Set a Subsection Release Date:
-
-********************************
-Set a Subsection Release Date
-********************************
-
-To set the subsection release date:
-
-#. Click the Settings icon in the subsection box:
-   
-   .. image:: ../Images/subsections-settings-icon.png
-    :alt: The subsection settings icon circled
-
-   The **Settings** dialog box opens.
-
-#. Enter the release date and time for the section:
-
-   .. image:: ../Images/subsection-settings-release.png
-    :alt: The subsection release date settings
-
-#. Click **Save**.
-
-For more information, see :ref:`Release Dates`.
-
-.. _Set the Assignment Type and Due Date for a Subsection:
-
-********************************************************
-Set the Assignment Type and Due Date for a Subsection
-********************************************************
-
-You set the assignment type for problems at the subsection level. 
-
-When you set the assignment type for a subsection, all problems within the
-subsection are graded and weighted as a single type.  For example, if you
-designate the assignment type for a subsection as **Homework**, then all
-problem types in that subsection are graded as homework.
-
-To set the assignment type and due date for a subsection:
-
-#. Click the Settings icon in the subsection box:
-   
-   .. image:: ../Images/subsections-settings-icon.png
-    :alt: The subsection settings icon circled
-
-   The Settings dialog box opens.
-
-#. Select the assignment type for this subsection in the **Grade as** field:
-   
-   .. image:: ../Images/subsection-settings-grading.png
-    :alt: The subsection settings with the assignment type and due date circled
-
-#. Enter or select a due date and time for problems in this subsection.
-#. Click **Save**.
-
-For more information, see :ref:`Establish a Grading Policy`.
-
-.. _Publish all Units in a Subsection:
-
-**********************************
-Publish all Units in a Subsection
-**********************************
-
-To publish all new and changed units in a subsection, click the publish icon in
-the box for the subsection:
-
-.. image:: ../Images/outline-publish-icon-subsection.png
- :alt: Publishing icon for a subsection
-
-.. note:: 
- The publish icon only appears when there is new or changed content within the
- subsection.
-
-See :ref:`Unit Publishing Status` for information about statuses and visibility
-to students.
-
-.. _Hide a Subsection from Students:
-
-********************************
-Hide a Subsection from Students
-********************************
-
-You can hide all content in a subsection from students, regardless of the
-status of units within the section.
-
-To hide a subsection from students:
-
-#. Click the Settings icon in the subsection box:
-   
-   .. image:: ../Images/subsections-settings-icon.png
-    :alt: The subsection settings icon circled
-
-   The **Settings** dialog box opens.
-
-#. Check **Hide from students**.
-
-   .. image:: ../Images/subsection-settings-hidden.png
-    :alt: The subsection hide from students setting
-
-#. Click **Save**.
-
-Now, no content in the subsection is visible to students.
-
-To make the subection visible to students, repeat these steps and clear the
-**Hide from students** checkbox.
-
-.. warning::
- When you clear the **Hide from students** checkbox for a subsection, not all
- content in the subsection is necessarily made visible to students. If you
- explicitly set a unit to be hidden from students, it remains hidden from
- students. Unpublished units remain unpublished, and changes to published units
- remain unpublished.
-
-.. _Delete a Subsection:
-
-********************************
-Delete a Subsection
-********************************
-
-When you delete a subsection, you delete all units within the subsection.
-
-.. warning::  
- You cannot restore course content after you delete it. To ensure you do not
- delete content you may need later, you can move any unused content to a
- section in your course that you set to never release.
-
-To delete a subsection:
-
-#. Click the delete icon in the subsection that you want to delete:
-
-  .. image:: ../Images/subsection-delete.png
-   :alt: The subsection with Delete icon circled
-
-2. When you receive the confirmation prompt, click **Yes, delete this
-   subsection**.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/developing_course/course_units.rst b/docs/en_us/course_authors/source/developing_course/course_units.rst
deleted file mode 100644
index 9909a9887e..0000000000
--- a/docs/en_us/course_authors/source/developing_course/course_units.rst
+++ /dev/null
@@ -1,523 +0,0 @@
-.. _Developing Course Units:
-
-###################################
-Developing Course Units
-###################################
-
-When working with units in the course outline, ensure you understand the
-following:
-
-* `What is a Unit?`_
-* `Viewing Units in the Outline`_
-* `Viewing the Unit Page`_
-* `Viewing Units as a Student`_
-* `Unit Publishing Status and Visibility to Students`_
-* `Unit Publishing Status`_
-
-When developing your course, you perform the following tasks with units:
-
-* `Create a Unit`_
-* `Edit a Unit`_
-* `Preview a Unit`_
-* `Publish a Unit`_
-* `Discard Changes to a Unit`_
-* `View a Published Unit`_
-* `Hide a Unit from Students`_
-* `Delete a Unit`_
-
-You add content to units with :ref:`course components<Developing Course
-Components>`.
-
-.. _What is a Unit?:
-
-****************************
-What is a Unit?
-****************************
-
-A unit is a part of a :ref:`subsection<Developing Course Subsections>` that
-students view as a single page.
-
-A unit contains one or more :ref:`components<Developing Course Components>`,
-such as :ref:`HTML content<Working with HTML Components>`,
-:ref:`problems<Working with Problem Components>`, :ref:`discussions<Working
-with Discussion Components>`, and
-:ref:`videos<Working with Video Components>`.
-
-****************************
-Viewing Units in the Outline
-****************************
-
-To view units in the outline, you :ref:`expand<Navigating the Course Outline>`
-the parent section and subsection:
-
-.. image:: ../Images/outline-callouts.png
- :alt: An outline with callouts for sections, subsections, and units
-
-****************************
-Viewing the Unit Page
-****************************
-
-When you click on a unit name in the outline, the **Unit** page opens.
-
-The following example shows a unit page with two components, with circles and
-text to show different areas and controls in the page.
-
-.. image:: ../Images/unit-page.png
- :alt: The Unit page
-
-****************************
-Viewing Units as a Student 
-****************************
-
-To a student using the edX Learning Management System, each unit in the
-subsection appears as a link on the course ribbon at the top of the page. The
-active unit is open beneath the course ribbon.
-
-The following image shows a subsection that has five units, which are circled
-in the ribbon above the video, with the first unit open:
-
-.. image:: ../Images/Units_LMS.png
- :alt: Image of units from the student's point of view
-
-.. _The Unit Workflow:
-
-************************************************
-The Unit Workflow
-************************************************
-
-When you have set up the :ref:`section<Developing Course Sections>` and
-:ref:`subsection<Developing Course Subsections>` in the course outline, you
-then work with units.
-
-The typical workflow is:
-
-#. :ref:`Create a new unit<Create a Unit>`.
-#. :ref:`Add components to the unit<Add a Component>`.
-#. :ref:`Publish the unit<Publish a Unit>`.
-   
-After you publish the unit, you can:
-
-#. :ref:`Modify components in the unit<Developing Course Components>`.
-#. :ref:`Publish the changes to the unit<Publish a Unit>`.
-   
-The following diagram shows the typical unit development workflow:
-
-.. image:: ../Images/workflow-create-unit.png
- :alt: Diagram of the unit development workflow
-   
-As you work through these steps, the **publishing status** of the unit changes.
-The publishing status controls the content available to students, along with
-:ref:`release dates<Release Dates>`. See the next section for more information.
-
-.. _Unit States and Visibility to Students:
-
-*************************************************
-Unit Publishing Status and Visibility to Students
-*************************************************
-
-The following information summarizes whether or not students can see a unit.
-
-* Students never see a unit with the publishing status `Draft (Never
-  Published)`_.
-
-* Students never see a unit with the publishing status `Visible to Staff
-  Only`_. See `Hide a Unit from Students`_ for more information.
-
-* Students do not see a unit with the publishing status `Published Not Yet
-  Released`_ until the :ref:`release date <Release Dates>`. On the release
-  date, the status changes to `Published and Live`_.
-
-* If the publishing status is `Published and Live`_, students see the current
-  version of the unit.
-  
-* If the publishing status is `Draft (Unpublished Changes)`_, students see the
-  last published version of the unit if the :ref:`release date <Release Dates>`
-  for the containing section and subsection has passed.
-
-For more information, see :ref:`Controlling Content Visibility`.
-
-.. _Unit Publishing Status:
-
-************************************************
-Unit Publishing Status
-************************************************ 
-
-As an course author, you work with units with the following statuses:
-
-* `Draft (Never published)`_
-* `Published and Live`_
-* `Published (not yet released)`_
-* `Draft (Unpublished changes)`_
-* `Visible to Staff Only`_
-
-.. _Draft (Never Published):
-
-========================
-Draft (Never published)
-========================
-
-When you create a new unit and add components to it, the unit's publishing
-status is **Draft (Never Published)**, as shown in the status panel:
-
-.. image:: ../Images/unit-never-published.png
- :alt: Status panel of a unit that has never been published
-
-In Studio, you see the version of the content that you're working on. Students
-never see a unit with this status, even if the release date has passed.
-
-Though you do not see the unit in the LMS, you can :ref:`preview the
-unit<Preview Course Content>`.
-
-You must :ref:`publish the unit<Publish a Unit>` for it to be included in the
-LMS.
-
-.. _Published and Live:
-
-====================
-Published and Live
-====================
-
-The release date for the section and subsection have passed. You've published
-the unit and haven't made any changes to it. You and students both see the
-current version of the unit.
-
-.. image:: ../Images/unit-published.png
- :alt: Status panel of a unit that is published
-
-.. _Published Not Yet Released:
-
-====================================
-Published (not yet released)
-====================================
-
-You've published the unit, but the release date hasn't passed. Students cannot
-see this unit until the release date passes.
-
-.. image:: ../Images/unit-published_unreleased.png
- :alt: Status panel of a unit that is published but not released
-
-.. _Draft (Unpublished Changes):
-
-===========================
-Draft (Unpublished changes)
-=========================== 
-
-When you edit a published unit, whether or not it is released, the unit's
-publishing status changes to **Draft (Unpublished Changes)**, as shown in the
-status panel:
-
-.. image:: ../Images/unit-pending-changes.png
- :alt: Status panel of a unit that has pending changes
-
-In Studio, you see the draft of the content that you're working on. If the
-release date has passed, students see the last published version of the unit.
-If the release date hasn't passed, students can't see your content.
-
-You must :ref:`publish the unit<Publish a Unit>` for students to see your
-changes.
-
-You can :ref:`preview the changes to a unit<Preview Course Content>` to test
-how your changes will appear to students after you publish the unit.
-
-.. _Visible to Staff Only:
-
-===========================
-Visible to Staff Only
-===========================
-
-When you :ref:`hide a unit from students<Hide a Unit from Students>`, the
-unit's publishing status changes to **Visible to Staff Only**.
-
-The publishing status of a unit can be **Visible to Staff Only** if you hid the
-parent :ref:`section<Hide a Section from Students>` or :ref:`subsection<Hide a
-Subsection from Students>` from students.
-
-Students never see a unit with this status, even if it has been published and
-the release date has passed.
-
-.. image:: ../Images/unit-unpublished.png
- :alt: Status panel of a unit that has pending changes
-
-.. _Create a Unit:
-
-****************************
-Create a Unit
-****************************
-
-You can create a unit from the outline or create a unit in the same subsection
-from the unit page.
-
-To create a unit from the outline:
-
-#. In the outline, expand the subsection in which you want to create a new
-   unit.
-#. Click **New Unit** at the bottom of the expanded subsection. A new
-   unit is added at the end of the subsection.
-#. On the unit page, the unit name is selected. Edit the name as needed.
-#. :ref:`Add components<Add a Component>` to the new unit as needed.
-
-To create a new unit from a unit page:
-
-#. In the **Unit Location** panel, click **New Unit**.
-
-   .. image:: ../Images/unit_location.png
-    :alt: The Unit Location panel in the Unit page
-
-   The unit page for the new unit opens automatically.
-
-#. On the unit page, the unit name is selected. Edit the name as needed.
-
-#. :ref:`Add components<Add a Component>` to the new unit as needed.
-
-You must then :ref:`publish the unit<Publish a Unit>` to make it visible to
-students.
-
-
-.. _Edit a Unit:
-
-**************
-Edit a Unit
-**************
-
-You can edit a unit in the following ways:
-
-* `Edit the unit name`_
-* :ref:`Develop components<Developing Course Components>`
-* `Reorganize Components in Units`_
-
-When you make any of these changes, if you previously published the unit, the
-state changes to `Draft (Unpublished Changes)`_. You must then :ref:`publish
-the unit<Publish a Unit>` to make your edits visible to students.
-
-
-==============================
-Edit the Unit Name
-==============================
-
-To edit a unit name, hover over the name to show the Edit icon:
-
-.. image:: ../Images/unit-edit-icon.png
-  :alt: The Edit Unit Name icon
-
-Click the Edit icon next to the unit name. The name field becomes editable.
-Enter the new name and tab or click out of the field to save the name.
-
-==============================
-Reorganize Components in Units
-==============================
-
-You can reorganize components within a unit by dragging and dropping them to
-new locations.
-
-To move a component, hover over the handle on the right of the component's box
-until the cursor changes to a four-headed arrow. For example, in the image
-below, the handle for the discussion component is selected:
-
-.. image:: ../Images/unit-drag-selected.png
-  :alt: A discussion component selected to drag it
-
-Then, click and drag the component to the location that you want. 
-
-A dashed outline indicates where the component will land when you release the
-mouse button. For example, in the image below, the discussion component is
-being moved to the top of the unit:
-
-.. image:: ../Images/unit-drag-moved.png
- :alt: A component being dragged to a new location  
-
-.. _Preview a Unit:
-
-****************************
-Preview a Unit
-****************************
-
-You preview a unit to review and test the content before it is visible to
-students.
-
-You can preview a unit before it is published and when there are unpublished
-changes. When the unit is published and there are no pending changes, you
-cannot preview the unit; you must view the live version of the unit.
-
-To preview the unit, in the unit page, click **Preview Changes**.
-
-.. image:: ../Images/preview_changes.png
- :alt: The Unit page with Preview Changes button circled
-
-The unit opens in preview mode:
-
-.. image:: ../Images/preview_mode.png
- :alt: The unit in preview mode
-
-When you are revising a previously published unit, it is helpful to preview
-your changes in one window and :ref:`view the published unit<View a Published
-Unit>` in a second window.
-
-.. _Publish a Unit:
-
-****************************
-Publish a Unit
-****************************
-
-Publishing a unit makes the current version of the unit in Studio available to
-students, if the release date for the section and subsection have passed.
-
-You publish a unit that has a status of `Draft (Never Published)`_ or `Draft
-(Unpublished Changes)`_. When you publish a unit, the status changes to
-`Published and Live`_ or `Published Not Yet Released`_.
-
-You can publish a unit from the unit page or the course outline.
-
-=======================================
-Use the Unit Page to Publish a Unit
-=======================================
-
-To publish the unit, click **Publish** in the status panel:
-
-.. image:: ../Images/unit-publish-button.png
- :alt: Unit status panel with Publish button circled
-
-
-=======================================
-Use the Outline to Publish a Unit
-=======================================
-
-To publish a unit from the outline, click the publish icon in the box for the
-unit:
-
-.. image:: ../Images/outline-publish-icon-unit.png
- :alt: Publishing icon for a unit
-
-.. note:: 
- The publish icon only appears when there is new or changed content in the
- unit.
-
-.. _Discard Changes to a Unit:
-
-****************************
-Discard Changes to a Unit
-****************************
-
-When you modify a published unit, your changes are saved in Studio, though the
-changes aren't visible to students until you publish the unit again.
-
-In certain situations, you may decide that you never want to publish your
-changes. You can discard the changes so that Studio reverts to the last
-published version of the unit.
-
-To discard changes and revert the Studio version of the unit to the last
-published version, click **Discard Changes** in the status panel:
-
-.. image:: ../Images/unit-discard-changes.png
- :alt: Unit status panel with Discard Changes circled
-
-.. caution::
- When you discard changes to a unit, the changes are permanently deleted. You
- cannot retrieve discarded changes or undo the action.
-
-
-.. _View a Published Unit:
-
-****************************
-View a Published Unit
-****************************
-
-To view the last published version of a unit in the LMS, click **View Published
-Version**.
-
-.. image:: ../Images/unit_view_live_button.png
- :alt: Unit page with View Published Version button circled
-
-The unit page opens in the LMS in Staff view. You may be prompted to log in to
-the LMS.
-
-If the unit status is `Draft (Unpublished Changes)`_, you do not see your
-changes in the LMS until you publish the unit again.
-
-If the unit status is `Draft (Never Published)`_, the **View Published
-Version** button is not enabled.
-
-.. _Hide a Unit from Students:
-
-****************************
-Hide a Unit from Students
-****************************
-
-You can prevent students from seeing a unit regardless of the unit status or
-the release schedules of the section and subsection. 
-
-For more information, see :ref:`Controlling Content Visibility`.
-
-You can hide a unit from students using the course outline or the unit page.
-
-=======================================
-Use the Unit Page to Hide a Unit
-=======================================
-
-Select the **Hide from students** checkbox in the status panel:
-
-.. image:: ../Images/unit-hide.png
- :alt: Unit status panel with Hide from Students checked
-
-For more information, see :ref:`Controlling Content Visibility`.
-
-=======================================
-Use the Outline to Hide a Unit
-=======================================
-
-#. Click the Settings icon in the unit box:
-   
-   .. image:: ../Images/outline-unit-settings.png
-    :alt: The unit settings icon circled
-
-   The **Settings** dialog box opens.
-
-#. Check **Hide from students**.
-
-   .. image:: ../Images/outline-unit-settings-dialog.png
-    :alt: The unit hide from students setting
-
-#. Click **Save**.
-
-=======================================
-Make a Hidden Unit Visible to Students
-=======================================
-
-Before you make a hidden unit visible to students, be aware that course content
-will immediately be visible to students, as follows:
-
-* For a hidden unit that previously was published, clearing the check box
-  publishes the current content for the unit. If you made changes to the unit
-  while is was hidden, those draft changes are published.
-
-* When you make a section or subsection that was previously hidden visible to
-  students, draft content in units is *not* published. Changes you made since
-  last publishing units are not made visible to students.
-
-You can make a hidden unit visible to students from the unit page or the course
-outline. Follow the instructions above and clear the **Hide from students**
-checkbox.
-
-You are prompted to confirm that you want to make the unit visible to students.
-
-********************************
-Delete a Unit
-********************************
-
-You delete a unit from the course outline.
-
-When you delete a unit, you delete all components within the unit.
-
-.. warning::  
- You cannot restore course content after you delete it. To ensure you do not
- delete content you may need later, you can move any unused content to a
- section in you
-
-To delete a unit:
-
-#. Click the delete icon in the box for the unit you want to delete:
-
-.. image:: ../Images/section-delete.png
- :alt: The section with Delete icon circled
-
-2. When you receive the confirmation prompt, click **Yes, delete this
-   unit**.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/developing_course/index.rst b/docs/en_us/course_authors/source/developing_course/index.rst
deleted file mode 100644
index 8962d4b966..0000000000
--- a/docs/en_us/course_authors/source/developing_course/index.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-.. _Developing Your Course Index:
-
-##########################
-Developing Your Course
-##########################
-
-Use the chapters in this section to understand how to develop your course
-content in the Studio Outline page.
-
-For information on building specific course component types, see :ref:`Creating
-Course Content Index`.
-
-For information on creating exercises and tools, see :ref:`Exercises and Tools
-Index`.
-
-.. toctree::
-   :maxdepth: 2
-   
-   workflow
-   course_outline
-   course_sections
-   course_subsections
-   course_units
-   course_components
-   controlling_content_visibility
-   testing_courseware
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/developing_course/testing_courseware.rst b/docs/en_us/course_authors/source/developing_course/testing_courseware.rst
deleted file mode 100644
index 520c7f75ba..0000000000
--- a/docs/en_us/course_authors/source/developing_course/testing_courseware.rst
+++ /dev/null
@@ -1,188 +0,0 @@
-.. _Testing Your Course Content:
-
-###########################
-Testing Your Course Content
-###########################
-
-The way your course looks in Studio is not the way that students will see and
-experience it when it is live. 
-
-It is recommended that you test your content continually as you build your
-course, so you can interact with your course from a student's point of view.
-
-To test your content, you can:
-
-* `Preview Course Content`_
-* `View Your Live Course`_
-
-For information about setting up a beta test for your course, see
-:ref:`Beta_Testing`.
-
-.. _Preview Course Content:
-
-*************************
-Preview Course Content
-*************************
-
-You preview course content before you publish it to test how it will look to
-students.
- 
-When you preview course content, you see the latest course content as
-configured in Studio. You see content in units with the publishing status
-:ref:`Draft (Never Published)`, :ref:`Draft (Unpublished Changes)`, or
-:ref:`Visible to Staff Only`. 
-
-For example, you :ref:`publish a unit<Publish a Unit>` with a video and
-discussion:
-
-.. image:: ../Images/test-unit-studio.png
- :alt: A unit in Studio with a video and discussion
-
-Students see the same content in the LMS:
-
-.. image:: ../Images/test-unit-lms.png
- :alt: A unit in the LMS with a video and discussion
-
-You later decide to add a multiple choice problem to the unit, before the
-discussion:
-
-.. image:: ../Images/test-unit-studio-added-comp.png
- :alt: A unit in Studio with a video, problem, and discussion
-
-Before you publish this change, you can see what the question will look to
-students.
-
-When you click **Preview Changes**,  you see the unit in the LMS with
-the multiple choice question:
-
-.. image:: ../Images/test-unit-lms-added-comp.png
- :alt: A unit in the LMS with a video, problem, and discussion
-
-This preview shows how students will experience the unit after you
-:ref:`publish the change<Publish a Unit>`.
-
-In the live course, students continue to see the same content, without the
-multiple choice question, until you :ref:`publish the change<Publish a Unit>`.
-
-.. note:: 
-  **Preview Changes** in not available when the unit's state is :ref:`Published
-  and Live`, because in this case the preview and live version are exactly the
-  same. You can view the live course to see the published content.
-
- 
-.. _View Your Live Course:
-
-******************************************
-View Your Live Course
-******************************************
-
-When you are working in Studio, you can test your course by viewing it in the
-LMS. In the LMS, you can see your course as a student sees it. You can see your
-course in `Staff View`_ or `Student View`_
-
-While you work in Studio, you can switch to your live course to see how your
-course appears to students in two ways.
-
-* From the outline page, click **View Live**.
-   
-  .. image:: ../Images/test-outline-view-live.png
-   :alt: View live button on the outline
-
-* In a unit page, click **View Live Version**.
-   
-  .. image:: ../Images/test-unit-view-live.png
-   :alt: View Live Version button on the unit page
-
-=================
-Staff View
-=================
-
-You see the course in the **Staff View**.
-
-.. image:: ../Images/Live_Course_Staff_View.png
- :alt: Image of the Courseware page in a live course with Staff View indicated
-     at top right and a View Unit in Studio button
- 
-In **Staff View**:
-
-* You see all units that are :ref:`Published and Live`. For units that are
-  :ref:`Draft (Unpublished Changes)` or :ref:`Visible to Staff Only`, you
-  see the last published version of the unit. You see these units
-  regardless of the release dates of the containing section or subsection.
-
-* You do not see units that are :ref:`Draft (Never Published)`. To
-  see these units, you must use Preview mode as described in :ref:`Preview
-  Course Content`.
-
-* You can access the Instructor Dashboard, which has features and reports that
-  help you :ref:`run your course<Running Your Course Index>`.
-
-When you view your course in **Staff View**, you can execute tests to make sure
-that your course works the way you intend. For example,  before the release
-date of a subsection, members of the course team can work through the problems
-to verify that the correct answer gets a green check for correct, and that any
-answer other than the correct one gets a red X for incorrect.
-
-=================
-Student View
-=================
-
-When viewing your course in the LMS, you can switch to student view to see the
-content exactly how students will see it.
-
-To switch from **Staff View** to **Student View** and back again, click **Staff
-View** or **Student View** in the upper right corner.
-
-.. image:: ../Images/Live_Course_Student_View.png
- :alt: Image of the Courseware page in a live course with Student View
-     indicated at top right
-
-In **Student View**:
-
-* You do not see sections or subsections that have not yet been released.
-
-* If the section and subsection are released, you see units that are
-  :ref:`Published and Live`. For units that are
-  :ref:`Draft (Unpublished Changes)`, you see the last published version of the
-  unit. 
-
-* You do not see units that are :ref:`Draft (Never Published)` or
-  :ref:`Visible to Staff Only`. To see these units, you must switch back to Instructor view or use Preview mode as described in :ref:`Preview Course Content`.
-
-* You can access the Instructor Dashboard, which has features and reports that
-  help you run your course.
-
-
-*************************************
-Open Studio from Your Live Course
-*************************************
-
-When you are viewing your course in the LMS as **Staff View**, you can open
-Studio directly.
-   
-* In a unit page, click **View Unit in Studio**.
-  
-  .. image:: ../Images/Live_Studio_from_LMS_Unit.png
-   :alt: The View Unit in Studio button in an LMS unit
-
-  The unit page opens in Studio.
- 
-* In the Instructor Dashboard, click **View Course in Studio** to open the
-  course outline.
- 
-  .. image:: ../Images/Live_Course_Instructor_Dashboard.png
-    :alt: Image of the Instructor Dashboard in a live course with a View Course
-        in Studio button
-
-  For information about the tasks you can complete on the Instructor Dashboard,
-  see :ref:`Running Your Course Index`.
- 
-* In the **Course Progress** page, click **View Grading in Studio** to open the
-  Grading page.
- 
-  .. image:: ../Images/Student_Progress.png
-     :alt: Image of the Course Progress page for a student with a View  Grading
-         in Studio button
-
-  For information about checking a student's progress, see
-  :ref:`Review_grades`.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/developing_course/workflow.rst b/docs/en_us/course_authors/source/developing_course/workflow.rst
deleted file mode 100644
index da69f0a9e2..0000000000
--- a/docs/en_us/course_authors/source/developing_course/workflow.rst
+++ /dev/null
@@ -1,110 +0,0 @@
-.. _Getting Started with Course Content Development:
-
-###############################################
-Getting Started with Course Content Development
-###############################################
-
-When you are done :ref:`setting up your course<Setting up your Course Index>`,
-you are ready to build your course content.
-
-This chapter provides an outline of the steps involved in developing your
-course content, with links to more details. See:
-
-* `Understanding Course Building Blocks`_
-* `Creating New Course Content`_
-* `Making Course Content Visible to Students`_
-* `Revising Content`_
-
-.. _Understanding Course Building Blocks:
-
-************************************************
-Understanding Course Building Blocks
-************************************************
-
-Before you begin, you should understand the building blocks of an edX course.
-
-* :ref:`The course outline<Developing Your Course Outline>` is the container
-  for all of your course content. The outline contains one or more sections.
-* :ref:`Course sections<Developing Course Sections>` are at the top level of
-  your course and typically represent a time period. A section contains one or
-  more subsections.
-* :ref:`Course subsections<Developing Course Subsections>` are parts of a
-  section, and usually represent a topic or other organizing principle. A
-  subsection contains one or more units.
-* :ref:`Course units <Developing Course Units>` are lessons in a subsection
-  that students view as single pages. A unit contains one or more components.
-* :ref:`Course components<Developing Course Components>` are objects within
-  units that contain your actual course content.
-
-.. _Creating New Course Content:
-
-****************************************
-Creating New Course Content
-****************************************
-
-Once you understand the way edX courses are structured, you can start
-organizing your content and entering it into Studio. 
-
-You create :ref:`sections<Create a Section>`, :ref:`subsections<Create a
-Subsection>`, and :ref:`units<Create a Unit>` in the :ref:`course
-outline<Developing Your Course Outline>`. 
-
-For graded subsections, you also
-:ref:`set the assignment type and due date<Set the Assignment Type and Due Date
-for a Subsection>`. 
-
-You :ref:`create components<Add a Component>` in the unit
-page.
-
-In addition, you :ref:`control content visibility<Controlling Content
-Visibility>` by setting release dates on the outline and publishing units.
-
-The following diagram summarizes the content creation workflow:
-
-.. image:: ../Images/workflow-create-content.png
- :alt: Diagram of the content creation process
-
-It is recommended that you :ref:`test course content <Testing Your Course
-Content>` throughout the creation process.
-
-.. _Making Course Content Visible to Students:
-
-******************************************************
-Making Course Content Visible to Students
-******************************************************
-
-When you create your content, you'll also specify if and when students will be
-able to see it. Content visibility depends on several factors: 
-
-* The :ref:`course start date<The Course Start Date>`
-* The release dates of the :ref:`section<Set a Section Release Date>` and
-  :ref:`subsection<Set a Subsection Release Date>`
-* The :ref:`publishing status<Hide a Unit from Students>` of the unit
-* The :ref:`Hide content from students<Hide a Unit from Students>` setting
-  
-For more information, see :ref:`Controlling Content Visibility`.
-
-.. _Revising Content:
-
-****************************
-Revising Content
-****************************
-
-You can revise your course content at any time. 
-
-* When you :ref:`reorganize sections, subsections, and units<Reorganize the
-  Course Outline>` in the outline, the new order is immediately visible to
-  students if the section and subsection are released.
-
-* When you :ref:`edit a unit<Edit a Unit>`, or :ref:`components<Add a
-  Component>` within a unit, you must :ref:`publish<Publish a Unit>` those
-  changes to make them visible to students.
-
-The following diagram summarizes the content revision workflow and content
-visibility:
-
-.. image:: ../Images/workflow-revise-content.png
- :alt: Diagram of the content creation process
-
-It is recommended that you :ref:`test course content <Testing Your Course
-Content>` during the revision process.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/annotation.rst b/docs/en_us/course_authors/source/exercises_tools/annotation.rst
deleted file mode 100644
index 7ef992836d..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/annotation.rst
+++ /dev/null
@@ -1,93 +0,0 @@
-.. _Annotation:
-
-###################
-Annotation Problem
-###################
-
-.. note:: This version of the annotation problem type is a provisional feature. Support for this feature is limited.
-
-In an annotation problem, the instructor highlights specific text inside a larger text block and then asks questions about that text. The questions appear when students hover the mouse over the highlighted text. The questions also appear in a section below the text block, along with space for students' responses.
-
-Annotation problems ask students to respond to questions about a specific block of text. The question appears above the text when the student hovers the mouse over the highlighted text so that students can think about the question as they read.
-
-.. image:: /Images/AnnotationExample.png
-  :alt: Annotation problem
-
-****************************
-Create an Annotation Problem
-****************************
-
-To create an annotation problem, you'll add the Annotation advanced component to your course, add the **Instructions** and **Guided Discussion** segments of the problem, and then the **Annotation problem** segment of the problem.
-
-#. Add the Annotation advanced component. 
-
-    #. From the **Settings** menu select **Advanced Settings**.
-
-    #. In the field for the **Advanced Module List** policy key, place your
-       cursor between the brackets.
-
-    #. Enter the following value. Make sure to include the quotation marks.
-
-       ``"annotatable"``
-
-    4. At the bottom of the page, click **Save Changes**.
-
-       The page refreshes automatically. At the top of the page, you see a
-       notification that your changes have been saved.
-
-    5. Return to the unit where you want to add the specialized problem. The
-       list of possible components now contains an Advanced component.
-
-       .. image:: /Images/AdvancedComponent.png
-          :alt: Image of the Add a New Component panel with the Advanced component option
-
-2. Add the **Instructions** and **Guided Discussion** segments of the
-problem.
-
-    #. In the unit where you want to create the problem, under **Add New
-       Component** click **Advanced**.
-    #. In the list of problem types, click **Annotation**.
-    #. In the component that appears, click **Edit**.
-    #. In the component editor, replace the example code with your own code.
-    #. Click **Save**.
-
-3. Add the **Annotation problem** segment of the problem.
-
-    #. Under the Annotation component, create a new blank Advanced Problem
-       component.
-       
-    #. Paste the following code in the Advanced Problem component, replacing
-       placeholders with your own information.
-
-        .. code-block:: xml
-
-          <problem>
-              <annotationresponse>
-                  <annotationinput>
-                    <text>PLACEHOLDER: Text of annotation</text>
-                      <comment>PLACEHOLDER: Text of question</comment>
-                      <comment_prompt>PLACEHOLDER: Type your response below:</comment_prompt>
-                      <tag_prompt>PLACEHOLDER: In your response to this question, which tag below 
-                      do you choose?</tag_prompt>
-                    <options>
-                      <option choice="incorrect">PLACEHOLDER: Incorrect answer (to make this 
-                      option a correct or partially correct answer, change choice="incorrect" 
-                      to choice="correct" or choice="partially-correct")</option>
-                      <option choice="correct">PLACEHOLDER: Correct answer (to make this option 
-                      an incorrect or partially correct answer, change choice="correct" to 
-                      choice="incorrect" or choice="partially-correct")</option>
-                      <option choice="partially-correct">PLACEHOLDER: Partially correct answer 
-                      (to make this option a correct or partially correct answer, 
-                      change choice="partially-correct" to choice="correct" or choice="incorrect")
-                      </option>
-                    </options>
-                  </annotationinput>
-              </annotationresponse>
-              <solution>
-                <p>PLACEHOLDER: Detailed explanation of solution</p>
-              </solution>
-            </problem>
-
-#. Click **Save**.
-
-
diff --git a/docs/en_us/course_authors/source/exercises_tools/checkbox.rst b/docs/en_us/course_authors/source/exercises_tools/checkbox.rst
deleted file mode 100644
index f83f7cbaae..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/checkbox.rst
+++ /dev/null
@@ -1,183 +0,0 @@
-.. _Checkbox:
-
-##################
-Checkbox Problem
-##################
-
-In checkbox problems, the student selects one or more options from a list of possible answers. The student must select all the options that apply to answer the problem correctly. Each checkbox problem must have at least one correct answer.
-
-.. image:: /Images/CheckboxExample.png
- :alt: Image of a checkbox problem
-
-****************************
-Create a Checkbox Problem
-****************************
-
-You can create checkbox problems in the Simple Editor or in the Advanced Editor.
-
-.. note:: All problems must include labels for accessibility. The label generally includes the text of the main question in your problem. To add a label for a common problem, surround the text of the label with angle brackets pointed toward the text (>>label text<<).
-
-==================
-Simple Editor
-==================
-
-#. Under **Add New Component**, click **Problem**.
-#. In the **Select Problem Component Type** screen, click **Checkboxes** on the **Common Problem Types** tab.
-#. In the Problem component that appears, click **Edit**.
-#. In the component editor, replace the default text with the text of your 
-   problem. Enter each answer option on its own line.
-#. Determine the text of the problem to use as a label, and then surround that text with two sets of angle brackets (>><<).
-#. Select all the answer options, and then click the checkbox button. 
-
-   .. image:: /Images/ProbComponent_CheckboxIcon.png
-    :alt: Image of the checkbox button
-   
-   When you do this, brackets appear next to each answer choice.
-
-#. Add an **x** between the brackets for the correct answer or answers.
-#. In the component editor, select the text of the explanation, and then click the 
-   explanation button to add explanation tags around the text.
-
-   .. image:: /Images/ProbCompButton_Explanation.png
-    :alt: Image of the explanation button
-
-#. On the **Settings** tab, specify the settings that you want. 
-#. Click **Save**.
-
-For the example problem above, the text in the Problem component is the
-following.
-
-.. code-block:: xml
-
-    Learning about the benefits of preventative healthcare can be particularly 
-    difficult. >>Check all of the reasons below why this may be the case.<<
-
-    [x] A large amount of time passes between undertaking a preventative measure and seeing the result. 
-    [ ] Non-immunized people will always fall sick. 
-    [x] If others are immunized, fewer people will fall sick regardless of a particular individual's choice to get immunized or not. 
-    [x] Trust in healthcare professionals and government officials is fragile. 
-
-    [explanation]
-    People who are not immunized against a disease may still not fall sick from the disease. If someone is trying to learn whether or not preventative measures against the disease have any impact, he or she may see these people and conclude, since they have remained healthy despite not being immunized, that immunizations have no effect. Consequently, he or she would tend to believe that immunization 
-    (or other preventative measures) have fewer benefits than they actually do.
-    [explanation]
-
-==================
-Advanced Editor
-==================
-
-To create this problem in the Advanced Editor, click the **Advanced** tab in the Problem component editor, and then replace the existing code with the following code.
-
-.. code-block:: xml
-
-  <problem>
-    <p>Learning about the benefits of preventative healthcare can be particularly difficult. Check all of the reasons below why this may be the case.</p>
-
-  <choiceresponse>
-    <checkboxgroup direction="vertical" label="Check all of the reasons below why this may be the case">
-      <choice correct="true"><text>A large amount of time passes between undertaking a preventative measure and seeing the result.</text></choice>
-      <choice correct="false"><text>Non-immunized people will always fall sick.</text></choice>
-      <choice correct="true"><text>If others are immunized, fewer people will fall sick regardless of a particular individual's choice to get immunized or not.</text></choice>
-      <choice correct="true"><text>Trust in healthcare professionals and government officials is fragile.</text></choice>
-    </checkboxgroup>
-  </choiceresponse>
-
-   <solution>
-   <div class="detailed-solution">
-   <p>Explanation</p>
-   <p>People who are not immunized against a disease may still not fall sick from the disease. If someone is trying to learn whether or not preventative measures against the disease have any impact, he or she may see these people and conclude, since they have remained healthy despite not being immunized, that immunizations have no effect. Consequently, he or she would tend to believe that immunization (or other preventative measures) have fewer benefits than they actually do.</p>
-   </div>
-   </solution>
-  </problem>
-
-.. _Checkbox Problem XML:
-
-****************************
-Checkbox Problem XML 
-****************************
-
-============
-Template
-============
-
-.. code-block:: xml
-
-  <problem>
-    <p>Question text</p>
-
-  <choiceresponse>
-
-  <checkboxgroup direction="vertical" label="label text">
-  <choice correct="false"><text>Answer option 1 (incorrect)</text></choice>
-  <choice correct="true"><text>Answer option 2 (correct)</text></choice>
-  </checkboxgroup>
-  </choiceresponse>
-
-   <solution>
-   <div class="detailed-solution">
-   <p>Solution or Explanation Heading</p>
-   <p>Solution or explanation text</p>
-   </div>
-   </solution>
-
-  </problem>
-
-======
-Tags
-======
-
-* ``<choiceresponse>`` (required): Specifies that the problem contains options for students to choose from.
-* ``<checkboxgroup>`` (required): Specifies that the problem is a checkbox problem.
-* ``<choice>`` (required): Designates an answer option.
-
-**Tag:** ``<choiceresponse>``
-
-Specifies that the problem contains options for students to choose from.
-
-  Attributes
-
-  (none)
-
-  Children
-
-  * ``<checkboxgroup>``
-
-**Tag:** ``<checkboxgroup>``
-
-Specifies that the problem is a checkbox problem.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - direction (optional)
-       - Specifies the orientation of the list of answers. The default is vertical.
-     * - label (required)
-       - Specifies the name of the response field.
-
-  Children
-
-  * ``<choice>`` 
-
-**Tag:** ``<choice>``
-
-Designates an answer option.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - true (at least one required)
-       - Indicates a correct answer. For checkbox problems, one or more ``<choice>`` tags can contain a correct answer.
-     * - false (at least one required)
-       - Indicates an incorrect answer.
-
-  Children
-  
-  (none)
diff --git a/docs/en_us/course_authors/source/exercises_tools/chemical_equation.rst b/docs/en_us/course_authors/source/exercises_tools/chemical_equation.rst
deleted file mode 100644
index bc73d1dc42..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/chemical_equation.rst
+++ /dev/null
@@ -1,164 +0,0 @@
-.. _Chemical Equation:
-
-################################
-Chemical Equation Problem
-################################
-
-The chemical equation problem type allows the student to enter text that represents a chemical equation into a text box. The system converts that text into a chemical equation below the text box. The grader evaluates the student's response by using a Python script that you create and embed in the problem.
-
-.. image:: /Images/ChemicalEquationExample.png
- :alt: Image of a chemical equation response problem
-
-************************************
-Create the Chemical Equation Problem
-************************************
-
-Chemical equation problems use MathJax to create formulas. For more information about using MathJax in Studio, see :ref:`MathJax in Studio`.
-
-To create the above chemical equation problem:
-
-#. In the unit where you want to create the problem, click **Problem** under **Add New Component**, and then click the **Advanced** tab.
-#. Click **Blank Advanced Problem**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, paste the code from below.
-#. Click **Save**.
-
-==========================================
-Sample Chemical Equation Problem Code
-==========================================
-
-.. code-block:: xml
-
-  <problem>
-    <startouttext/>
-    <p>Some problems may ask for a particular chemical equation. Practice by writing out the following reaction in the box below.</p>
-    
-  \( \text{H}_2\text{SO}_4 \longrightarrow \text { H}^+ + \text{ HSO}_4^-\)
-
-    <customresponse>
-      <chemicalequationinput size="50" label="Enter the chemical equation"/>
-      <answer type="loncapa/python">
-
-  if chemcalc.chemical_equations_equal(submission[0], 'H2SO4 -> H^+ + HSO4^-'):
-      correct = ['correct']
-  else:
-      correct = ['incorrect']
-
-      </answer>
-    </customresponse>
-    <p>Some tips:</p>
-    <ul>
-    <li>Use real element symbols.</li>
-    <li>Create subscripts by using plain text.</li>
-    <li>Create superscripts by using a caret (^).</li>
-    <li>Create the reaction arrow (\(\longrightarrow\)) by using "->".</li>
-    </ul>
-
-    <endouttext/>
-  
-   <solution>
-   <div class="detailed-solution">
-   <p>Solution</p>
-   <p>To create this equation, enter the following:</p>
-     <p>H2SO4 -> H^+ + HSO4^-</p>
-   </div>
-   </solution>
-  </problem>
-
-.. _Chemical Equation Problem XML:
-
-************************************
-Chemical Equation Problem XML
-************************************
-
-============
-Template
-============
-
-.. code-block:: xml
-
-  <problem>
-    <startouttext/>
-    <p>Problem text</p>
-
-    <customresponse>
-      <chemicalequationinput size="NUMBER" label="LABEL TEXT"/>
-      <answer type="loncapa/python">
-
-  if chemcalc.chemical_equations_equal(submission[0], 'TEXT REPRESENTING CHEMICAL EQUATION'):
-      correct = ['correct']
-  else:
-      correct = ['incorrect']
-
-      </answer>
-    </customresponse>
-
-    <endouttext/>
-  
-   <solution>
-   <div class="detailed-solution">
-   <p>Solution or Explanation Header</p>
-   <p>Solution or explanation text</p>
-   </div>
-   </solution>
-  </problem>
-
-======
-Tags
-======
-
-* ``<customresponse>``: Indicates that this problem has a custom response. 
-* ``<chemicalequationinput>``: Specifies that the answer to this problem is a chemical equation. 
-* ``<answer type=loncapa/python>``: Contains the Python script that grades the problem.
-
-**Tag:** ``<customresponse>``
-
-Indicates that this problem has a custom response. The ``<customresponse>`` tags must surround the ``<chemicalequation>`` tags.
-
-  Attributes
-
-  (none)
-
-  Children
-
-  * ``<chemicalequationinput>``
-  * ``<answer>``
-
-**Tag:** ``<chemicalequationinput>``
-
-Indicates that the answer to this problem is a chemical equation and creates a response field where the student enters an answer.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - size 
-       - Specifies the size of the response field, in characters.
-     * - label (required)
-       - Contains the text of the principal question in the problem.
-
-  Children
-  
-  (none)
-
-**Tag:** ``<answer>``
-
-Contains the Python script that grades the problem.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - type (required) 
-       - Must be "loncapa/python".
-
-  Children
-  
-  (none)
-     
diff --git a/docs/en_us/course_authors/source/exercises_tools/circuit_schematic_builder.rst b/docs/en_us/course_authors/source/exercises_tools/circuit_schematic_builder.rst
deleted file mode 100644
index e70f7dd1c6..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/circuit_schematic_builder.rst
+++ /dev/null
@@ -1,80 +0,0 @@
-.. _Circuit Schematic Builder:
-
-##################################
-Circuit Schematic Builder Problem
-##################################
-
-In circuit schematic builder problems, students can arrange circuit elements such as voltage sources, capacitors, resistors, and MOSFETs on an interactive grid. They then submit a DC, AC, or transient analysis of their circuit to the system for grading.
-
-.. image:: /Images/CircuitSchematicExample.png
- :alt: Image of a circuit schematic builder
-
-*********************************************
-Create a Circuit Schematic Builder Problem
-*********************************************
-
-#. In the unit where you want to create the problem, click **Problem**
-   under **Add New Component**, and then click the **Advanced** tab.
-#. Click **Circuit Schematic Builder**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, replace the example code with your own code.
-#. Click **Save**.
-
-**Problem Code**
-
-To create the problem in the image above, paste the following code into the Advanced Editor.
-
-.. code-block:: xml
-
- <problem>
-    <p>Make a voltage divider that splits the provided voltage evenly.</p>
-      <schematicresponse>
-      <center>
-      <schematic height="500" width="600" parts="g,r" analyses="dc"
-      initial_value="[["v",[168,144,0],{"value":"dc(1)","_json_":0},["1","0"]],["r",[296,120,0],{"r":"1","_json_":1},["1","output"]],["L",[296,168,3],{"label":"output","_json_":2},["output"]],["w",[296,216,168,216]],["w",[168,216,168,192]],["w",[168,144,168,120]],["w",[168,120,296,120]],["g",[168,216,0],{"_json_":7},["0"]],["view",-67.49999999999994,-78.49999999999994,1.6000000000000003,"50","10","1G",null,"100","1","1000"]]"
-      />
-      </center>
-        <answer type="loncapa/python">
-      dc_value = "dc analysis not found"
-      for response in submission[0]:
-        if response[0] == 'dc':
-            for node in response[1:]:
-                dc_value = node['output']
-      if dc_value == .5:
-        correct = ['correct']
-      else:
-        correct = ['incorrect']
-      </answer>
-      </schematicresponse>
-    <schematicresponse>
-    <p>Make a high pass filter.</p>
-    <center>
-    <schematic height="500" width="600" parts="g,r,s,c" analyses="ac"
-    submit_analyses="{"ac":[["NodeA",1,9]]}"
-    initial_value="[["v",[160,152,0],{"name":"v1","value":"sin(0,1,1,0,0)","_json_":0},["1","0"]],["w",[160,200,240,200]],["g",[160,200,0],{"_json_":2},["0"]],["L",[240,152,3],{"label":"NodeA","_json_":3},["NodeA"]],["s",[240,152,0],{"color":"cyan","offset":"0","_json_":4},["NodeA"]],["view",64.55878906250004,54.114697265625054,2.5000000000000004,"50","10","1G",null,"100","1","1000"]]"/>
-    </center>
-    <answer type="loncapa/python">
-    ac_values = None
-    for response in submission[0]:
-      if response[0] == 'ac':
-          for node in response[1:]:
-              ac_values = node['NodeA']
-    print "the ac analysis value:", ac_values
-    if ac_values == None:
-      correct = ['incorrect']
-    elif ac_values[0][1] < ac_values[1][1]:
-      correct = ['correct']
-    else:
-      correct = ['incorrect']
-    </answer>
-    </schematicresponse>
-        <solution>
-            <div class="detailed-solution">
-                <p>Explanation</p>
-                <p>A voltage divider that evenly divides the input voltage can be formed with two identically valued resistors, with the sampled voltage taken in between the two.</p>
-                <p><img src="/c4x/edX/edX101/asset/images_voltage_divider.png"/></p>
-                <p>A simple high-pass filter without any further constaints can be formed by simply putting a resister in series with a capacitor. The actual values of the components do not really matter in order to meet the constraints of the problem.</p>
-                <p><img src="/c4x/edX/edX101/asset/images_high_pass_filter.png"/></p>
-            </div>
-        </solution>
- </problem>
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/conditional_module.rst b/docs/en_us/course_authors/source/exercises_tools/conditional_module.rst
deleted file mode 100644
index 94db3b1b51..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/conditional_module.rst
+++ /dev/null
@@ -1,91 +0,0 @@
-.. _Conditional Module:
-
-####################
-Conditional Module
-####################
-
-********************
-Format description
-********************
-
-The main tag of conditional module input is:
-
-.. code-block:: xml
-
-    <conditional> ... </conditional>
-
-``conditional`` can include any number of any xmodule tags (``html``, ``video``, ``poll``, etc.) or ``show`` tags.
-
-================
-conditional tag
-================
-
-The main container for a single instance of a conditional module. The following attributes can
-be specified for this tag:
-
-.. code-block:: xml
-
-    sources - location id of required modules, separated by ';'
-    [message | ""] - message for case, where one or more are not passed. Here you can use variable {link}, which generate link to required module.
-
-    [submitted] - map to `is_submitted` module method.
-    (pressing RESET button makes this function to return False.)
-
-    [correct] - map to `is_correct` module method
-    [attempted] - map to `is_attempted` module method
-    [poll_answer] - map to `poll_answer` module attribute
-    [voted] - map to `voted` module attribute
-
-========
-show tag
-========
-
-Symlink to some set of xmodules. The following attributes can
-be specified for this tag:
-
-.. code-block:: xml
-
-    sources - location id of modules, separated by ';'
-
-*********
-Example
-*********
-
-========================================
-Examples of conditional depends on poll
-========================================
-
-.. code-block:: xml
-
-    <conditional sources="i4x://MITx/0.000x/poll_question/first_real_poll_seq_with_reset" poll_answer="man"
-    message="{link} must be answered for this to become visible.">
-        <html>
-            <h2>You see this because your vote value for "First question" was "man"</h2>
-        </html>
-    </conditional>
-
-========================================================
-Examples of conditional depends on poll (use <show> tag)
-========================================================
-
-.. code-block:: xml
-
-    <conditional sources="i4x://MITx/0.000x/poll_question/first_real_poll_seq_with_reset" poll_answer="man"
-    message="{link} must be answered for this to become visible.">
-        <html>
-            <show sources="i4x://MITx/0.000x/problem/test_1; i4x://MITx/0.000x/Video/Avi_resources; i4x://MITx/0.000x/problem/test_1"/>
-        </html>
-    </conditional>
-
-================================================
-Examples of conditional depends on problem
-================================================
-
-.. code-block:: xml
-
-    <conditional sources="i4x://MITx/0.000x/problem/Conditional:lec27_Q1" attempted="True">
-        <html display_name="HTML for attempted problem">You see this, cause "lec27_Q1" is attempted.</html>
-    </conditional>
-    <conditional sources="i4x://MITx/0.000x/problem/Conditional:lec27_Q1" attempted="False">
-        <html display_name="HTML for not attempted problem">You see this because "lec27_Q1" is not attempted.</html>
-    </conditional>
diff --git a/docs/en_us/course_authors/source/exercises_tools/create_exercises_and_tools.rst b/docs/en_us/course_authors/source/exercises_tools/create_exercises_and_tools.rst
deleted file mode 100644
index 1c06abf1d9..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/create_exercises_and_tools.rst
+++ /dev/null
@@ -1,202 +0,0 @@
-.. _Create Exercises:
-
-############################
-Creating Exercises and Tools
-############################
-
-************************************
-Introduction to  Exercises and Tools
-************************************
-
-Studio allows you to create a wide variety of exercises and tools for your course. Many of these exercises and tools have templates in Studio so that you can create them easily. In addition, individual course teams frequently create exercises that don't have templates in Studio. We're striving to make these tools available to all our course teams as well, and we have instructions for creating some of them in this section. 
-
-Depending on the exercise or tool, you'll use an HTML, Problem, or Advanced component. The page for each individual exercise or tool contains an example of each exercise or tool, together with all the files, code, and step-by-step instructions that you need to create the exercise or tool. 
-
-.. note:: Problems must include labels for accessibility. The label generally includes the text of the main question in your problem. Instructions for adding labels appear in the page for each individual problem.
-
-****************************
-General Exercises and Tools
-****************************
-
-.. list-table::
-   :widths: 25 25 50
-
-   * - .. image:: /Images/AnnotationExample.png
-          :width: 100
-          :alt: Example annotation problem
-     - :ref:`Annotation`
-     - Annotation problems ask students to respond to questions about a specific block of text. The question appears above the text when the student hovers the mouse over the highlighted text so that students can think about the question as they read. Note that this problem type is not fully supported.
-   * - .. image:: /Images/PollExample.png
-          :width: 100
-          :alt: Example poll
-     - :ref:`Conditional Module`
-     -  You can create a conditional module to control versions of content that groups of students see. For example, students who answer "Yes" to a poll question then see a different block of text from the students who answer "No" to that question.
-   * - .. image:: /Images/JavaScriptInputExample.png
-          :width: 100
-          :alt: Example JavaScript problem
-     - :ref:`Custom JavaScript`
-     - Custom JavaScript display and grading problems (also called *custom JavaScript problems* or *JS Input problems*) allow you to create a custom problem or tool that uses JavaScript and then add the problem or tool directly into Studio.
-   * - .. image:: /Images/external-grader-correct.png
-          :width: 100
-          :alt: Example external grader
-     - :ref:`External Grader`
-     - An external grader is a service that receives student responses to a problem, processes those responses, and returns feedback and a problem grade to the edX platform. You build and deploy an external grader separately from the edX platform. An external grader is particularly useful for software programming courses where students are asked to submit complex code.
-   * - .. image:: /Images/GoogleHangout_WithPeople.png   
-          :width: 100
-          :alt: Google Hangout
-     - :ref:`Google Instant Hangout`
-     - You can add the ability for students to participate in instant hangouts directly from your course. With instant hangouts, students can interact through live video and voice, share screens and watch videos together, and collaborate on documents. 
-   * - .. image:: /Images/IFrame_1.png
-          :width: 100
-          :alt: Example IFrame tool
-     - :ref:`IFrame`
-     - IFrames allow you to integrate ungraded exercises and tools from any Internet site into an HTML component in your course.
-   * - .. image:: /Images/LTIExample.png
-          :width: 100
-          :alt: Example LTI component
-     - :ref:`LTI Component`
-     - LTI components allow you to add an external learning application or non-PDF textbook to Studio.
-   * - .. image:: /Images/CITL_AssmtTypes.png
-          :width: 100
-          :alt: Example open response assessment
-     - :ref:`Open Response Assessment`
-     - In open response assessments, students receive feedback on written responses of varying lengths as well as files, such as computer code or images, that the students upload. Open response assessments include self assessment and peer assessment.
-   * - .. image:: /Images/PollExample.png
-          :width: 100
-          :alt: Example poll
-     - :ref:`Poll`
-     - You can run polls in your course so that your students can share opinions on different questions.
-   * - .. image:: /Images/ProblemWithAdaptiveHintExample.png
-          :width: 100
-          :alt: Example problem with adaptive hint
-     - :ref:`Problem with Adaptive Hint`
-     - A problem with an adaptive hint evaluates a student's response, then gives the student feedback or a hint based on that response so that the student is more likely to answer correctly on the next attempt. These problems can be text input, multiple choice, numerical input, or math expression input problems.
-   * - .. image:: /Images/ProblemWrittenInLaTeX.png
-          :width: 100
-          :alt: Example problem written in LaTeX
-     - :ref:`Problem Written in LaTeX`
-     - If you have an problem that is already written in LaTeX, you can use this problem type to easily convert your code into XML.
-   * - .. image:: /Images/TextInputExample.png
-          :width: 100
-          :alt: Example text input problem
-     - :ref:`Text Input`
-     - In text input problems, students enter text into a response field. The response can include numbers, letters, and special characters such as punctuation marks.
-   * - .. image:: /Images/WordCloudExample.png
-          :width: 100
-          :alt: Example word cloud
-     - :ref:`Word Cloud`
-     - Word clouds arrange text that students enter - for example, in response to a question - into a colorful graphic that students can see.
-   * - .. image:: /Images/CustomPythonExample.png  
-          :width: 100
-          :alt: Example write-your-own-grader problem
-     - :ref:`Write Your Own Grader`
-     - In custom Python-evaluated input (also called "write-your-own-grader") problems, the grader uses a Python script that you create and embed in the problem to evaluates a student's response or provide hints. These problems can be any type.
-
-********************************
-Image-Based Exercises and Tools
-********************************
-
-.. list-table::
-   :widths: 30 25 80
-
-   * - .. image:: /Images/DragAndDropProblem.png
-          :width: 100
-          :alt: Example drag and drop problem
-     - :ref:`Drag and Drop`
-     - In drag and drop problems, students respond to a question by dragging text or objects to a specific location on an image.
-   * - .. image:: /Images/image-modal.png
-          :width: 100
-          :alt: Example full screen image tool
-     - :ref:`Full Screen Image`
-     - The Full Screen Image tool allows a student to enlarge an image in the whole browser window. This is useful when the image contains a large amount of detail and text that is easier to view in context when enlarged.
-   * - .. image:: /Images/ImageMappedInputExample.png
-          :width: 100
-          :alt: Example image mapped input problem
-     - :ref:`Image Mapped Input`
-     - In an image mapped input problem, students click inside a defined area in an image. You define this area by including coordinates in the body of the problem.
-   * - .. image:: /Images/Zooming_Image.png
-          :width: 100
-          :alt: Example zooming image tool
-     - :ref:`Zooming Image`
-     - Zooming images allow you to enlarge sections of an image so that students can see the section in detail.
-
-************************************
-Multiple Choice Exercises and Tools
-************************************
-
-.. list-table::
-   :widths: 30 25 80
-
-   * - .. image:: /Images/CheckboxExample.png
-          :width: 100
-          :alt: Example checkbox problem
-     - :ref:`Checkbox`
-     - In checkbox problems, the student selects one or more options from a list of possible answers. The student must select all the options that apply to answer the problem correctly.
-   * - .. image:: /Images/DropdownExample.png
-          :width: 100
-          :alt: Example dropdown problem
-     - :ref:`Dropdown`
-     - Dropdown problems allow the student to choose from a collection of answer options, presented as a dropdown list. Unlike multiple choice problems, whose answers are always visible directly below the question, dropdown problems don't show answer choices until the student clicks the dropdown arrow.
-   * - .. image:: /Images/MultipleChoiceExample.png
-          :width: 100
-          :alt: Example multiple choice problem
-     - :ref:`Multiple Choice`
-     - In multiple choice problems, students select one option from a list of answer options. Unlike with dropdown problems, whose answer choices don't appear until the student clicks the drop-down arrow, answer choices for multiple choice problems are always visible directly below the question.
-   * - .. image:: /Images/MultipleChoice_NumericalInput.png
-          :width: 100
-          :alt: Example multiple choice and numerical input problem
-     - :ref:`Multiple Choice and Numerical Input`
-     - You can create a problem that combines a multiple choice and numerical input problems. Students not only select a response from options that you provide, but also provide more specific information, if necessary.
-
-********************************
-STEM Exercises and Tools
-********************************
-
-.. list-table::
-   :widths: 30 25 80
-
-   * - .. image:: /Images/ChemicalEquationExample.png
-          :width: 100
-          :alt: Example chemical equation problem
-     - :ref:`Chemical Equation`
-     - Chemical equation problems allow the student to enter text that represents a chemical equation into a text box. The grader evaluates the student's response by using a Python script that you create and embed in the problem.
-   * - .. image:: /Images/CircuitSchematicExample_short.png
-          :width: 100
-          :alt: Example circuit schematic builder problem
-     - :ref:`Circuit Schematic Builder`
-     - In circuit schematic builder problems, students can arrange circuit elements such as voltage sources, capacitors, resistors, and MOSFETs on an interactive grid. They then submit a DC, AC, or transient analysis of their circuit to the system for grading.
-   * - .. image:: /Images/GeneExplorer.png
-          :width: 100
-          :alt: Example gene explorer problem
-     - :ref:`Gene Explorer`
-     - The Gene Explorer (GeneX) simulates the transcription, splicing, processing, and translation of a small hypothetical eukaryotic gene. GeneX allows students to make specific mutations in a gene sequence, and it then calculates and displays the effects of the mutations on the mRNA and protein.
-   * - .. image:: /Images/MathExpressionInputExample.png
-          :width: 100
-          :alt: Example math expression input problem
-     - :ref:`Math Expression Input`
-     - The more complex of Studio's two types of math problems. In math expression input problems, students enter mathematical expressions to answer a question. These problems can include unknown variables and more complex symbolic expressions. You can specify a correct answer either explicitly or by using a Python script. 
-   * - .. image:: /Images/Molecule_Editor.png
-          :width: 100
-          :alt: Example molecule editor problem
-     - :ref:`Molecule Editor`
-     - The molecule editor allows students to draw molecules that follow the rules for covalent bond formation and formal charge, even if the molecules are chemically impossible, are unstable, or do not exist in living systems.
-   * - .. image:: /Images/MoleculeViewer.png
-          :width: 100
-          :alt: Example molecule viewer
-     - :ref:`Molecule Viewer`
-     - With the molecule viewer, you can create three-dimensional representations of molecules for your students to see.
-   * - .. image:: /Images/image292.png
-          :width: 100
-          :alt: Example numerical input problem
-     - :ref:`Numerical Input`
-     - The simpler of Studio's two types of math problems. In numerical input problems, students enter numbers or specific and relatively simple mathematical expressions to answer a question. You can specify a margin of error, and you can specify a correct answer either explicitly or by using a Python script.
-   * - .. image:: /Images/Periodic_Table.png
-          :width: 100
-          :alt: Example periodic table problem
-     - :ref:`Periodic Table`
-     - An interactive periodic table of the elements shows detailed information about each element as the student moves the mouse over the element.
-   * - .. image:: /Images/ProteinBuilder.png
-          :width: 100
-          :alt: Example protein builder problem
-     - :ref:`Protein Builder`
-     - The Protex protein builder asks students to create specified protein shapes by stringing together amino acids. 
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/custom_javascript.rst b/docs/en_us/course_authors/source/exercises_tools/custom_javascript.rst
deleted file mode 100644
index 94f2b9b401..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/custom_javascript.rst
+++ /dev/null
@@ -1,233 +0,0 @@
-.. _Custom JavaScript:
-
-###########################
-Custom JavaScript Problem
-###########################
-
-Custom JavaScript display and grading problems (also called *custom JavaScript problems*
-or *JS Input problems*) allow you to create a custom problem or tool that uses JavaScript
-and then add the problem or tool directly into Studio. When you create a JS Input problem,
-Studio embeds the problem in an inline frame (IFrame) so that your students can interact with
-it in the LMS. You can grade your students’ work using JavaScript and some basic Python, and
-the grading is integrated into the edX grading system.
-
-The JS Input problem that you create must use HTML, JavaScript, and cascading style sheets
-(CSS). You can use any application creation tool, such as the Google Web Toolkit (GWT), to
-create your JS Input problem.
-
-.. image:: /Images/JavaScriptInputExample.png
- :alt: Image of a JavaScript Input problem
-
-************************************************************
-Create a Custom JavaScript Display and Grading Problem
-************************************************************
-
-#. Create your JavaScript application, and then upload all files associated with
-   that application to the **Files & Uploads** page.
-#. In the unit where you want to create the problem, click **Problem**
-   under **Add New Component**, and then click the **Advanced** tab.
-#. Click **Custom JavaScript Display and Grading**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, modify the example code according to your problem.
-
-   - All problems have more than one element. Most problems conform to the same-origin
-     policy (SOP), meaning that all elements have the same protocol, host, and port.
-     For example, **http**://**store.company.com**:**81**/subdirectory_1/JSInputElement.html and
-     **http**://**store.company.com**:**81**/subdirectory_2/JSInputElement.js have the same protocol
-     (http), host (store.company.com), and port (81).
-
-     If any elements of your problem use a different protocol, host, or port, you need to
-     bypass the SOP. For example, **https**://**info.company.com**/JSInputElement2.html
-     uses a different protocol, host, and port. To bypass the SOP, change
-     **sop="false"** in line 8 of the example code to **sop="true"**. For more information, see the same-origin policy
-     page on the `Mozilla Developer Network <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Same_origin_policy_for_JavaScript>`_
-     or on `Wikipedia <http://en.wikipedia.org/wiki/Same_origin_policy>`_.
-#. If you want your problem to have a **Save** button, click the **Settings** tab, and then set
-   **Maximum Attempts** to a number larger than zero.
-#. Click **Save**.
-
-================================
-Re-create the Example Problem
-================================
-
-To re-create the example problem above, you'll need the following files.
-
-   - webGLDemo.html
-   - webGLDemo.js
-   - webGLDemo.css
-   - three.min.js
-
-To download these files in a .zip archive, go to http://files.edx.org/JSInput.zip.
-
-.. note:: If you need to bypass the SOP, you'll also need the **jschannel.js** file, and your webGLDemo.html file will be slightly different. To download all these files in a .zip archive, go to http://files.edx.org/JSInput_BypassSOP.zip.
-
-#. Download and unpackage the files in either the JSInput.zip file or the JSInput_BypassSOP.zip file.
-#. On the **Files & Uploads** page, upload all the files from the .zip file.
-#. Create a new custom JavaScript display and grading problem component.
-#. On the **Settings** tab, set **Maximum Attempts** to a number larger than
-   zero.
-#. In the problem component editor, replace the example code with the code below.
-#. Click **Save.**
-
-================================
-JavaScript Input Problem Code
-================================
-
-.. code-block:: xml
-
-    <problem display_name="webGLDemo">
-    In the image below, click the cone.
-
-    <script type="loncapa/python">
-    import json
-    def vglcfn(e, ans):
-        '''
-        par is a dictionary containing two keys, "answer" and "state"
-        The value of answer is the JSON string returned by getGrade
-        The value of state is the JSON string returned by getState
-        '''
-        par = json.loads(ans)
-        # We can use either the value of the answer key to grade
-        answer = json.loads(par["answer"])
-        return answer["cylinder"]  and not answer["cube"]
-        # Or we can use the value of the state key
-        '''
-        state = json.loads(par["state"])
-        selectedObjects = state["selectedObjects"]
-        return selectedObjects["cylinder"] and not selectedObjects["cube"]
-        '''
-    </script>
-    <customresponse cfn="vglcfn">
-        <jsinput
-            gradefn="WebGLDemo.getGrade"
-            get_statefn="WebGLDemo.getState"
-            set_statefn="WebGLDemo.setState"
-            width="400"
-            height="400"
-            html_file="/static/webGLDemo.html"
-        />
-    </customresponse>
-    </problem>
-
-
-.. note::    When you create this problem, keep the following in mind.
-
- - The webGLDemo.js file defines the three JavaScript functions (**WebGLDemo.getGrade**, **WebGLDemo.getState**, and **WebGLDemo.setState**).
-
- - The JavaScript input problem code uses **WebGLDemo.getGrade**, **WebGLDemo.getState**, and **WebGLDemo.setState** to grade, save, or restore a problem. These functions must be global in scope.
-
- - **WebGLDemo.getState** and **WebGLDemo.setState** are optional. You only have to define these functions if you want to conserve the state of the problem.
-
- - **Width** and **height** represent the dimensions of the IFrame that holds the application.
-
- - When the problem opens, the cone and the cube are both blue, or "unselected." When you click either shape once, the shape becomes yellow, or "selected." To unselect the shape, click it again. Continue clicking the shape to select and unselect it.
-
- - The response is graded as correct if the cone is selected (yellow) when the user clicks **Check**.
-
- - Clicking **Check** or **Save** registers the problem's current state.
-
-
-.. _JS Input Problem XML:
-
-******************************
-JavaScript Input Problem XML 
-******************************
-
-JSInput allows problem authors to turn stand-alone HTML files into problems that can be integrated into the edX platform. Since its aim is flexibility, it can be seen as the input and client-side equivalent of **CustomResponse**.
-
-A JSInput exercise creates an IFrame in a static HTML page, and passes the return value of author-specified functions to the enclosing response type (generally **CustomResponse**). JSInput can also store and retrieve state.
-
-========
-Template
-========
-
-The following is the basic format of a JSInput problem:
-
-.. code-block:: xml
-
- <problem>
-        <script type="loncapa/python">
- def all_true(exp, ans): return ans == "hi"
-        </script>
-        <customresponse cfn="all_true">
-            <jsinput gradefn="gradefn" 
-                height="500"
-                get_statefn="getstate"
-                set_statefn="setstate"
-                html_file="/static/jsinput.html"/>
-        </customresponse>
- </problem>
-
-The accepted attributes are:
-
-==============  ==============  =========  ==========
-Attribute Name   Value Type     Required   Default
-==============  ==============  =========  ==========
-html_file        URL string     Yes        None
-gradefn          Function name  Yes        `gradefn`
-set_statefn      Function name  No         None
-get_statefn      Function name  No         None
-height           Integer        No         `500`
-width            Integer        No         `400`
-==============  ==============  =========  ==========
-
-========================
-Required Attributes
-========================
-
-* **html_file**
-
-  The **html_file** attribute specifies the HTML file that the IFrame will point to. The HTML file
-  must be located in the content directory.
-
-  The IFrame is created using the sandbox attribute. Although pop-ups, scripts, and pointer locks are allowed, the IFrame cannot access its parent's attributes.
-
-  The HTML file must contain a **gradefn** function that the JSInput file can access. To determine whether the **gradefn** function is accessible, in the console, make sure that **gradefn** returns the right thing. When JSInput uses the **gradefn** function, `gradefn` is called with `gradefn`.call(`obj`), where **obj** is the object-part of **gradefn**. For example, if **gradefn** is **myprog.myfn**, JSInput calls **myprog.myfun.call(myprog)**. (This is to ensure "`this`" continues to refer to what `gradefn` expects.)
-
-  Aside from that, more or less anything goes. Note that currently there is no support for inheriting CSS or JavaScript from the parent (aside from the Chrome-only **seamless** attribute, which is set to True by default).
-
-* **gradefn**
-
-  The **gradefn** attribute specifies the name of the function that will be called when a user clicks **Check**, and that returns the student's answer. Unless both the **get_statefn** and **set_statefn** attributes are also used, this answer is passed as a string to the enclosing response type. In the **customresponse** example above, this means **cfn** will be passed this answer as ``ans``.
-
-  If the **gradefn** function throws an exception when a student attempts to submit a problem, the submission is aborted, and the student receives a generic alert. The alert can be customised by making the exception name ``Waitfor Exception``; in that case, the alert message will be the exception message.
-
-  .. important:: To make sure the student's latest answer is passed correctly, make sure that the **gradefn** function is not asynchronous. Additionally, make sure that the function returns promptly. Currently the student has no indication that her answer is being calculated or produced.
-
-========================
-Optional Attributes
-========================
-
-* **set_statefn**
-
-  Sometimes a problem author will want information about a student's previous answers ("state") to be saved and reloaded. If the attribute **set_statefn** is used, the function given as its value will be passed the state as a string argument whenever there is a state, and the student returns to a problem. The function has the responsibility to then use this state approriately.
-
-  The state that is passed is:
-
-  * The previous output of **gradefn** (i.e., the previous answer) if **get_statefn** is not defined.
-  * The previous output of **get_statefn** (see below) otherwise.
-
-  It is the responsibility of the iframe to do proper verification of the argument that it receives via **set_statefn**.
-
-* **get_statefn**
-
-  Sometimes the state and the answer are quite different. For instance, a problem that involves using a javascript program that allows the student to alter a molecule may grade based on the molecule's hydrophobicity, but from the hydrophobicity it might be incapable of restoring the state. In that case, a
-  *separate* state may be stored and loaded by **set_statefn**. Note that if **get_statefn** is defined, the answer (i.e., what is passed to the enclosing response type) will be a json string with the following format:
-
-  .. code-block:: xml
-
-      {
-          answer: `[answer string]`
-          state: `[state string]`
-      }
-
-
-  The enclosing response type must then parse this as json.
-
-* **height** and **width**
-
-  The **height** and **width** attributes are straightforward: they specify the height and width of the IFrame. Both are limited by the enclosing DOM elements, so for instance there is an implicit max-width of around 900. 
-
-  In the future, JSInput may attempt to make these dimensions match the HTML file's dimensions (up to the aforementioned limits), but currently it defaults to `500` and `400` for **height** and **width**, respectively.
-
-
diff --git a/docs/en_us/course_authors/source/exercises_tools/custom_python.rst b/docs/en_us/course_authors/source/exercises_tools/custom_python.rst
deleted file mode 100644
index f5b0a3b4b9..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/custom_python.rst
+++ /dev/null
@@ -1,290 +0,0 @@
-.. _Write Your Own Grader:
-
-##############################
-Write-Your-Own-Grader Problem
-##############################
-
-In custom Python-evaluated input (also called "write-your-own-grader" problems), the grader uses a Python script that you create and embed in the problem to evaluates a student's response or provide hints. These problems can be any type. Numerical input and text input problems are the most popular write-your-own-grader problems.
-
-.. image:: /Images/CustomPythonExample.png
- :alt: Image of a write your own grader problem
-
-Custom Python-evaluated input problems can include the following:
-
-* :ref:`Chemical Equation`
-* :ref:`Custom JavaScript`
-* :ref:`Gene Explorer`
-* :ref:`Molecule Editor`
-* :ref:`Protein Builder`
-
-.. list-table::
-   :widths: 20 80
-
-   * - ``<script type="loncapa/python">``
-     - Indicates that the problem contains a Python script.
-   * - ``<customresponse cfn="test_add_to_ten">``
-     - 
-   * - ``<customresponse cfn="test_add" expect="20">``
-     - 
-   * - <textline size="10" correct_answer="3"/>
-     - This tag includes the ``size``, ``correct_answer``, and ``label`` attributes. The ``correct_answer`` attribute is optional.
-
-You can create one of these problems in :ref:`Answer Tag Format` or :ref:`Script Tag Format`.
-
-.. _Answer Tag Format:
-
-**************************
-Answer Tag Format
-**************************
-
-The answer tag format encloses the Python script in an ``<answer>`` tag:
-
-.. code-block:: xml
-
-  <answer>
-  if answers[0] == expect:
-      correct[0] = 'correct'
-      overall_message = 'Good job!'
-  else:
-      correct[0] = 'incorrect'
-      messages[0] = 'This answer is incorrect'
-      overall_message = 'Please try again'
-  </answer>
-
-.. important:: Python honors indentation. Within the ``<answer>`` tag, you must begin your script with no indentation.
-
-The Python script interacts with these variables in the global context:
-
-* ``answers``: An ordered list of answers the student provided. For example, if the student answered ``6``, ``answers[0]`` would equal ``6``.
-* ``expect``: The value of the ``expect`` attribute of ``<customresponse>`` (if provided).
-* ``correct``: An ordered list of strings indicating whether the student answered the question correctly.  Valid values are ``"correct"``, ``"incorrect"``, and ``"unknown"``.  You can set these values in the script.
-* ``messages``: An ordered list of messages that appear under each response field in the problem. You can use this to provide hints to users. For example, if you include ``messages[0] = "The capital of California is Sacramento"``, that message appears under the first response field in the problem.
-* ``overall_message``: A message that appears beneath the entire problem. You can use this to provide a hint that applies to the entire problem rather than a particular response field.
-
-========================================================================
-Create a Custom Python-Evaluated Input Problem in Answer Tag Format
-========================================================================
-
-To create a custom Python-evaluated input problem using an ``<answer>`` tag:
-
-#. In the unit where you want to create the problem, click **Problem**
-   under **Add New Component**, and then click the **Advanced** tab.
-#. Click **Custom Python-Evaluated Input**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, replace the example code with the following code.
-#. Click **Save**.
-
-.. code-block:: xml
-
-    <problem>
-        <p>What is the sum of 2 and 3?</p>
-
-        <customresponse expect="5">
-        <textline math="1" />
-        </customresponse>
-
-        <answer>
-    if answers[0] == expect:
-        correct[0] = 'correct'
-        overall_message = 'Good job!'
-    else:
-        correct[0] = 'incorrect'
-        messages[0] = 'This answer is incorrect'
-        overall_message = 'Please try again'
-        </answer>
-    </problem>
-
-.. important:: Python honors indentation. Within the ``<answer>`` tag, you must begin your script with no indentation.
-
-.. _Script Tag Format:
-
-**************************
-Script Tag Format
-**************************
-
-The script tag format encloses a Python script that contains a "check function" in a ``<script>`` tag, and adds the ``cfn`` attribute of the ``<customresponse>`` tag to reference that function:
-
-.. code-block:: xml
-
-  <problem>
-
-  <script type="loncapa/python">
-
-  def test_add(expect, ans):
-      try:
-          a1=int(ans[0])
-          a2=int(ans[1])
-          return (a1+a2) == int(expect)
-      except ValueError:
-          return False
-
-  def test_add_to_ten(expect, ans):
-      return test_add(10, ans)
-
-  </script>
-
-  <p>Enter two integers that sum to 10. </p>
-  <customresponse cfn="test_add_to_ten">
-          <textline size="10"/><br/>
-          <textline size="10"/>
-  </customresponse>
-
-  </problem>
-
-**Important**: Python honors indentation. Within the ``<script>`` tag, the ``def check_func(expect, ans):`` line must have no indentation.
-
-The **check** function accepts two arguments:
-
-* ``expect`` is the value of the ``expect`` attribute of ``<customresponse>`` (if provided)
-* ``answer`` is either:
-
-    * The value of the answer the student provided, if the problem only has one response field.
-    * An ordered list of answers the student provided, if the problem has multiple response fields.
-
-The **check** function can return any of the following to indicate whether the student's answer is correct:
-
-* ``True``: Indicates that the student answered correctly for all response fields.
-* ``False``: Indicates that the student answered incorrectly. All response fields are marked as incorrect.
-* A dictionary of the form: ``{ 'ok': True, 'msg': 'Message' }``
-  If the dictionary's value for ``ok`` is set to ``True``, all response fields are marked correct; if it is set to ``False``, all response fields are marked incorrect. The ``msg`` is displayed beneath all response fields, and it may contain XHTML markup.
-* A dictionary of the form 
-
-.. code-block:: xml
-      
-    
-    { 'overall_message': 'Overall message',
-        'input_list': [
-            { 'ok': True, 'msg': 'Feedback for input 1'},
-            { 'ok': False, 'msg': 'Feedback for input 2'},
-            ... ] }
-
-The last form is useful for responses that contain multiple response fields. It allows you to provide feedback for each response field individually, as well as a message that applies to the entire response.
-
-Example of a checking function:
-
-.. code-block:: python
-
-    def check_func(expect, answer_given):
-        check1 = (int(answer_given[0]) == 1)
-        check2 = (int(answer_given[1]) == 2)
-        check3 = (int(answer_given[2]) == 3)
-        return {'overall_message': 'Overall message',
-                    'input_list': [
-                        { 'ok': check1, 'msg': 'Feedback 1'},
-                        { 'ok': check2, 'msg': 'Feedback 2'},
-                        { 'ok': check3, 'msg': 'Feedback 3'} ] }
-
-The function checks that the user entered ``1`` for the first input, ``2`` for the  second input, and ``3`` for the third input. It provides feedback messages for each individual input, as well as a message displayed beneath the entire problem.
-
-========================================================================
-Create a Custom Python-Evaluated Input Problem in Script Tag Format
-========================================================================
-
-To create a custom Python-evaluated input problem using a ``<script>`` tag:
-
-#. In the unit where you want to create the problem, click **Problem**
-   under **Add New Component**, and then click the **Advanced** tab.
-#. Click **Custom Python-Evaluated Input**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, replace the example code with the following code.
-#. Click **Save**.
-
-**Problem Code**:
-
-.. code-block:: xml
-
-  <problem>
-  <p>This question has two parts.</p>
-
-  <script type="loncapa/python">
-
-  def test_add(expect, ans):
-      try:
-          a1=int(ans[0])
-          a2=int(ans[1])
-          return (a1+a2) == int(expect)
-      except ValueError:
-          return False
-
-  def test_add_to_ten(expect, ans):
-      return test_add(10, ans)
-
-  </script>
-
-  <p>Part 1: Enter two integers that sum to 10. </p>
-  <customresponse cfn="test_add_to_ten">
-          <textline size="10" correct_answer="3" label="Integer #1"/><br/>
-          <textline size="10" correct_answer="7" label="Integer #2"/>
-  </customresponse>
-
-  <p>Part 2: Enter two integers that sum to 20. </p>
-  <customresponse cfn="test_add" expect="20">
-          <textline size="10" label="Integer #1"/><br/>
-          <textline size="10" label="Integer #2"/>
-  </customresponse>
-
-  <solution>
-      <div class="detailed-solution">
-          <p>Explanation</p>
-          <p>For part 1, any two numbers of the form <i>n</i> and <i>10-n</i>, where <i>n</i> is any integer, will work. One possible answer would be the pair 0 and 10.</p>
-          <p>For part 2, any pair <i>x</i> and <i>20-x</i> will work, where <i>x</i> is any real number with a finite decimal representation. Both inputs have to be entered either in standard decimal notation or in scientific exponential notation. One possible answer would be the pair 0.5 and 19.5. Another way to write this would be 5e-1 and 1.95e1.</p>
-      </div>
-  </solution>
-  </problem>
-
-**Templates**
-
-The following template includes answers that appear when the student clicks **Show Answer**. 
-
-.. code-block:: xml
-
-  <problem>
-
-  <script type="loncapa/python">
-  def test_add(expect,ans):
-    a1=float(ans[0])
-    a2=float(ans[1])
-    return (a1+a2)== float(expect)
-  </script>
-
-  <p>Problem text</p>
-  <customresponse cfn="test_add" expect="20">
-          <textline size="10" correct_answer="11" label="Integer #1"/><br/>
-          <textline size="10" correct_answer="9" label="Integer #2"/>
-  </customresponse>
-
-      <solution>
-          <div class="detailed-solution">
-            <p>Solution or Explanation Heading</p>
-            <p>Solution or explanation text</p>
-          </div>
-      </solution>
-  </problem>
-
-The following template does not return answers when the student clicks **Show Answer**. If your problem doesn't include answers for the student to see, make sure to set **Show Answer** to **Never** in the problem component.
-
-.. code-block:: xml
-
-  <problem>
-
-  <script type="loncapa/python">
-  def test_add(expect,ans):
-    a1=float(ans[0])
-    a2=float(ans[1])
-    return (a1+a2)== float(expect)
-  </script>
-
-  <p>Enter two real numbers that sum to 20: </p>
-  <customresponse cfn="test_add" expect="20">
-          <textline size="10"  label="Integer #1"/><br/>
-          <textline size="10"  label="Integer #2"/>
-  </customresponse>
-
-      <solution>
-          <div class="detailed-solution">
-            <p>Solution or Explanation Heading</p>
-            <p>Solution or explanation text</p>
-          </div>
-      </solution>
-  </problem>
-
diff --git a/docs/en_us/course_authors/source/exercises_tools/drag_and_drop.rst b/docs/en_us/course_authors/source/exercises_tools/drag_and_drop.rst
deleted file mode 100644
index a36732ded0..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/drag_and_drop.rst
+++ /dev/null
@@ -1,256 +0,0 @@
-.. _Drag and Drop:
-
-##########################
-Drag and Drop Problem
-##########################
-
-In drag and drop problems, students respond to a question by dragging text or objects to a specific location on an image.
-
-.. image:: /Images/DragAndDropProblem.png
- :alt: Image of a drag and drop problem
-
-*********************************
-Create a Drag and Drop Problem
-*********************************
-
-To create a simple drag and drop problem in which students drag labels onto an image, you'll upload the image that you want students to drag labels onto, and then create a Problem component.
-
-#. On the **Files & Uploads** page, upload your image file. For more information about uploading files, see :ref:`Add Files to a Course`.
-#. In the unit where you want to create the problem, click **Problem** under **Add New Component**, and then click the **Advanced** tab.
-#. Click **Drag and Drop**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, replace the example text with the text of your problem.
-#. In the ``<drag_and_drop_input>`` tag, replace **https://studio.edx.org/c4x/edX/DemoX/asset/L9_buckets.png** with the URL of your image file on the **Files & Uploads** page (for example, **/static/Image.png**). 
-#. For at least one ``<draggable>`` tag, replace the text of the **label** attribute with the text of the label you want students to drag. For example, if you want students to drag the word "Iceland" onto your image, the new tag would resemble the following:
-   
-   ``<draggable id="1" label="Iceland"/>``
-
-8. Repeat the previous step for all the labels that you want to use. Make sure that the **id** attribute is different for each ``<draggable>`` tag.
-#. Determine the coordinates and radius of the correct area on the image.  
-#. Under ``correct_answer = {``, add an entry for each label, using the following format. These values are in pixels:
-
-    ``'id':    [[x coordinate, y coordinate], radius]``
-
-    For example, if your image is 600 pixels wide and 400 pixels high, and you want your students to drag the Iceland label to an area in the upper-left part of the image and drag a Sweden label near the lower-right part of your image, the code would resemble the following (where 2 is the ID for the Sweden label):
-
-    .. code-block:: xml
-
-        correct-answer = {
-                '1':    [[50, 50], 75]
-                '2':    [[550, 350], 75]}
-
-    .. note:: Make sure the code contains the closing curly brace (**}**). 
-#. Click **Save**.
-
-==========================================
-Sample Drag and Drop Problem Code
-==========================================
-
-To create the drag and drop problem that appears in the image above, you'll download two files from edX, upload these files to to the **Files & Uploads** page, and then add the code for the problem to a Problem component.
-
-#. Download the following files from edX:
-
-  * Allopurinol.gif
-  * AllopurinolAnswer.gif
-
-  To download both these files in a .zip archive, click http://files.edx.org/DragAndDropProblemFiles.zip.
-
-2. Upload the Allopurinol.gif and AllopurinolAnswer.gif files to the **Files & Uploads** page.
-#. In the unit where you want to create the problem, click **Problem** under **Add New Component**, and then click the **Advanced** tab.
-#. Click **Drag and Drop**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, replace the example code with the following code.
-#. Click **Save**.
-
-**Problem Code**:
-
-.. code-block:: xml
-
-  <problem>
-    <p> Allopurinol is a drug used to treat and prevent gout, a very painful form of arthritis. Once only a “rich man’s disease”, gout has become more and more common in recent decades – affecting about 3 million people in the United States alone. Deposits of needle-like crystals of uric acid in connective tissue or joint spaces cause the symptoms of swelling, stiffness and intense pain. Individuals with gout overproduce uric acid because they cannot eliminate it efficiently. Allopurinol treats and prevents gout by stopping the overproduction of uric acid through inhibition of an enzyme required for the synthesis of uric acid. </p>
-    <p> You are shown one of many possible molecules. On the structure of allopurinol below, identify the functional groups that are present by dragging the functional group name listed onto the appropriate target boxes on the structure. If you want to change an answer, you have to drag off the name as well. You may need to scroll through the names of functional groups to see all options. </p>
-    <customresponse>
-      <drag_and_drop_input no_labels="true" one_per_target="true" target_outline="true" img="/static/Allopurinol.gif">
-        <draggable can_reuse="true" label="methyl" id="1"/>
-        <draggable can_reuse="true" label="hydroxyl" id="2"/>
-        <draggable can_reuse="true" label="amino" id="3"/>
-        <draggable can_reuse="true" label="carboxyl" id="4"/>
-        <draggable can_reuse="true" label="aldehyde" id="5"/>
-        <draggable can_reuse="true" label="phosphate" id="6"/>
-        <draggable can_reuse="true" label="sulfhydryl" id="7"/>
-        <draggable can_reuse="true" label="phenyl" id="8"/>
-        <draggable can_reuse="true" label="none" id="none"/>
-        <target id="0" h="53" w="66" y="55.100006103515625" x="131.5"/>
-        <target id="1" h="113" w="55" y="140.10000610351562" x="181.5"/>
-      </drag_and_drop_input>
-      <answer type="loncapa/python"> 
-  correct_answer = [ {'draggables': ['2'], 'targets': ['0' ], 'rule':'unordered_equal' }, 
-  {'draggables': ['none'], 'targets': ['1' ], 'rule':'unordered_equal' }] 
-  if draganddrop.grade(submission[0], correct_answer): 
-      correct = ['correct'] 
-  else: 
-      correct = ['incorrect'] 
-      </answer>
-    </customresponse>
-    <solution>
-      <img src="/static/AllopurinolAnswer.gif"/>
-    </solution>
-  </problem>
-
-
-.. _Drag and Drop Problem XML:
-
-*********************************
-Drag and Drop Problem XML
-*********************************
-
-================================
-Template for Simple Problem
-================================
-
-.. code-block:: xml
-
-  <problem>
-  <p>PROBLEM TEXT</p>
-   <customresponse>
-        <drag_and_drop_input img="/static/TARGET_IMAGE.png">
-            <draggable id="1" label="LABEL 1"/>
-            <draggable id="2" label="LABEL 2"/>
-        </drag_and_drop_input>
-        <answer type="loncapa/python">
-  correct_answer = {
-          '1':      [[x, y], radius],
-          '2':      [[x, y], radius]}
-  if draganddrop.grade(submission[0], correct_answer):
-      correct = ['correct']
-  else:
-      correct = ['incorrect']
-          </answer>
-      </customresponse>
-
-
-================================
-Template for Advanced Problem
-================================
-
-.. code-block:: xml
-
-  <problem>
-      <customresponse>
-          <text>
-              <p>PROBLEM TEXT</p>
-          </text>
-          <drag_and_drop_input img="/static/TARGET_IMAGE.png" target_outline="true" one_per_target="true" no_labels="true" label_bg_color="rgb(222, 139, 238)">
-              <draggable id="1" label="LABEL 1" />
-              <draggable id="2" label="LABEL 2" />
-              <target id="A" x="NUMBER" Y="NUMBER" w="X+WIDTH" h="Y+HEIGHT"/>
-              <target id="B" x="NUMBER" Y="NUMBER" w="X+WIDTH" h="Y+HEIGHT"/>
-          </drag_and_drop_input>
-          <answer type="loncapa/python">
-  correct_answer = [{
-      'draggables': ['1', '2'],
-      'targets': ['A', 'B' ],
-      'rule':'anyof'
-  }]
-  if draganddrop.grade(submission[0], correct_answer):
-      correct = ['correct']
-  else:
-      correct = ['incorrect']
-          </answer>
-      </customresponse>
-  </problem>
-
-========
-Tags
-========
-
-* ``<customresponse>``: Indicates that the problem is a custom response problem.
-* ``<drag_and_drop_input/>``: Indicates the custom response problem is a drag and drop problem.
-* ``<draggable/>``: Specifies a single object that a student will drag onto the base image.
-* ``<target>``: Specifies the location on the base image where a draggable must be dropped.
-
-**Tag:** ``<drag_and_drop_input/>``
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - img (required)
-       - Relative path to an image that will be the base image. All draggables can be dragged onto it.
-     * - target_outline 
-       - Specifies whether an outline (gray dashed line) should be drawn around targets (if they are specified). It can be either 'true' or 'false'. If not specified, the targets do not have outlines.
-     * - one_per_target 
-       - Specify whether to allow more than one draggable to be placed onto a single target. It can be either 'true' or 'false'. If not specified, the default value is 'true'.
-     * - no_labels (required)
-       - default is false, in default behaviour if label is not set, label is obtained from id. If no_labels is true, labels are not automatically populated from id, and one can not set labels and obtain only icons.
-
-  Children
-
-     * ``<draggable>``
-     * ``<target>``
-
-**Tag:** ``<draggable/>``
-
-Specifies a single draggable object in a drag and drop problem.
-
-A draggable is what the user must drag out of the slider and drop onto the base image. After a drag operation, if the center of the draggable is located outside the rectangular dimensions of the image, it will be returned to the slider.
-
-For the grader to work, each draggable must have a unique ID.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - id (required)
-       - Unique identifier of the draggable object.
-     * - label (optional)
-       - Text label that the user sees.
-     * - icon (optional)
-       - For draggables that are images, the relative path to the image file.
-     * - can_reuse
-       - true or false, default is false. If true, same draggable can be used multiple times.
-
-  Children
-  
-  (none)
-
-**Tag:** ``<target>``
-
-Specifies the location on the base image where a student must drop a draggable item. By design, if the center of a draggable lies within the target (i.e. in the rectangle defined by [[x, y], [x + w, y + h]],  it is within the target. Otherwise, it is outside.
-
-If you specify at least one target, and a student drops a draggable item on a location that is outside a target, the draggable item returns to the slider.
-
-If you don't specify a target, a student can drop a draggable item anywhere on the base image.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - id (required)
-       - Unique identifier of the target object.
-     * - x
-       - X-coordinate on the base image where the top left corner of the target will be positioned.
-     * - y
-       - Y-coordinate on the base image where the top left corner of the target will be positioned.
-     * - w
-       - Width of the target, in pixels.
-     * - h
-       - Height of the target, in pixels.
-
-  Children
-
-  (none)
-
-
-For more information about how to create drag and drop problems, see `XML Format of Drag and Drop Input
-<https://edx.readthedocs.org/en/latest/course_data_formats/drag_and_drop/drag_and_drop_input.html>`_.
-
diff --git a/docs/en_us/course_authors/source/exercises_tools/dropdown.rst b/docs/en_us/course_authors/source/exercises_tools/dropdown.rst
deleted file mode 100644
index 87f6c9ba43..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/dropdown.rst
+++ /dev/null
@@ -1,182 +0,0 @@
-.. _Dropdown:
-
-#####################
-Dropdown Problem
-#####################
-
-Dropdown problems allow the student to choose from a collection of answer options, presented as a dropdown list. Unlike multiple choice problems, whose answers are always visible directly below the question, dropdown problems don't show answer choices until the student clicks the dropdown arrow.
-
-.. image:: /Images/DropdownExample.png
- :alt: Image of a dropdown problem
-
-.. note:: Answers in dropdown problems cannot contain greater than signs or less than signs, also known as angle bracket characters (<>). If answer options for your problem must contain angle brackets, use the :ref:`multiple choice<Multiple Choice>` problem type.
-
-********************************
-Create a Dropdown Problem
-********************************
-
-You can create dropdown problems in the Simple Editor or in the Advanced Editor.
-
-.. note:: All problems must include labels for accessibility. The label generally includes the text of the main question in your problem. To add a label for a common problem, surround the text of the label with angle brackets pointed toward the text (>>label text<<).
-
-================
-Simple Editor
-================
-
-To create a dropdown problem, follow these steps.
-
-#. Under **Add New Component**, click **Problem**.
-#. In the **Select Problem Component Type** screen, click
-   **Dropdown** on the **Common Problem Types** tab.
-#. In the new Problem component that appears, click **Edit**.
-#. Replace the default text with the text for your problem. Enter each of the possible 
-   answers on the same line, separated by commas.
-
-   .. note:: Answers in dropdown problems cannot contain greater than signs or less than signs, also known as angle bracket characters (<>). If answer options for your problem must contain angle brackets, use the :ref:`multiple choice<Multiple Choice>` problem type.
-
-#. Determine the text of the problem to use as a label, and then surround that text with two sets of angle brackets (>><<).
-#. Select all the answer options, and then click the dropdown button. 
-      
-   .. image:: /Images/ProbCompButton_Dropdown.png
-    :alt: Image of the dropdown button
-      
-   When you do this, a double set of brackets ([[ ]]) appears and surrounds the 
-   answer options.
-      
-#. Inside the brackets, surround the correct answer with parentheses.
-#. In the component editor, select the text of the explanation, and then click the 
-   explanation button to add explanation tags around the text.
-
-   .. image:: /Images/ProbCompButton_Explanation.png
-    :alt: Image of the explanation button
-
-#. On the **Settings** tab, specify the settings that you want. 
-#. Click **Save**.
-
-For the example problem above, the text in the Problem component is the
-following.
-
-::
-
-    >>What type of data are the following?<<
-
-    Age:
-    [[Nominal, Discrete, (Continuous)]]
-    Age, rounded to the nearest year:
-    [[Nominal, (Discrete), Continuous]]
-    Life stage - infant, child, and adult:
-    [[(Nominal), Discrete, Continuous]]
-
-================
-Advanced Editor
-================
-
-To create this problem in the Advanced Editor, click the **Advanced** tab in the Problem component editor, and then replace the existing code with the following code.
-
-**Problem Code:**
-
-.. code-block:: xml
-
-  <problem>
-  <p>
-    <em>This exercise first appeared in HarvardX's PH207x Health in Numbers: Quantitative Methods in Clinical &amp; Public Health Research course, fall 2012.</em>
-  </p>
-  <p>What type of data are the following?</p>
-  <p>Age:</p>
-  <optionresponse>
-    <optioninput options="('Nominal','Discrete','Continuous')" correct="Continuous" label="Age"/>
-  </optionresponse>
-  <p>Age, rounded to the nearest year:</p>
-  <optionresponse>
-    <optioninput options="('Nominal','Discrete','Continuous')" correct="Discrete" label="Age, rounded to the nearest year"/>
-  </optionresponse>
-  <p>Life stage - infant, child, and adult:</p>
-  <optionresponse>
-    <optioninput options="('Nominal','Discrete','Continuous')" correct="Nominal" label="Life stage"/>
-  </optionresponse>
-  </problem>
-
-.. _Dropdown Problem XML:
-
-************************
-Dropdown Problem XML
-************************
-
-========
-Template
-========
-
-.. code-block:: xml
-
-  <problem>
-  <p>
-    Problem text</p>
-  <optionresponse>
-    <optioninput options="('Option 1','Option 2','Option 3')" correct="Option 2" label="label text"/>
-  </optionresponse>
-    <solution>
-      <div class="detailed-solution">
-      <p>Explanation or Solution Header</p>
-      <p>Explanation or solution text</p>
-      </div>
-    </solution>
-  </problem>
-
-.. code-block:: xml
-
-  <problem>
-   <p>Problem text</p>
-    <optionresponse>
-     options="('A','B')"
-      correct="A"/>
-      label="label text"
-    </optionresponse>
-   
-    <solution>
-      <div class="detailed-solution">
-      <p>Explanation or Solution Header</p>
-      <p>Explanation or solution text</p>
-      </div>
-    </solution>
-  </problem>
-
-========
-Tags
-========
-
-* ``<optionresponse>`` (required): Indicates that the problem is a dropdown problem.
-* ``<optioninput>`` (required): Lists the answer options.
-
-**Tag:** ``<optionresponse>``
-
-Indicates that the problem is a dropdown problem.
-
-  Attributes
-
-  (none)
-
-  Children
-
-  * ``<optioninput>``  
-
-**Tag:** ``<optioninput>``
-
-Lists the answer options.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - options (required)
-       - Lists the answer options. The list of all answer options is surrounded by parentheses. Individual answer options are surrounded by single quotation marks (') and separated by commas (,).
-     * - correct (required)
-       - Indicates whether an answer is correct. Possible values are "true" and "false". Only one **correct** attribute can be set to "true".
-     * - label (required)
-       - Specifies the name of the response field.
-  
-  Children
-
-  (none)
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/external_graders.rst b/docs/en_us/course_authors/source/exercises_tools/external_graders.rst
deleted file mode 100644
index a2aab863f2..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/external_graders.rst
+++ /dev/null
@@ -1,220 +0,0 @@
-.. _External Grader:
-
-###########################
-External Grader
-###########################
-
-
-.. _External Grader Overview:
-
-*******************
-Overview
-*******************
-
-An external grader is a service that receives student responses to a problem, processes those responses, and returns feedback and a problem grade to the edX platform. You build and deploy an external grader separately from the edX platform.
-
-See the following sections for more information:
-
-* :ref:`External Grader Example`
-* :ref:`External Graders and XQueue`
-* :ref:`The XQueue Interface`
-* :ref:`Building an External Grader`
-* :ref:`Create a Code Response Problem`
-
-.. _External Grader Example:
-
-***************************
-External Grader Example
-***************************
-
-An external grader is particularly useful for software programming courses where students are asked to submit complex code.  The grader can run tests that you define on that code and return results to a student.
-
-For example, you define a problem that requires students to submit Python code, and create a set of tests that an external grader can run to verify the submissions. When a student enters Python code for the problem and clicks **Check**, the code is sent to the grader for testing.  If the code passes all tests, the grader returns the score and a string indicating that the solution is correct.
-
-.. image:: /Images/external-grader-correct.png
- :alt: Image of a students view of a programming problem that uses an external grader, with a correct result 
-
-
-The external grader can return a string with results, which the student can see by clicking **See full output**. This can be particularly useful when the solution is not correct and you want to return information about the failed tests. For example:
-
-.. image:: /Images/external-grader-incorrect.png
- :alt: Image of a students view of a programming problem that uses an external grader, with a correct result 
-
-.. _External Graders and XQueue:
-
-**************************************
-External Graders and XQueue
-**************************************
-
-The edX Platform communicates with your external grader through XQueue.  XQueue provides students' input to the grader; it then receives results from the grader and returns them to students.  
-
-Student submissions are collected in XQueue, where they remain until the grader actively retrieves, or pulls, the next submission from the queue for grading.
-
-The external grader polls the XQueue through a RESTful interface at a regular interval. When the external grader pulls a submission, it runs the tests on it, then pushes the response back to XQueue through the RESTful interface. XQueue then delivers the response to the edX Learning Management System.
-
-For example code of an external grader that uses Pull mode, see the `Stanford-Online repository xqueue_pull_ref <https://github.com/Stanford-Online/xqueue_pull_ref>`_.
-
-
-============================
-External Grader Workflow
-============================
-
-The following steps show the complete process:
-
-#. The student either enters code or attaches a file for a problem, then clicks Check.
-#. The external grader pulls the code from XQueue.
-#. The external grader runs the tests that you created on the code.
-#. The external grader returns the grade for the submission, as well as any results in a string, to XQueue. 
-#. The XQueue delivers the results to the edX Learning Management System.
-#. The student sees the problem results and the grade.
-
-
-==================
-The XQueue Name
-==================
-
-Your course will use a specific XQueue name. You use this name when creating problems in edX Studio. You get this name from your edX Program Manager. As edX hosts many XQueues for different courses, it is critical that you use the exact XQueue name in your problems, as described in the section :ref:`Create a Code Response Problem`. 
-
-
-.. _The XQueue Interface:
-
-**************************************
-The XQueue Interface
-**************************************
-
-The student submission sent from XQueue to the grader, and the response sent from the grader to XQueue, are JSON objects, as described below.
-
-.. note:: XQueue does not send the the student ID to the external grader. Your grader cannot access student IDs or associate student IDs with submissions.
-
-For the code for the XQueue interface, see the file `urls.py in the edX XQueue repository <https://github.com/edx/xqueue/blob/master/queue/urls.py>`_.
-
-======================================================
-Inputs to the External Grader
-======================================================
-
-The grader receives student submissions as a JSON object with two keys:
-
-* **student_response**: A string containing the student's code submission.  The string comes from either input the student enters in the edX Learning Management System or a file the student attaches.
-
-* **grader_payload**: An optional string that you can specify when creating the problem. For more information, see the section :ref:`Create a Code Response Problem`.
-
-For example::
-
- {
-   "xqueue_body":
-   "{
-     "student_response": "def double(x):\n return 2*x\n", 
-     "grader_payload": "problem_2"
-    }"
- }
-
-======================================================
-External Grader Responses
-======================================================
-
-After running tests and recording results for a submission, the grader must return information by posting a JSON response. The JSON string contains an indication if the submission was correct, the score, and any message the tests create.
-
-In the following example, the grader returns a JSON string that indicates the submission was correct, the score was 1, and a message::
-
- { 
-  "correct": true, 
-  "score": 1, 
-  "msg": "<p>The code passed all tests.</p>" 
- }
-
-.. _Building an External Grader:
-
-****************************
-Building an External Grader
-****************************
-
-Course staff, not edX, is responsible for building and deploying the external grader. 
-
-In addition to creating tests that are specific to the problems you use in your course, there are four areas that you must plan for when building an external grader:
-
-* :ref:`Scale`
-* :ref:`Security`
-* :ref:`Reliability and Recovery`
-* :ref:`Testing`
-
-
-.. _Scale:
-
-==================
-Scale
-==================
-
-Your external grader must be able to scale to support the number of students in your course.
-
-Keep in mind that student submissions will likely come in spikes, not in an even flow.  For example, you should expect the load to be much greater than average in the hours before an exam is due.  Therefore, you should verify that the external grader can process submissions from a majority of students in a short period of time. 
-
-.. _Security:
-
-==================
-Security
-==================
-
-Students are submitting code that executes directly on a server that you are responsible for. It is possible that a student will submit malicious code. Your system must protect against this and ensure that the external grader runs only code that is relevant to the course problems.  How you implement these protections depends on the programming language you are using and your deployment architecture.  You must ensure that malicious code won't damage your server.
-
-.. _Reliability and Recovery:
-
-==============================
-Reliability and Recovery
-==============================
-
-Once your course starts, many students will submit code at any possible time, and expect to see results quickly.  If your external grader is prone to failure or unexpected delays, the student experience will be poor.
-
-Therefore, you must ensure that your grader has high availability and can recover from errors. Prior to your course starting, you must have a plan to immediately notify the team responsible for operating your grader, as well as edX operations, when the grader fails. In collaboration with edX, you should develop a procedure to quickly identify the cause of failure, which can be your grader or edX's XQueue.
-
-Contact your edX Program Manager for more information.
-
-If you know the grader will be unavailable at a certain time for maintenance, you should :ref:`Add a Course Update`. 
-
-.. _Testing:
-
-==================
-Testing
-==================
-
-You should test your grader thoroughly before your course starts.  Be sure to test incorrect code as well as correct code to ensure that the grader responds with appropriate scores and messages.
-
-.. _Create a Code Response Problem:
-
-********************************
-Create a Code Response Problem
-********************************
-
-You create a code response problem in edX Studio by adding a common blank problem, then editing the XML problem definition in the :ref:`Advanced Editor`.
-
-See :ref:`Working with Problem Components` for more information.
-
-Following is a basic example of the XML definition of a problem that uses an external grader::
-
- <problem display_name="Problem 6">
-    <text>
-        <p>Write a program that prints "hello world".</p>
-    </text>
-    <coderesponse queuename="my_course_queue">
-        <textbox rows="10" cols="80" mode="python" tabsize="4"/>
-        <codeparam>
-            <initial_display>
-              # students please write your program here
-              print ""
-            </initial_display>
-            <answer_display>
-              print "hello world"
-            </answer_display>
-            <grader_payload>
-            {"output": "hello world", "max_length": 2}
-            </grader_payload>
-        </codeparam>
-    </coderesponse>
- </problem>
-
-Note the following about the XML definition:
-
-* **queuename**: The value of the queuename attribute of the <coderesponse> element maps to an XQueue that edX sets up for the course.  You get this name from your edX Program Manager. You must use this exact name in order for the problem to communicate with the correct XQueue.
-
-* **Input Type**: In this example, the input type is specificed by the **<textbox>** element.  When you use <textbox>, the student enters code in a browser field when viewing the course unit.  The other element you can use to specify the input type is <filesubmission>, which enables the student to attach and submit a code file in the unit.
-
-* **<grader_payload>**: You can use the <grader_payload> element to send information to the external grader in the form of a JSON object. For example, you can use <grader_payload> to tell the grader which tests to run for this problem.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/full_screen_image.rst b/docs/en_us/course_authors/source/exercises_tools/full_screen_image.rst
deleted file mode 100644
index 24aa5be150..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/full_screen_image.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-.. _Full Screen Image:
-
-######################
-Full Screen Image Tool
-######################
-
-Some large images are difficult for students to view in the courseware.  The full screen image tool allows students to enlarge the image, so they can see all the detail in context.
-
-****************************************
-The Student View of a Full Screen Image
-****************************************
-
-The student sees the full screen image in a unit page. When the student hovers the mouse pointer over the image, the **Fullscreen** button appears:
-
-.. image:: /Images/image-modal.png
- :alt: Image of the full screen image tool with the Full Screen button.
-
-When the student clicks **Fullscreen**, the image opens and expands in the full browser window.  The buttons **Close**, **Zoom In**, and **Zoom Out** appear:
-
-.. image:: /Images/image-modal-window.png
- :alt: Image of the Image Modal tool with the Full Screen button.
-
-The student can then zoom in on the image, and drag the image to view the desired part of it:
-
-.. image:: /Images/image-modeal-zoomed.png
- :alt: Image of the Image Modal tool with the Full Screen button.
-
-******************************
-Create a Full Screen Image
-******************************
-
-#. Upload your image file to the **Files & Uploads** page. For more information about how to do this, see :ref:`Add Files to a Course`.
-
-#. Under **Add New Component**, click **html**, and then click **Full Screen Image**.
-
-#. In the new component that appears, click **Edit**.
-
-#. In the component editor, replace the default title, remove the instructional paragraph, and add text as needed.
-
-#. Switch to the **HTML** tab.
-
-#. Replace the following placeholders with your own content.
-
-   * Replace the value of the <a> element's href attribute with the path to your image. Do not change the value of the class attribute. For example:
-
-     **<a href="/static/Image1.jpg" class="modal-content">**
-
-   * Replace the value of the <img> element's src attribute with the path to your image. For example:
-     
-     **<img alt="Full screen image" src="/static/Image1.jpg"/>**
-
-   * Ensure that the value of the href and src attributes are the same, and that you do not change the class attribute. Your sample code should look like the following:
-
-   .. code-block:: xml
-
-     <h2>Sample Image Modal</h2>
-     <a href="/static/Image1.jpg" class="modal-content">
-     <img alt="Full screen image" src="/static/Image1.jpg"/>
-     </a>
-
-   .. note:: You can use this same HTML code in any HTML component, not just those components you created as full screen images.
-
-#. Click **Save** to save the HTML component.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/gene_explorer.rst b/docs/en_us/course_authors/source/exercises_tools/gene_explorer.rst
deleted file mode 100644
index 14bff451eb..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/gene_explorer.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-.. _Gene Explorer:
-
-##################
-Gene Explorer Tool
-##################
-
-The Gene Explorer (GeneX), from the biology department at `UMB <http://www.umb.edu/>`_, simulates the transcription, splicing, processing, and translation of a small hypothetical eukaryotic gene. GeneX allows students to make specific mutations in a gene sequence, and it then calculates and displays the effects of the mutations on the mRNA and protein. 
-
-Specifically, the Gene Explorer does the following:
-
-#. Finds the promoter and terminator
-#. Reads the DNA sequence to produce the pre-mRNA
-#. Finds the splice sites
-#. Splices and tails the mRNA
-#. Finds the start codon
-#. Translates the mRNA
-
-.. image:: /Images/GeneExplorer.png
-  :alt: Image of the Gene Explorer
-
-For more information about the Gene Explorer, see `The Gene Explorer <http://intro.bio.umb.edu/GX/>`_.
-
-********************
-Gene Explorer Code
-********************
-
-.. code-block:: xml
-
-  <problem>
-  <p>Make a single base pair substitution mutation in the gene below that results in a protein that is longer than the protein produced by the original gene. When you are satisfied with your change and its effect, click the <b>SUBMIT</b> button.</p>
-  <p>Note that a "single base pair substitution mutation" is when a single base is changed to another base; for example, changing the A at position 80 to a T. Deletions and insertions are not allowed.</p>
-  <script type="loncapa/python">
-  def genex_grader(expect,ans):
-      if ans=="CORRECT": return True
-      import json
-      ans=json.loads(ans)
-      return ans["genex_answer"]=="CORRECT"
-  </script>
-  <customresponse cfn="genex_grader">
-  <editageneinput width="818" height="1000" dna_sequence="TAAGGCTATAACCGAGATTGATGCCTTGTGCGATAAGGTGTGTCCCCCCCCAAAGTGTCGGATGTCGAGTGCGCGTGCAAAAAAAAACAAAGGCGAGGACCTTAAGAAGGTGTGAGGGGGCGCTCGAT" genex_dna_sequence="TAAGGCTATAACCGAGATTGATGCCTTGTGCGATAAGGTGTGTCCCCCCCCAAAGTGTCGGATGTCGAGTGCGCGTGCAAAAAAAAACAAAGGCGAGGACCTTAAGAAGGTGTGAGGGGGCGCTCGAT" genex_problem_number="2"/>
-  </customresponse>
-  </problem>
-
-In this code:
-
-* **width** and **height** specify the dimensions of the application, in pixels.
-* **genex_dna_sequence** is the default DNA sequence that appears when the problem opens.
-* **dna_sequence** contains the application's state and the student's answer. This value must be the same as **genex_dna_sequence**. 
-* **genex_problem_number** specifies the number of the problem. This number is based on the five gene editor problems in the MITx 7.00x course--for example, if you want this problem to look like the second gene editor problem in the 7.00x course, you would set the **genex_problem_number** value to 2. The number must be 1, 2, 3, 4, or 5.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/google_hangouts.rst b/docs/en_us/course_authors/source/exercises_tools/google_hangouts.rst
deleted file mode 100644
index f7d2c5d4da..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/google_hangouts.rst
+++ /dev/null
@@ -1,134 +0,0 @@
-.. _Google Instant Hangout:
-
-###########################################
-Google Instant Hangout Tool
-###########################################
-
-This chapter describes how you can use instant hangouts in your course. See:
-
-* :ref:`Hangouts_Overview`
-* :ref:`Instant Hangouts in Your Course`
-* :ref:`The Student Experience`
-* :ref:`Limitations`
-* :ref:`Create the Instant Hangout`
-
-.. _Hangouts_Overview:
-
-*****************
-Overview
-*****************
-
-You can add the ability for students to participate in instant hangouts directly from your course.
-
-With instant hangouts, students can:
-
-* Interact through live video and voice.
-* Share screens and watch videos together.
-* Collaborate on documents.
-
-For a full list of instant hangout features, see the `Google Hangouts page <http://www.google.com/+/learnmore/hangouts/>`_.
-
-.. note:: Students who want to participate in instant hangouts must have a Google account.  You should note this in your course materials.
-
-.. _Instant Hangouts in Your Course:
-
-**********************************
-Instant Hangouts in Your Course
-**********************************
-
-You can add one or more instant hangouts in your course. For example, you can add an instant hangout:
-
-* In a page, to provide students with a hangout for the entire course. See :ref:`Adding Pages to a Course` for more information.
-
-* In an HTML component, to provide a hangout for students working on that specific course unit. See :ref:`Working with HTML Components` for more information about creating HTML components.
-
-An instant hangout is specific to the page it is opened from. For example, students who join a hangout from one course unit interact among themselves, while students who join a hangout from another unit interact in a different hangout.
-
-.. _The Student Experience:
-
-*************************
-The Student Experience
-*************************
-
-When you add the instant hangout to your course, a control for the hangout appears on that page. The following example shows the control in a course unit. The control shows that the student can start the hangout and be the first participant.
-
-.. image:: /Images/hangout_unit.png
- :alt: Image of the instant hangout control on a unit
-
-To start the hangout, the student clicks **Start the Hangout**. (After the first student clicks **Start the Hangout**, other students see a **Join the Hangout** button.)
-
-The following example shows the control in a page when a hangout has already started. The control has a **Join the Hangout** button, and shows that one other student is already in the hangout.
-
-.. image:: /Images/hangout_static_page.png
- :alt: Image of the instant hangout control on a page
-
-To join the hangout, the student clicks **Join the Hangout**.
-
-If not already logged in, the student is prompted to log in to Google:
-
-.. image:: /Images/google_login.png
- :alt: Image of the Google login page
-
-Students who do not have a Google account can create one from the login page.
-
-After the student has logged in to Google, the hangout opens in a separate browser window:
-
-.. image:: /Images/GoogleHangout_WithPeople.png
- :alt: Image of the instant hangout
-
-.. _Limitations:
-
-****************
-Limitations
-****************
-
-Currently, only ten students can join a single instant hangout. You should note this in your course materials.
-
-Students in hangouts that are started from different pages in your course are counted separately. So you can have ten students participating in a hangout started from one unit, and ten other students in a hangout started from a different unit.
-
-.. _Create the Instant Hangout:
-
-**************************************************
-Create the Instant Hangout
-**************************************************
-
-To create an instant hangout in your course:
-
-#. Get the `instant hangout JavaScript file from GitHub <https://raw.github.com/google/instant-hangouts/master/instanthangouts-0.1.0.js>`_.
-
-#. Copy the text of this file into a text editor on your computer, and save the file as a JavaScript file (that is, when you save the file, change the extension from .txt to .js).
-
-   .. note::  Make sure that you copy the raw GitHub file, which does not contain formatting. Do not copy the formatted file. Any formatting will cause the JavaScript to not work correctly.
-
-#. Upload the JavaScript file to the **Files & Uploads** page in your course. See :ref:`Add Files to a Course` for more information.
-
-#. In either a page or an HTML component, open the HTML editor.
-
-#. On the first line, add the JavaScript file you uploaded in a <script> tag. For example, if your JavaScript file is named **instanthangouts-0.1.0.js**, you would enter the following::
-  
-    <script src='/static/instanthangouts-0.1.0.js'/>
-
-#. After the <script> tag, add::
-  
-    <div class='instanthangouts'/>
-
-#. Add any additional text and tags that you want.
-
-   For example, the complete HTML could be::
-
-    <p>Join an instant hangout by clicking the button below. 
-    You can use the hangout to have live video discussions with other students.</p>
-    <script src='/static/instanthangouts-0.1.0.js'></script>
-    <div class='instanthangouts'/>
-
-#. Test the instant hangout in your course.
-
-=============================
-Updating the JavaScript File
-=============================
-
-Google will periodically update the instant hangouts JavaScript file.  To receive update notifications, go to the `instant hangouts repository page <https://github.com/google/instant-hangouts/>`_, and then click **Watch** in the upper-right area of the page. 
-
-To use an updated JavaScript file in your course, we recommend that you copy the JavaScript from the repository into a file that has the same name as the file that you uploaded to your course. When you upload the new file, the new file replaces the previous file.
-
-.. warning:: If you include version numbers in the file names of uploaded files, you will have to edit any HTML components or pages that include an instant hangout control every time that you update the JavaScript file.
diff --git a/docs/en_us/course_authors/source/exercises_tools/iframe.rst b/docs/en_us/course_authors/source/exercises_tools/iframe.rst
deleted file mode 100644
index 40f054153e..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/iframe.rst
+++ /dev/null
@@ -1,95 +0,0 @@
-.. _IFrame:
-
-##################
-IFrame Tool
-##################
-
-An IFrame allows you to integrate ungraded exercises and tools from any Internet site into the body of your course. The IFrame appears inside an HTML component, and the exercise or tool appears inside the IFrame. IFrames can include your own tools or third-party tools. 
-
-.. image:: /Images/IFrame_1.png
-  :alt: IFrame tool showing a Euler line exercise
-  :width: 500
-
-IFrames are well-suited for tools that demonstrate a concept but that won't be graded or store student data. If you want to add a graded tool or exercise, add the tool as a :ref:`custom JavaScript problem<Custom JavaScript>` or an :ref:`LTI component<LTI Component>`. 
-
-For more information about IFrames, see the `IFrame specification <http://www.w3.org/wiki/HTML/Elements/iframe>`_.
-
-****************************
-Create an IFrame Tool
-****************************
-
-To add an exercise or tool in an IFrame, you'll create an IFrame HTML component and add the URL of the page that contains the exercise or tool to the component. You can also add text and images both before and after the IFrame.
-
-.. note:: The URL of the page that contains the exercise or tool must start with ``https`` instead of ``http``. If the URL starts with ``http``, you have to work with the owner of that page to find out if an ``https`` version is available. Some websites do not allow their content to be embedded in IFrames.
-
-#. Under **Add New Component**, click **html**, and then click **IFrame**.
-
-#. In the new component that appears, click **Edit**.
-
-#. In the toolbar in the component editor, click **HTML**.
-
-#. In the HTML source code editor, locate the following HTML (line 7). This HTML includes the ``<iframe>`` element:
-
-   .. code-block:: html
-
-      <p><iframe src="https://studio.edx.org/c4x/edX/DemoX/asset/eulerLineDemo.html" width="402" height="402" marginwidth="0" marginheight="0" frameborder="0" scrolling="no">You need an iFrame capable browser to view this.</iframe></p>
-
-5. Replace the default URL in the **src** attribute (**https://studio.edx.org/c4x/edX/DemoX/asset/eulerLineDemo.html**) with the URL of the page that contains the exercise or tool. **This URL must start with https**. Make sure you don't delete the quotation marks that surround the URL.
-
-#. Change the attributes in the IFrame element to specify any other settings that you want. For more information about these settings, see :ref:`IFrame Settings`. You can also change the text between the opening and closing ``<iframe>`` tags. A student only sees this text if the student uses a browser that does not support IFrames.
-
-7. Click **OK** to close the HTML source code editor and return to the Visual editor.
-
-#. In the Visual editor, replace the default text with your own text.
-
-#. Click **Save**.
-
-.. _IFrame Settings:
-
-======================
-IFrame Settings
-======================
-
-To specify settings for your IFrame, you'll add, remove, or change the attributes inside the opening ``<iframe>`` tag. The ``<iframe>`` tag **must** contain a **src** attribute that specifies the URL of the web page you want. Other attributes are optional. 
-
-You can add these attributes in any order you want.
-
-.. list-table::
-   :widths: 20 80
-   :header-rows: 1
- 
-   * - Attribute
-     - Description
-   * - **src** (required)
-     - Specifies the URL of the page that contains the exercise or tool.
-   * - **width** and **height** (optional)
-     - Specify the width and height of the IFrame, in pixels or as a percentage. To specify the value in pixels, enter numerals. To specify a percentage, enter numerals followed by a percent sign.
-
-       If you don't specify the width and height, the IFrame uses the dimensions that the linked page has set. These dimensions vary by website. If you change the width and height of the IFrame, the content from the linked page may be resized, or only part of the content may appear.
-
-   * - **marginwidth** and **marginheight** (optional)
-     - Specify the size of the space between the edges of the IFrame and your exercise or tool, in pixels.
-   * - **frameborder** (optional)
-     - Specifies whether a border appears around your IFrame. If the value is 0, no border appears. If the value is any positive number, a border appears.
-   * - **scrolling** (optional)
-     - Specifies whether a scrollbar appears to help users see all of the IFrame's content if your IFrame is smaller than the exercise or tool it contains. For example, if the content in your IFrame is very tall, you can set the IFrame's height to a smaller number and add a vertical scroll bar for users, as in the first image below.
-
-For example, compare how the different settings in each of the ``<iframe>`` elements below affect the IFrame. 
-
-.. code-block:: html
-
-      <p><iframe src="https://studio.edx.org/c4x/edX/DemoX/asset/eulerLineDemo.html" width="442" height="200" marginwidth="20" marginheight="20" frameborder="1" scrolling="yes">You need an iFrame capable browser to view this.</iframe></p>
-
-.. image:: /Images/IFrame_3.png
-   :alt: IFrame with only top half showing and vertical scroll bar on the side
-   :width: 500
-
-.. code-block:: html
-
-      <p><iframe src="https://studio.edx.org/c4x/edX/DemoX/asset/eulerLineDemo.html" width="550" height="250" marginwidth="30" marginheight="60" frameborder="1" scrolling="no">You need an iFrame capable browser to view this.</iframe></p>
-
-.. image:: /Images/IFrame_4.png
-   :alt: 
-   :width: 500
-
-For more information about IFrame attributes, see the `IFrame specification <http://www.w3.org/wiki/HTML/Elements/iframe>`_.
diff --git a/docs/en_us/course_authors/source/exercises_tools/image_mapped_input.rst b/docs/en_us/course_authors/source/exercises_tools/image_mapped_input.rst
deleted file mode 100644
index 56ff4147df..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/image_mapped_input.rst
+++ /dev/null
@@ -1,103 +0,0 @@
-.. _Image Mapped Input:
-
-###########################
-Image Mapped Input Problem
-###########################
-
-In an image mapped input problem, students click inside a defined area in an image. You define this area by including coordinates in the body of the problem.
-
-.. image:: /Images/ImageMappedInputExample.png
- :alt: Image of an image mapped input problem
-
-****************************************
-Create an Image Mapped Input Problem
-****************************************
-
-To create a image mapped input problem:
-
-#. In the unit where you want to create the problem, click **Problem**
-   under **Add New Component**, and then click the **Advanced** tab.
-#. Click **Image Mapped Input**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, replace the example code with your own code.
-#. Click **Save**.
-
-**Problem Code**:
-
-.. code-block:: xml
-
-  <problem>
-    <p><b>Example Problem</b></p>
-     <startouttext/>
-      <p>In the image below, click the triangle.</p>
-      <endouttext/>
-      <imageresponse>
-      <imageinput src="/static/threeshapes.png" width="220" height="150" rectangle="(80,40)-(130,90)" />
-      </imageresponse>
-  </problem>
-
-
-.. _Image Mapped Input Problem XML:
-
-******************************
-Image Mapped Input Problem XML 
-******************************
-
-==========
-Template
-==========
-
-.. code-block:: xml
-
-  <problem>
-    <startouttext/>
-      <p>In the image below, click the triangle.</p>
-    <endouttext/>
-        <imageresponse>
-         <imageinput src="IMAGE FILE PATH" width="NUMBER" height="NUMBER" rectangle="(X-AXIS,Y-AXIS)-(X-AXIS,Y-AXIS)" />
-        </imageresponse>
-  </problem>
-
-=====
-Tags
-=====
-
-* ``<imageresponse>``: Indicates that the problem is an image mapped input problem.
-* ``<imageinput>``: Specifies the image file and the region in the file that the student must click.
-
-**Tag:** ``<imageresponse>``
-
-Indicates that the problem is an image mapped input problem.
-
-  Attributes
-
-  (none)
-
-  Children
-
-  * ``<imageinput>``
-
-**Tag:** ``<imageinput>``
-
-Specifies the image file and the region in the file that the student must click.
-
-  Attributes
-
-   .. list-table::
-      :widths: 20 80
-
-      * - Attribute
-        - Description
-      * - src (required)
-        - The URL of the image
-      * - height (required)
-        - The height of the image, in pixels
-      * - width (required)
-        - The width of the image, in pixels
-      * - rectangle (required)
-        - An attribute with four embedded values in the format (<start_width>,<start_height>)-(<end_width>,<end-height>). All coordinates start with (0,0) in the top left corner and increase in value toward the bottom right corner, very similar to the progression of reading English. The two coordinates defined form the two opposite corners of a box which a student can click inside of.
-
-  Children
-  
-  (none)
-
diff --git a/docs/en_us/course_authors/source/exercises_tools/index.rst b/docs/en_us/course_authors/source/exercises_tools/index.rst
deleted file mode 100644
index e55b6cd5e9..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/index.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-.. _Exercises and Tools Index:
-
-############################
-Creating Exercises and Tools
-############################
-
-Use the chapters in this section to understand how to create exercises and
-tools in your course.
-
-For information on how to develop your course content in the Studio Outline
-page, see :ref:`Developing Your Course Index`.
-
-For information on building specific course component types, see :ref:`Creating
-Course Content Index`.
-
-
-.. toctree::
-   :maxdepth: 2
-   
-   create_exercises_and_tools
-   annotation
-   checkbox
-   chemical_equation
-   circuit_schematic_builder
-   conditional_module
-   custom_javascript
-   drag_and_drop
-   dropdown
-   external_graders
-   full_screen_image
-   gene_explorer
-   google_hangouts
-   iframe
-   image_mapped_input
-   lti_component
-   math_expression_input
-   molecule_editor
-   molecule_viewer
-   multiple_choice
-   mult_choice_num_input
-   numerical_input
-   open_response_assessment
-   periodic_table
-   poll
-   problem_with_hint
-   problem_in_latex
-   protein_builder
-   text_input
-   word_cloud
-   custom_python
-   zooming_image
-   mathjax
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/lti_component.rst b/docs/en_us/course_authors/source/exercises_tools/lti_component.rst
deleted file mode 100644
index da628396f1..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/lti_component.rst
+++ /dev/null
@@ -1,204 +0,0 @@
-.. _LTI Component:
-
-###############
-LTI Component
-###############
-
-You may have discovered or developed an external learning application
-that you want to add to your online course. Or, you may have a digital
-copy of your textbook that uses a format other than PDF. You can add
-external learning applications or textbooks to Studio by using a
-Learning Tools Interoperability (LTI) component. The LTI component is
-based on the `IMS Global Learning Tools
-Interoperability <http://www.imsglobal.org/LTI/v1p1p1/ltiIMGv1p1p1.html>`_
-version 1.1.1 specifications.
-
-You can use an LTI component in several ways.
-
-* You can add external LTI content that is displayed only, such as textbook
-  content that doesn’t require a student response.
-
-* You can add external LTI content that requires a student response. An external
-  provider will grade student responses.
-
-* You can use the component as a placeholder for syncing with an external
-  grading system.
-
-For example, the following LTI component incorporates a Cerego tool that students interact with. 
-
-.. image:: /Images/LTIExample.png
-   :alt: Cerego LTI component example
-
-.. _LTI Information:
-
-************************
-Obtain LTI Information
-************************
-
-Before you create an LTI component from an external LTI provider in a
-unit, you need the following information.
-
--  The **launch URL** (if the LTI component requires a student response
-   that will be graded). You obtain the launch URL from the LTI
-   provider. The launch URL is the URL that Studio sends to the external
-   LTI provider so that the provider can send back students’ grades.
-
-- The **LTI Passports** policy key. This policy key has three parts: an LTI ID,
-  a client key, and a client secret.
-
-  -  The **LTI ID**. This is a value that you create to refer to the external LTI
-     provider. You should create an LTI ID that you can remember easily.
-
-     The LTI ID can contain uppercase and lowercase alphanumeric
-     characters, as well as underscore characters (_). It can be any length. For example, you may create an LTI ID that is
-     as simple as **test_lti_id**, or your LTI ID may be a string of
-     numbers and letters such as  **id_21441** or
-     **book_lti_provider_from_new_york**.
-  -  The **client key**. This value is a sequence of characters that you
-     obtain from the LTI provider. The client key is used for
-     authentication and can contain any number of characters. For example,
-     your client key may be **b289378-f88d-2929-ctools.school.edu**.
-  -  The **client secret**. This value is a sequence of characters that
-     you obtain from the LTI provider. The client secret is used for
-     authentication and can contain any number of characters. For example,
-     your client secret can be something as simple as **secret**, or it
-     may be a string of numbers and letters such as **23746387264** or
-     **yt4984yr8**.
-
-  To create the **LTI Passports** policy key, combine the LTI ID, client key, and client secret in the following format (make sure to include the colons):
-
-  ``lti_id:client_key:client_secret``
-
-  For example, an **LTI Passports** policy key may resemble any of the following:
-
-  ``test_lti_id:b289378-f88d-2929-ctools.school.edu:secret``
-  
-  ``id_21441:b289378-f88d-2929-ctools.school.edu:23746387264``
-
-  ``book_lti_provider_from_new_york:b289378-f88d-2929-ctools.company.com:yt4984yr8``
-
-************************
-Create an LTI Component
-************************
-
-Creating an LTI component in your course has three steps.
-
-#. Add LTI to the **Advanced Module List**  policy key.
-#. Register the LTI provider.
-#. Create the LTI component in an individual unit.
-
-======================================================
-Step 1. Add LTI to the Advanced Module List Policy Key
-======================================================
-
-#. On the **Settings** menu, click **Advanced Settings**.
-
-#. In the field for the **Advanced Module List** policy key, place your cursor
-   between the brackets.
-
-#. Enter ``“lti”``. Make sure to include the quotation marks, but not the
-   period.
-
-   .. image:: /Images/LTIPolicyKey.png
-     :width: 500
-     :alt: Image of the advanced_modules key in the Advanced Settings page, with the LTI value added
-
-.. note:: If the **Advanced Module List** field already contains text, place your cursor directly
-   after the closing quotation mark for the final item, and then enter a comma
-   followed by ``“lti”`` (make sure that you include the quotation marks).
-
-4. At the bottom of the page, click **Save Changes**.
-
-The page refreshes automatically. At the top of the page,
-you see a notification that your changes have been saved.
-
-==========================================
-Step 2. Register the External LTI Provider
-==========================================
-
-To register the external LTI provider, you’ll add the **LTI Passports** policy
-key to the course's advanced settings.
-
-#. On the **Advanced Settings** page, locate the **LTI Passports**
-   policy key.
-
-#. Place your cursor between the brackets.
-
-#. Enter the **LTI Passports** policy key surrounded by quotation marks.
-
-   For example, the text in the **LTI Passports** field may resemble the following.
-
-   ``"test_lti_id:b289378-f88d-2929-ctools.umich.edu:secret"``
-
-   If you have multiple LTI providers, separate the values for each **LTI
-   Passports** policy key with a comma. Make sure to surround each entry with
-   quotation marks.
-
-   .. code-block:: xml
-
-      "test_lti_id:b289378-f88d-2929-ctools.umich.edu:secret",
-      "id_21441:b289378-f88d-2929-ctools.school.edu:23746387264",
-      "book_lti_provider_from_new_york:b289378-f88d-2929-ctools.company.com:yt4984yr8"
-
-4. At the bottom of the page, click **Save Changes**.
-
-The page refreshes automatically. At the top of the page, you see a
-notification that your changes have been saved, and you can see your entries
-for the **LTI Passports** policy key.
-
-==========================================
-Step 3. Add the LTI Component to a Unit
-==========================================
-
-#. In the unit where you want to create the problem, click **Advanced**
-   under **Add New Component**, and then click **LTI**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, specify the settings that you want. See :ref:`LTI Component Settings` for a description of each setting.
-#. Click **Save**.
-
-.. _LTI Component settings:
-
-**********************
-LTI Component Settings
-**********************
-
-.. list-table::
-   :widths: 10 80
-   :header-rows: 1
-
-   * - Setting
-     - Description
-   * - Custom Parameters
-     - Enables you to add one or more custom parameters. For example, if you've added an e-book, you can set a custom parameter that opens the e-book to a specific page. You could also use a custom parameter to set the background color of the LTI component.
-
-       Every custom parameter has a key and a value. You must add the key and value in the following format.
-
-       ::
-
-          key=value
-
-       For example, a custom parameter may resemble the following.
-
-       ::
-
-          bgcolor=red
-
-          page=144
-
-       To add a custom parameter, click **Add**.
-   * - Display Name
-     - Specifies the name of the problem. This name appears above the problem and in the course ribbon at the top of the page in the courseware. Analytics reports may also use the display name to identify this component.
-   * - Hide External Tool
-     - Indicates whether you want to launch an external tool or to use this component as a placeholder for syncing with an external grading system. If you set the value to **True**, Studio hides the **Launch** button and any IFrames for this component. By default, this value is set to **False**.
-   * - LTI ID
-     - Specifies the LTI ID for the external LTI provider. This value must be the same LTI ID that you entered on the **Advanced Settings** page.
-   * - LTI URL
-     - Specifies the URL of the external tool that this component launches. This setting is applicable when **Hide External Tool** is set to False.
-   * - Open in New Page
-     - Indicates whether the problem opens in a new page. If you set this value to **True**,          the student clicks a link that opens the LTI content in a new window. If you set this value to **False**, the LTI content opens in an IFrame in the current page. This setting is applicable when **Hide External Tool** is set to False.
-   * - Scored
-     - Indicates whether the LTI component receives a numerical score from the external LTI system. By default, this value is set to **False**.
-   * - Weight
-     - Specifies the number of points possible for the problem. By default, if an external LTI provider grades the problem, the problem is worth 1 point, and a student’s score can be any value between 0 and 1. This setting is applicable when **Scored** is set to **True**.
-
-       For more information about problem weights and computing point scores, see :ref:`Problem Weight`.
diff --git a/docs/en_us/course_authors/source/exercises_tools/math_expression_input.rst b/docs/en_us/course_authors/source/exercises_tools/math_expression_input.rst
deleted file mode 100644
index b9fe7ee78b..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/math_expression_input.rst
+++ /dev/null
@@ -1,187 +0,0 @@
-.. _Math Expression Input:
-
-####################################
-Math Expression Input Problems
-####################################
-
-In math expression input problems, students enter text that represents a mathematical expression into a field, and text is converted to a symbolic expression that appears below that field. Unlike numerical input problems, which only allow integers and a few select constants, math expression problems can include unknown variables and more complicated symbolic expressions. 
-
-.. image:: /Images/MathExpressionInputExample.png
- :alt: Image of math expression input problem
-
-For more information about characters that students can enter, see :ref:`Math Response Formatting for Students`.
-
-The grader uses a numerical sampling to determine whether the student's response matches the instructor-provided math expression, to a specified numerical tolerance. The instructor must specify the allowed variables in the expression as well as the range of values for each variable.
-
-.. warning:: Math expression input problems cannot currently include negative numbers raised to fractional powers, such as (-1)^(1/2). Math expression input problems can include complex numbers raised to fractional powers, or positive non-complex numbers raised to fractional powers.
-
-When you create a math expression input problem in Studio, you'll use `MathJax <http://www.mathjax.org>`_ to change your plain text into "beautiful math." For more information about how to use MathJax in Studio, see :ref:`MathJax in Studio`.
-
-************************************************
-Create a Math Expression Input Problem
-************************************************
-
-To create a math expression input problem:
-
-#. In the unit where you want to create the problem, click **Problem**
-   under **Add New Component**, and then click the **Advanced** tab.
-#. Click **Math Expression Input**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, replace the example code with your own code. To practice, you may want to use the sample problem code below.
-#. Click **Save**.
-
-**Sample Problem Code**
-
-.. code-block:: xml
-
-  <problem>
-    <p>Some problems may ask for a mathematical expression. Practice creating mathematical expressions by answering the questions below.</p>
-
-    <p>Write an expression for the product of R_1, R_2, and the inverse of R_3.</p>
-    <formularesponse type="ci" samples="R_1,R_2,R_3@1,2,3:3,4,5#10" answer="$VoVi">
-      <responseparam type="tolerance" default="0.00001"/>
-      <formulaequationinput size="40" label="Enter the equation"/>
-    </formularesponse>
-
-  <script type="loncapa/python">
-  VoVi = "(R_1*R_2)/R_3"
-  </script>
-
-    <p>Let <i>x</i> be a variable, and let <i>n</i> be an arbitrary constant. What is the derivative of <i>x<sup>n</sup></i>?</p>
-  <script type="loncapa/python">
-  derivative = "n*x^(n-1)"
-  </script>
-    <formularesponse type="ci" samples="x,n@1,2:3,4#10" answer="$derivative">
-      <responseparam type="tolerance" default="0.00001"/>
-      <formulaequationinput size="40"  label="Enter the equation"/>
-    </formularesponse>
-
-    <solution>
-      <div class="detailed-solution">
-        <p>Explanation or Solution Header</p>
-        <p>Explanation or solution text</p>
-      </div>
-    </solution>
-  </problem>
-
-.. _Math Expression Input Problem XML:
-
-**********************************
-Math Expression Input Problem XML
-**********************************
-
-============
-Templates
-============
-
-.. code-block:: xml
-
-  <problem>
-    <p>Write an expression for the product of R_1, R_2, and the inverse of R_3.</p>
-    <formularesponse type="ci" samples="R_1,R_2,R_3@1,2,3:3,4,5#10" answer="R_1*R_2/R_3">
-      <responseparam type="tolerance" default="0.00001"/> 
-      <formulaequationinput size="40"  label="Enter the equation" />
-    </formularesponse>
-  </problem>
-
-.. code-block:: xml
-
-  <problem>
-    <p>Problem text</p>
-    <formularesponse type="ci" samples="VARIABLES@LOWER_BOUNDS:UPPER_BOUNDS#NUMBER_OF_SAMPLES" answer="$VoVi">
-      <responseparam type="tolerance" default="0.00001"/>
-      <formulaequationinput size="20"  label="Enter the equation" />
-    </formularesponse>
-
-  <script type="loncapa/python">
-  PYTHON SCRIPT
-  </script>
-
-    <solution>
-      <div class="detailed-solution">
-        <p>Explanation or Solution Header</p>
-        <p>Explanation or solution text</p>
-      </div>
-    </solution>
-  </problem>
-
-====
-Tags
-====
-
-* ``<formularesponse>``
-* ``<formulaequationinput />``
-* ``<responseparam>``
-* ``<script>``
-
-**Tag:** ``<formularesponse>``
-
-Specifies that the problem is a math expression input problem. The ``<formularesponse>`` tag is similar to ``<numericalresponse>``, but ``<formularesponse>`` allows unknown variables.
-
-  Attributes
-
-  **type**: Can be "cs" (case sensitive, the default) or "ci" (case insensitive, so that capitalization doesn't matter in variable names).
-
-  **answer**: The correct answer to the problem, given as a mathematical expression. If you precede a variable name in the problem with a dollar sign ($), you can include a script in the problem that computes the expression in terms of that variable.
-
-  **samples**: Specifies important information about the problem in four lists:
-
-    * **variables**: A set of variables that students can enter.
-    * **lower_bounds**: For every defined variable, a lower bound on the numerical tests to use for that variable.
-    * **upper_bounds**: For every defined variable, an upper bound on the numerical tests to use for that variable.
-    * **num_samples**: The number of times to test the expression.
-
-    Commas separate items inside each of the four individual lists, and the at sign (@), colon (:), and pound sign (#) characters separate the four lists. The format is the following:
-
-    ``"variables@lower_bounds:upper_bounds#num_samples``
-
-    For example, a ``<formularesponse>`` tag that includes the **samples** attribute may look like either of the following.
-
-    ``<formularesponse samples="x,n@1,2:3,4#10">``
-
-    ``<formularesponse samples="R_1,R_2,R_3@1,2,3:3,4,5#10">``
-
-  Children
-
-  * ``<formulaequationinput />``
-
-**Tag:** ``<formulaequationinput />``
-
-Creates a response field where a student types an answer to the problem in plain text, as well as a second field below the response field where the student sees a typeset version of the plain text. The parser that renders the student's plain text into typeset math is the same parser that evaluates the student's response for grading.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - label (required)
-       - Specifies the name of the response field.
-     * - size (optional)
-       - Specifies the width, in characters, of the response field where students enter answers.
-
-  Children
-  
-  (none)
-
-**Tag:** ``<responseparam>``
-
-Used to define an upper bound on the variance of the numerical methods used to approximate a test for equality.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - default (required)
-       - A number or a percentage specifying how close the student and grader expressions must be. Failure to include a tolerance leaves expressions vulnerable to unavoidable rounding errors during sapling, causing some student input to be graded as incorrect, even if it is algebraically equivalent to the grader's expression.
-     * - type
-       - "tolerance"--defines a tolerance for a number
-
-  Children
-  
-  (none)
-
diff --git a/docs/en_us/course_authors/source/exercises_tools/mathjax.rst b/docs/en_us/course_authors/source/exercises_tools/mathjax.rst
deleted file mode 100644
index fa5703e45f..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/mathjax.rst
+++ /dev/null
@@ -1,62 +0,0 @@
-.. _MathJax in Studio:
-
-############################################
-A Brief Introduction to MathJax in Studio
-############################################
-
-To write clear and professional-looking symbols and equations, we use a LaTeX-like 
-language called
-`MathJax <http://www.google.com/url?q=http%3A%2F%2Fwww.mathjax.org%2F&sa=D&sntz=1&usg=AFQjCNGef2H-mZCdmCo7-kWHfu9fUGVCfg>`_.
-Your MathJax equations can appear with other text in the paragraph (inline equations) or
-on their own lines (display equations).
-
-- For inline equations, you can do either of the following.
-
-  - Surround your Mathjax expression with backslashes and **parentheses**.
-    
-    ``\( equation \)``
-
-  - Surround your Mathjax expression with [mathjaxinline] tags. Note that these 
-    tags use square brackets ([]).
-
-    [mathjaxinline] equation [/mathjaxinline]
-    
-- For display equations, you can do either of the following.
-
-  - Surround your Mathjax expression with backslashes and **brackets**.
-
-    ``\[ equation \]``
-
-  - Surround your Mathjax expression with [mathjax] tags. Note that these tags use 
-    square brackets ([]).
-
-    [mathjax] equation [/mathjax]
-
-You can use MathJax in HTML (text) components and in Problem components.
-
-.. note:: Complete MathJax documentation (together with a testing tool) can be 
-          found at `http://www.onemathematicalcat.org/MathJaxDocumentation/TeXSyntax.htm <http://www.google.com/url?q=http%3A%2F%2Fwww.onemathematicalcat.org%2FMathJaxDocumentation%2FTeXSyntax.htm&sa=D&sntz=1&usg=AFQjCNEV8PtCX6Csp0lW7lDKOLIKCOCkHg>`_.
-
-****************************
-HTML (Text) Components
-****************************
-
-In the HTML component editor, you can use MathJax both in Visual view and in HTML view.
-
-.. image:: /Images/MathJax_HTML.png
- :alt: Image of an HTML component with MathJax in both the Visual and HTML views
-
-*********************
-Problem Components
-*********************
-
-In the Problem component editor, you can use MathJax both in the Simple Editor 
-and in the Advanced Editor.
-
-In the example problem below, note that the Einstein equation in the
-explanation is enclosed in backslashes and parentheses, so it appears inline with the text. The
-Navier-Stokes equation is enclosed in backslashes and brackets, so it appears on its
-own line.
-
-.. image:: /Images/MathJax_Problem.png
- :alt: Image of a problem component with MathJax in both the Visual and HTML views
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/molecule_editor.rst b/docs/en_us/course_authors/source/exercises_tools/molecule_editor.rst
deleted file mode 100644
index 6be22c6956..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/molecule_editor.rst
+++ /dev/null
@@ -1,114 +0,0 @@
-.. _Molecule Editor:
-
-########################
-Molecule Editor Problem
-########################
-
-Studio offers two tools that you can use in discussions of molecules:
-
-* With the **molecule viewer**, you can create three-dimensional representations of molecules for students to view. For more information about this tool, see :ref:`Molecule Viewer`.
-* With the **molecule editor**, you can allow students to draw their own molecules. 
-
-Both tools use **JSmol**, a JavaScript-based molecular viewer from Jmol. In addition, the molecule editor problem type uses the JSME molecule editor created by Peter Erl and Bruno Bienfait. (You don't need to download either of these tools; Studio uses them automatically.) For more information about JSmol, see `JSmol <http://sourceforge.net/projects/jsmol/>`_. For more information about the JSME molecule editor, see `JSME Molecule Editor <http://peter-ertl.com/jsme/index.html>`_.
-
-Students can use the molecule editor to learn how to create molecules. The molecule editor allows students to draw molecules that follow the rules for covalent bond formation and formal charge, even if the molecules are chemically impossible, are unstable, or do not exist in living systems. The molecule editor warns students if they try to submit a structure that is chemically impossible.
-
-.. image:: /Images/Molecule_Editor.png
-  :width: 500
-  :alt: Image of the molecule editor
-
-.. _Create the Molecule Editor:
-
-******************************
-Create the Molecule Editor
-******************************
-
-To create a molecule editor problem:
-
-#. Under **Add New Component**, click **Problem**, and then click **Molecular Structure**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, modify the code to correspond to your problem.
-#. Click **Save**.
-
-.. _EMC Problem Code:
-
-========================
-Molecule Editor Code
-========================
-
-.. code-block:: xml
-
-  <problem>
-    <p>
-      A molecular structure problem lets the user use the JSME editor
-      component to draw a new molecule or update an existing drawing and then
-      submit their work.  Answers are specified as SMILES strings.
-    </p>
-    <p>
-      I was trying to draw my favorite molecule, caffeine. Unfortunately,
-      I'm not a very good biochemist. Can you correct my molecule?
-    </p>
-    <jsmeresponse>
-      <jsme>
-          <!-- 
-             You can set initial state of the editor by including a molfile
-             inside of the jsme tag. 
-             
-             Take care that indentation is preserved.  The molfile format is
-             sensitive to whitespace, so the best policy is to cut and paste
-             as-is on a new line without adjusting the indentation.  If you
-             do indent the molfile data, make sure every line is indented the
-             same amount using space characters only, no tabs.
-          -->
-          <initial-state>
-              CN2Cc1[nH]cnc1N(C)C2=O
-              JME 2014-06-28 Wed Jul 23 13:41:18 GMT-400 2014
-               
-               12 13  0  0  0  0  0  0  0  0999 V2000
-                  3.6373    2.1000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-                  3.6373    3.5000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-                  2.4249    4.2000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-                  1.2124    3.5000    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
-                  1.2124    2.1000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-                  2.4249    1.4000    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
-                  4.9688    1.6674    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
-                  5.7917    2.8000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-                  4.9688    3.9326    0.0000 N   0  0  0  0  0  0  0  0  0  0  0  0
-                  0.0000    1.4000    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0
-                  0.0000    4.2000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-                  2.4249    0.0000    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0
-                1  2  2  0  0  0  0
-                2  3  1  0  0  0  0
-                3  4  1  0  0  0  0
-                4  5  1  0  0  0  0
-                5  6  1  0  0  0  0
-                6  1  1  0  0  0  0
-                7  8  2  0  0  0  0
-                8  9  1  0  0  0  0
-                2  9  1  0  0  0  0
-                1  7  1  0  0  0  0
-                5 10  2  0  0  0  0
-                4 11  1  0  0  0  0
-                6 12  1  0  0  0  0
-              M  END
-          </initial-state>
-          <!-- Answers are specified as SMILES strings. -->
-          <answer>Cn1cnc2c1c(=O)n(C)c(=O)n2C</answer>
-      </jsme>
-      <!-- This answer is shown to the student when they click the 
-           "Show Answer" button in the UI.  It is not used for grading and 
-           should be human readable. -->
-      <answer>C8H10N4O2</answer>
-    </jsmeresponse>
-    <solution>
-      <div class="detailed-solution">
-        <p>Explanation</p>
-        <p>
-          Some scholars have hypothesized that the renaissance was made
-          possible by the introduction of coffee to Italy.  Likewise scholars
-          have linked the Enlightenment with the rise of coffee houses in
-          England.  
-        </p>
-      </div>
-    </solution>
-  </problem>
diff --git a/docs/en_us/course_authors/source/exercises_tools/mult_choice_num_input.rst b/docs/en_us/course_authors/source/exercises_tools/mult_choice_num_input.rst
deleted file mode 100644
index eb0af081ce..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/mult_choice_num_input.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-.. _Multiple Choice and Numerical Input:
-
-############################################
-Multiple Choice and Numerical Input Problem
-############################################
-
-You can create a problem that combines a multiple choice and numerical input problems. Students not only select a response from options that you provide, but also provide more specific information, if necessary.
-
-.. image:: /Images/MultipleChoice_NumericalInput.png
-  :alt: Image of a multiple choice and numerical input problem
-
-.. note:: Currently, students can only enter numerals in the text field. Students cannot enter words or mathematical expressions.
-
-.. _Create an MCNI Problem:
-
-********************************************************
-Create a Multiple Choice and Numerical Input Problem
-********************************************************
-
-To create a multiple choice and numerical input problem:
-
-#. In the unit where you want to create the problem, click **Problem** under **Add New Component**, and then click the **Advanced** tab.
-#. Click **Blank Advanced Problem**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, paste the code from below.
-#. Replace the example problem and response options with your own text.
-#. Click **Save**.
-
-.. _MCNI Problem Code:
-
-************************************************
-Multiple Choice and Numerical Input Problem Code
-************************************************
-
-.. code-block:: xml
-
-  <problem>
-  The numerical value of pi, rounded to two decimal points, is 3.24.
-  <choicetextresponse>
-  <radiotextgroup>
-  <choice correct="false">True.</choice>
-  <choice correct="true">False. The correct value is <numtolerance_input answer="3.14"/>.</choice>
-  </radiotextgroup>
-  </choicetextresponse>
-  </problem>
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/multiple_choice.rst b/docs/en_us/course_authors/source/exercises_tools/multiple_choice.rst
deleted file mode 100644
index f0d5f3b57e..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/multiple_choice.rst
+++ /dev/null
@@ -1,441 +0,0 @@
-.. _Multiple Choice:
-
-########################
-Multiple Choice Problem
-########################
-
-In multiple choice problems, students select one option from a list of answer options. Unlike with dropdown problems, whose answer choices don't appear until the student clicks the drop-down arrow, answer choices for multiple choice problems are always visible directly below the question.
-
-.. image:: /Images/MultipleChoiceExample.png
- :alt: Image of a multiple choice problem
-
-Multiple choice problems also have several advanced options, such as presenting a random set of choices to each student. For more information about these options, see :ref:`Multiple Choice Advanced Options`.
-
-****************************************
-Create a Multiple Choice Problem
-****************************************
-
-You can create multiple choice problems in the Simple Editor or in the Advanced Editor.
-
-.. note:: All problems must include labels for accessibility. The label generally includes the text of the main question in your problem. To add a label for a common problem, surround the text of the label with angle brackets pointed toward the text (>>label text<<).
-
-================
-Simple Editor
-================
-
-#. Under **Add New Component**, click **Problem**.
-#. In the **Select Problem Component Type** screen, click **Multiple
-   Choice** on the **Common Problem Types** tab.
-#. When the new Problem component appears, click **Edit**.
-#. In the component editor, replace the sample problem text with the text of your 
-   problem. Enter each answer option on its own line.
-#. Determine the text of the problem to use as a label, and then surround that text with two sets of angle brackets (>><<).
-#. Select all the answer options, and then click the multiple choice button. 
-   
-   .. image:: /Images/ProbCompButton_MultChoice.png
-    :alt: Image of the multiple choice button
-   
-   When you do this, the component editor adds a pair of parentheses next to each 
-   possible answer.
-   
-#. Add an "x" between the parentheses next to the correct answer.
-   
-#. In the component editor, select the text of the explanation, and then click the 
-   explanation button to add explanation tags around the text.
-
-   .. image:: /Images/ProbCompButton_Explanation.png
-    :alt: Image of the explanation button
-
-#. On the **Settings** tab, specify the settings that you want. 
-#. Click **Save**.
-
-For the example problem above, the text in the Problem component is the
-following.
-
-::
-
-    >>Lateral inhibition, as was first discovered in the horsehoe crab:<<
-
-    ( ) is a property of touch sensation, referring to the ability of crabs to 
-    detect nearby predators.
-    ( ) is a property of hearing, referring to the ability of crabs to detect 
-    low frequency noises.
-    (x) is a property of vision, referring to the ability of crabs eyes to 
-    enhance contrasts.
-    ( ) has to do with the ability of crabs to use sonar to detect fellow horseshoe 
-    crabs nearby.
-    ( ) has to do with a weighting system in the crabs skeleton that allows it to 
-    balance in turbulent water.
-
-    [Explanation]
-    Horseshoe crabs were essential to the discovery of lateral inhibition, a property of 
-    vision present in horseshoe crabs as well as humans, that enables enhancement of 
-    contrast at edges of objects as was demonstrated in class. In 1967, Haldan Hartline 
-    received the Nobel prize for his research on vision and in particular his research 
-    investigating lateral inhibition using horseshoe crabs.
-    [Explanation]
-
-================
-Advanced Editor
-================
-
-To create this problem in the Advanced Editor, click the **Advanced** tab in the Problem component editor, and then replace the existing code with the following code.
-
-.. code-block:: xml
-
-  <problem>
-  <p>Lateral inhibition, as was first discovered in the horsehoe crab...</p>
-  <multiplechoiceresponse>
-    <choicegroup type="MultipleChoice" label="Lateral inhibition, as was first discovered in the horsehoe crab">
-      <choice correct="false">is a property of touch sensation, referring to the ability of crabs to detect nearby predators.</choice>
-      <choice correct="false">is a property of hearing, referring to the ability of crabs to detect low frequency noises.</choice>
-      <choice correct="false">is a property of vision, referring to the ability of crabs eyes to enhance contrasts.</choice>
-      <choice correct="true">has to do with the ability of crabs to use sonar to detect fellow horseshoe crabs nearby.</choice>
-      <choice correct="false">has to do with a weighting system in the crabs skeleton that allows it to balance in turbulent water.</choice>
-    </choicegroup>
-  </multiplechoiceresponse>
-  <solution>
-    <div class="detailed-solution">
-      <p>Explanation</p>
-      <p>Horseshoe crabs were essential to the discovery of lateral inhibition, a property of vision present in horseshoe crabs as well as humans, that enables enhancement of contrast at edges of objects as was demonstrated in class. In 1967, Haldan Hartline received the Nobel prize for his research on vision and in particular his research investigating lateral inhibition using horseshoe crabs.</p>
-    </div>
-  </solution>
-  </problem>
-
-.. _Multiple Choice Advanced Options:
-
-*********************************************
-Advanced Options for Multiple Choice Problems
-*********************************************
-
-Multiple choice problems have several advanced options. You can change the order of answers in the problem, include explanations that appear when a student selects a specific incorrect answer, or present a random set of choices to each student. For more information, see the following:
-
-
-* :ref:`Shuffle Answers in a Multiple Choice Problem`
-* :ref:`Targeted Feedback in a Multiple Choice Problem`
-* :ref:`Answer Pools in a Multiple Choice Problem`
-
-.. _Shuffle Answers in a Multiple Choice Problem:
-
-=============================================
-Shuffle Answers in a Multiple Choice Problem
-============================================= 
-
-Optionally, you can configure a multiple choice problem so that it shuffles the order of possible answers.
-
-For example, one view of the problem could be:
-
-.. image:: ../Images/multiple-choice-shuffle-1.png
- :alt: Image of a multiple choice problem
-
-And another view of the same problem, for another student or for the same student of a subsequent view of the unit, could be:
-
-.. image:: ../Images/multiple-choice-shuffle-2.png
- :alt: Image of a multiple choice problem with shuffled answers
-
-You can also have some answers shuffled, but not others. For example, you may want to have the answer "All of the Above" fixed at the end of the list, but shuffle other answers.
-
-You can configure the problem to shuffle answers through :ref:`Simple Editor` or :ref:`Advanced Editor`.
-
-
-Use the Simple Editor to Shuffle Answers
-*********************************************
-
-You can configure the problem to shuffle answers in :ref:`Simple Editor`.
-
-For example, the following text defines a multiple choice problem, before shuffling is enabled. The ``(x)`` indicates the correct answer::
-
- >>What Apple device competed with the portable CD player?<<
-     ( ) The iPad
-     ( ) Napster
-     (x) The iPod
-     ( ) The vegetable peeler
-
-To add shuffling to this problem, add ``!`` in the parenthesis of the first answer::
-
- >>What Apple device competed with the portable CD player?<<
-     (!) The iPad
-     ( ) Napster
-     (x) The iPod
-     ( ) The vegetable peeler
-
-To fix an answer's location in the list, add ``@`` in the parenthesis of that answer::
-
- >>What Apple device competed with the portable CD player?<<
-     (!) The iPad
-     ( ) Napster
-     (x) The iPod
-     ( ) The vegetable peeler
-     (@) All of the above
-
-You can combine symbols within parenthesis as necessary. For example, to show the correct answer in a fixed location, you could use::
- 
-  (x@) The iPod
-
-Use the Advanced Editor to Shuffle Answers
-*********************************************
-
-You can configure the problem to shuffle answers through XML in :ref:`Advanced Editor`.
-
-For example, the following XML defines a multiple choice problem, before shuffling is enabled:
-
-.. code-block:: xml
-
- <p>What Apple device competed with the portable CD player?</p>
- <multiplechoiceresponse>
-  <choicegroup type="MultipleChoice">
-    <choice correct="false">The iPad</choice>
-    <choice correct="false">Napster</choice>
-    <choice correct="true">The iPod</choice>
-    <choice correct="false">The vegetable peeler</choice>
-  </choicegroup>
- </multiplechoiceresponse>
-
-
-To add shuffling to this problem, add ``shuffle="true"`` to the ``<choicegroup>`` element:
-
-.. code-block:: xml
-
- <p>What Apple device competed with the portable CD player?</p>
- <multiplechoiceresponse>
-  <choicegroup type="MultipleChoice" shuffle="true">
-    <choice correct="false">The iPad</choice>
-    <choice correct="false">Napster</choice>
-    <choice correct="true">The iPod</choice>
-    <choice correct="false">The vegetable peeler</choice>
-  </choicegroup>
- </multiplechoiceresponse>
-
-To fix an answer's location in the list, add ``fixed="true"`` to the ``choice`` element for the answer:
-
-.. code-block:: xml
-
- <p>What Apple device competed with the portable CD player?</p>
- <multiplechoiceresponse>
-  <choicegroup type="MultipleChoice" shuffle="true">
-    <choice correct="false">The iPad</choice>
-    <choice correct="false">Napster</choice>
-    <choice correct="true">The iPod</choice>
-    <choice correct="false">The vegetable peeler</choice>
-    <choice correct="false" fixed="true">All of the above</choice>
-  </choicegroup>
- </multiplechoiceresponse>
-
-
-.. _Targeted Feedback in a Multiple Choice Problem:
-
-===============================================
-Targeted Feedback in a Multiple Choice Problem
-===============================================
-
-You can configure a multiple choice problem so that explanations for incorrect answers are automatically shown to students. You can use these explanations to guide students towards the right answer. Therefore, targeted feedback is most useful for multiple choice problems for which students are allowed multiple attempts.
-
-
-Use the Advanced Editor to Configure Targeted Feedback
-********************************************************
-
-You configure the problem to provide targeted feedback through XML in :ref:`Advanced Editor`.
-
-Follow these XML guidelines:
-
-* Add a ``targeted-feedback`` attribute to the ``<multiplechoiceresponse>`` element, with no value: ``<multiplechoiceresponse targeted-feedback="">``
-* Add a ``<targetedfeedbackset>`` element before the ``<solution>`` element.
-* Within ``<targetedfeedbackset>``, add one or more ``<targetedfeedback>`` elements.
-* Within each ``<targetedfeedback>`` element, enter your explanation for the incorrect answer in HTML as markup described below.
-* Connect the ``<targetedfeedback>`` element with a specific incorrect answer by using the same ``explanation-id`` attribute value for each.
-* Use the ``<solution>`` element for the correct answer, with the same ``explanation-id`` attribute value as the correct ``<choice>`` element.
-
-For example, the XML for the multiple choice problem is:
-
-.. code-block:: xml
-
-   <p>What Apple device competed with the portable CD player?</p>
-   <multiplechoiceresponse targeted-feedback="">
-    <choicegroup type="MultipleChoice">
-      <choice correct="false" explanation-id="feedback1">The iPad</choice>
-      <choice correct="false" explanation-id="feedback2">Napster</choice>
-      <choice correct="true" explanation-id="correct">The iPod</choice>
-      <choice correct="false" explanation-id="feedback3">The vegetable peeler</choice>
-    </choicegroup>
-   </multiplechoiceresponse>
- 
-This is followed by XML that defines the targeted feedback:
-
-.. code-block:: xml
-
-   <targetedfeedbackset>
-     <targetedfeedback explanation-id="feedback1">
-       <div class="detailed-targeted-feedback">
-         <p>Targeted Feedback</p>
-         <p>The iPad came out later and did not directly compete with portable CD players.</p>
-       </div>
-     </targetedfeedback>
-     <targetedfeedback explanation-id="feedback2">
-       <div class="detailed-targeted-feedback">
-         <p>Targeted Feedback</p>
-         <p>Napster was not an Apple product.</p>
-       </div>
-     </targetedfeedback>
-     <targetedfeedback explanation-id="feedback3">
-       <div class="detailed-targeted-feedback">
-         <p>Targeted Feedback</p>
-         <p>Vegetable peelers don't play music.</p>
-       </div>
-     </targetedfeedback>
-    </targetedfeedbackset>
-
-    <solution explanation-id="correct">
-     <div class="detailed-solution">
-      <p>The iPod directly competed with portable CD players.</p>
-     </div>
-    </solution>
-
-
-.. _Answer Pools in a Multiple Choice Problem:
-
-=============================================
-Answer Pools in a Multiple Choice Problem
-=============================================
-
-You can configure a multiple choice problem so that a random subset of choices are shown to each student. For example, you can add 10 possible choices to the problem, and each student views a set of five choices.
-
-The answer pool must have at least one correct answer, and can have more than one. In each set of choices shown to a student, one correct answer is included. For example, you may configure two correct answers in the set of 10. One of the two correct answers is included in each set a student views.
-
-Use the Advanced Editor to Configure Answer Pools
-**************************************************
-
-You configure the problem to provide answer pools through XML in :ref:`Advanced Editor`.
-
-Follow these XML guidelines:
-
-* In the ``<choicegroup>`` element, add the ``answer-pool`` attribute, with the numerical value indicating the number of possible answers in the set. For example, ``<choicegroup answer-pool="4">``.
-
-* For each correct answer, to the ``<choice>`` element, add an ``explanation-id`` attribute and value that maps to a solution. For example, ``<choice correct="true" explanation-id="iPod">The iPod</choice>``.
-
-* For each ``<solution>`` element, add an ``explanation-id`` attribute and value that maps back to a correct answer. For example, ``<solution explanation-id="iPod">``.
-
-.. note:: If the choices include only one correct answer, you do not have to use the ``explanation-id`` in either the ``choice`` or ``<solution>`` element. You do still use the ``<solutionset>`` element to wrap the ``<solution>`` element.
-
-For example, for the following multiple choice problem, a student will see four choices, and in each set one of the choices will be one of the two correct ones. The explanation shown for the correct answer is the one with the same explanation ID.
-
-.. code-block:: xml
-
- <problem>
-   <p>What Apple devices let you carry your digital music library in your pocket?</p>
-   <multiplechoiceresponse>
-    <choicegroup type="MultipleChoice" answer-pool="4">
-      <choice correct="false">The iPad</choice>
-      <choice correct="false">Napster</choice>
-      <choice correct="true" explanation-id="iPod">The iPod</choice>
-      <choice correct="false">The vegetable peeler</choice>
-      <choice correct="false">The iMac</choice>
-      <choice correct="true" explanation-id="iPhone">The iPhone</choice>
-    </choicegroup>
-   </multiplechoiceresponse>
-
-    <solutionset>
-        <solution explanation-id="iPod">
-        <div class="detailed-solution">
-            <p>Explanation</p>
-            <p>Yes, the iPod is Apple's portable digital music player.</p>
-        </div>
-        </solution>
-        <solution explanation-id="iPhone">
-        <div class="detailed-solution">
-            <p>Explanation</p>
-            <p>In addition to being a cell phone, the iPhone can store and play your digital music.</p>
-        </div>
-        </solution>
-    </solutionset>
- </problem>
-
-
-.. _Multiple Choice Problem XML:
-
-******************************
-Multiple Choice Problem XML 
-******************************
-
-================
-Template
-================
-
-.. code-block:: xml
-
-  <problem>
-  <p>Question text</p>
-  <multiplechoiceresponse>
-    <choicegroup type="MultipleChoice" label="label text">
-      <choice correct="false" name="a">Incorrect choice</choice>
-      <choice correct="true" name="b">Correct choice</choice>
-    </choicegroup>
-  </multiplechoiceresponse>
-
-  <solution>
-    <div class="detailed-solution">
-    <p>Explanation or solution header</p>
-    <p>Explanation or solution text</p>
-    </div>
-  </solution>
-  </problem>
-
-================
-Tags
-================
-
-* ``<multiplechoiceresponse>`` (required): Indicates that the problem is a multiple choice problem.
-* ``<choicegroup>`` (required): Indicates the beginning of the list of options. 
-* ``<choice>`` (required): Lists an answer option.
-
-**Tag:** ``<multiplechoiceresponse>``
-
-Indicates that the problem is a multiple choice problem.
-
-  Attributes
-
-  (none)
-
-  Children
-
-  * ``<choicegroup>``
-  * All standard HTML tags (can be used to format text)
-
-**Tag:** ``<choicegroup>``
-
-Indicates the beginning of the list of options.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - label (required)
-       - Specifies the name of the response field.
-     * - type (required)
-       - Must be set to "MultipleChoice".
-
-  Children
-
-  * ``<choice>`` 
-
-**Tag:** ``<choice>``
-
-Lists an answer option. 
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - correct (at least one required)
-       - Indicates a correct or incorrect answer. When the attribute is set to "true", the choice is a correct answer. When the attribute is set to "false", the choice is an incorrect answer. Only one choice can be a correct answer.
-     * - name
-       - A unique name that the back end uses to refer to the choice.
-
-  Children
-  
-  (none)
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/numerical_input.rst b/docs/en_us/course_authors/source/exercises_tools/numerical_input.rst
deleted file mode 100644
index 367376ff87..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/numerical_input.rst
+++ /dev/null
@@ -1,333 +0,0 @@
-.. _Numerical Input:
-
-########################
-Numerical Input
-########################
-
-Numerical input problems are the simpler of the two mathematics tools that Studio offers. In these problems, students enter numbers or specific and relatively simple mathematical expressions to answer a question. The text that the students enter is converted to a symbolic expression that appears below the response field. 
-
-.. image:: /Images/image292.png
- :alt: Image of a numerical input problem
-
-Note that students' responses don't have to be exact for these problems. You can specify a margin of error, or tolerance. You can also specify a correct answer explicitly, or use a Python script. For more information, see the instructions below.
-
-Responses for numerical input problems can include integers, fractions,
-and constants such as *pi* and *g*. Responses can also include text
-representing common functions, such as square root (sqrt) and log base 2
-(log2), as well as trigonometric functions and their inverses, such as
-sine (sin) and arcsine (arcsin). For these functions, the
-text that the student enters is converted into mathematical symbols. The following
-example shows the way the system renders students' text responses in
-numerical input problems. 
-
-.. image:: /Images/Math5.png
- :alt: Image of a numerical input probem rendered by Studio
-
-For more information about characters that students can enter, see :ref:`Math Response Formatting for Students`.
-
-***********************************
-Create a Numerical Input Problem 
-***********************************
-
-You can create numerical problems in the Simple Editor or in the Advanced Editor regardless of the answer to the problem. If the text of your problem doesn't include any italics, bold formatting, or special characters, you can create the problem in the Simple Editor. If the text of your problem contains special formatting or characters, or if your problem contains a Python script, you'll use the Advanced Editor.
-
-For example, the following example problems require the Advanced Editor. 
-
-.. image:: /Images/NumericalInput_Complex.png
- :alt: Image of a more complex numerical input problem
-
-For more information about including a Python script in your problem, see :ref:`Write Your Own Grader`.
-
-==================
-Simple Editor
-==================
-
-#. Under **Add New Component**, click **Problem**.
-#. In the **Select Problem Component Type** screen, click **Numerical
-   Input** on the **Common Problem Types** tab.
-   
-3. When the new Problem component appears, click **Edit**.
-#. In the component editor, replace the sample problem text with your own text.
-#. Determine the text of the problem to use as a label, and then surround that text with two sets of angle brackets (>><<).
-#. Select the text of the answer, and then click the numerical input button. 
-
-.. image:: /Images/ProbCompButton_NumInput.png
-    :alt: Image of the numerical input button
-
-When you do this, an equal sign appears next to the answer.
-        
-7. (Optional) Specify a margin of error, or tolerance. You can specify a percentage, number, or range.
-
-   * To specify a percentage on either side of the correct answer, add **+-NUMBER%** after the answer. For example, if you want to include a 2% tolerance, add **+-2%**. 
-
-   * To specify a number on either side of the correct answer, add **+-NUMBER** after the answer. For example, if you want to include a tolerance of 5, add **+-5**.
-
-   * To specify a range, use brackets [] or parentheses (). A bracket indicates that range includes the number next to it. A parenthesis indicates that the range does not include the number next to it. For example, if you specify **[5, 8)**, correct answers can be 5, 6, and 7, but not 8. Likewise, if you specify **(5, 8]**, correct answers can be 6, 7, and 8, but not 5.
-
-8. In the component editor, select the text of the explanation, and then click the 
-   explanation button to add explanation tags around the text.
-
-   .. image:: /Images/ProbCompButton_Explanation.png
-    :alt: Image of the explanation button
-
-9. On the **Settings** tab, specify the settings that you want. 
-#. Click **Save**.
-
-For the first example problem above, the text in the Problem component is the
-following.
-
-::
-
-   >>What base is the decimal numeral system in?<<
-
-   = 10
-    
-   [explanation]
-   The decimal numerial system is base ten.
-   [explanation]
-
-==================
-Advanced Editor
-==================
-
-To create this problem in the Advanced Editor, click the **Advanced** tab in the Problem component editor, and then replace the existing code with the following code.
-
-**Problem Code**:
-
-.. code-block:: xml
-
-  <problem>
-    <p><b>Example Problem</b></p>
-
-  <p>What base is the decimal numeral system in?
-      <numericalresponse answer="10">
-          <formulaequationinput label="What base is the decimal numeral system in?"/>
-      </numericalresponse>
-  </p>
-
-    <p>What is the value of the standard gravity constant <i>g</i>, measured in m/s<sup>2</sup>? Give your answer to at least two decimal places.
-    <numericalresponse answer="9.80665">
-      <responseparam type="tolerance" default="0.01" />
-      <formulaequationinput label="Give your answer to at least two decimal places"/>
-    </numericalresponse>
-  </p>
-
-  <!-- The following uses Python script spacing. Make sure it isn't indented when you add it to the Problem component. -->
-  <script type="loncapa/python">
-  computed_response = math.sqrt(math.fsum([math.pow(math.pi,2), math.pow(math.e,2)]))
-  </script>
-
-  <p>What is the distance in the plane between the points (pi, 0) and (0, e)? You can type math.
-      <numericalresponse answer="$computed_response">
-          <responseparam type="tolerance" default="0.0001" />
-          <formulaequationinput label="What is the distance in the plane between the points (pi, 0) and (0, e)?"/>
-      </numericalresponse>
-  </p>
-  <solution>
-    <div class="detailed-solution">
-      <p>Explanation</p>
-      <p>The decimal numerical system is base ten.</p>
-      <p>The standard gravity constant is defined to be precisely 9.80665 m/s<sup>2</sup>.
-      This is 9.80 to two decimal places. Entering 9.8 also works.</p>
-      <p>By the distance formula, the distance between two points in the plane is
-         the square root of the sum of the squares of the differences of each coordinate.
-        Even though an exact numerical value is checked in this case, the
-        easiest way to enter this answer is to type
-        <code>sqrt(pi^2+e^2)</code> into the editor.
-        Other answers like <code>sqrt((pi-0)^2+(0-e)^2)</code> also work.
-      </p>
-    </div>
-  </solution>
-  </problem>
-
-.. _Numerical Input Problem XML:
-
-****************************
-Numerical Input Problem XML
-****************************
-
-=========
-Templates
-=========
-
-The following templates represent problems with and without a decimal or percentage tolerance.
-
-Problem with no tolerance
-***************************
-
-.. code-block:: xml
-
-  <p>TEXT OF PROBLEM
-      <numericalresponse answer="ANSWER (NUMBER)">
-          <formulaequationinput label="TEXT OF PROBLEM"/>
-      </numericalresponse>
-  </p>
-   
-    <solution>
-    <div class="detailed-solution">
-    <p>TEXT OF SOLUTION</p>
-    </div>
-  </solution>
-  </problem>
-
-Problem with a decimal tolerance
-************************************
-
-.. code-block:: xml
-
-  <problem>
-   
-    <p>TEXT OF PROBLEM
-    <numericalresponse answer="ANSWER (NUMBER)">
-      <responseparam type="tolerance" default="NUMBER (DECIMAL, e.g., .02)" />
-      <formulaequationinput label="TEXT OF PROBLEM"/>
-    </numericalresponse>
-  </p>
-   
-    <solution>
-    <div class="detailed-solution">
-    <p>TEXT OF SOLUTION</p>
-    </div>
-  </solution>
-  </problem>
-
-Problem with a percentage tolerance
-************************************
-
-.. code-block:: xml
-
-  <problem>
-   
-   <p>TEXT OF PROBLEM
-    <numericalresponse answer="ANSWER (NUMBER)">
-      <responseparam type="tolerance" default="NUMBER (PERCENTAGE, e.g., 3%)" />
-      <formulaequationinput label="TEXT OF PROBLEM"/>
-    </numericalresponse>
-   </p>
-
-    <solution>
-    <div class="detailed-solution">
-    <p>TEXT OF SOLUTION</p>
-    </div>
-  </solution>
-  </problem>
-
-Answer created with a script
-************************************
-
-.. code-block:: xml
-
-  <problem>
-
-  <!-- The following uses Python script spacing. Make sure it isn't indented when you add it to the Problem component. -->
-  <script type="loncapa/python">
-  computed_response = math.sqrt(math.fsum([math.pow(math.pi,2), math.pow(math.e,2)]))
-  </script>
-
-  <p>TEXT OF PROBLEM
-      <numericalresponse answer="$computed_response">
-          <responseparam type="tolerance" default="0.0001" />
-          <formulaequationinput label="TEXT OF PROBLEM"/>
-      </numericalresponse>
-  </p>
-
-    <solution>
-    <div class="detailed-solution">
-     <p>TEXT OF SOLUTION</p>
-    </div>
-  </solution>
-  </problem>
-
-====
-Tags
-====
-
-* ``<numericalresponse>`` (required): Specifies that the problem is a numerical input problem.
-* ``<formulaequationinput />`` (required): Provides a response field where the student enters a response.
-* ``<responseparam>`` (optional): Specifies a tolerance, or margin of error, for an answer.
-* ``<script>`` (optional):
-
-.. note:: Some older problems use the ``<textline math="1" />`` tag instead of the ``<formulaequationinput />`` tag. However, the ``<textline math="1" />`` tag has been deprecated. All new problems should use the ``<formulaequationinput />`` tag.
-
-**Tag:** ``<numericalresponse>``
-
-Specifies that the problem is a numerical input problem. The ``<numericalresponse>`` tag is similar to the ``<formularesponse>`` tag, but the ``<numericalresponse>`` tag does not allow unspecified variables.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - answer (required)
-       - The correct answer to the problem, given as a mathematical expression. 
-
-  .. note:: If you include a variable name preceded with a dollar sign ($) in the problem, you can include a script in the problem that computes the expression in terms of that variable.
-
-  The grader evaluates the answer that you provide and the student's response in the same way. The grader also automatically simplifies any numeric expressions that you or a student provides. Answers can include simple expressions such as "0.3" and "42", or more complex expressions such as "1/3" and "sin(pi/5)". 
-
-  Children
-  
-  * ``<responseparam>``
-  * ``<formulaequationinput>``
-
-**Tag:** * ``<formulaequationinput>``
-
-Creates a response field in the LMS where students enter a response.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description     
-     * - label (required)
-       - Specifies the name of the response field.
-     * - size (optional)
-       - Defines the width, in characters, of the response field in the LMS.
-  
-  Children
-
-  (none)
-
-**Tag:** ``<responseparam>``
-
-Specifies a tolerance, or margin of error, for an answer.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - type (optional)
-       - "tolerance": Defines a tolerance for a number
-     * - default (optional)
-       - A number or a percentage specifying a numerical or percent tolerance.
-
-  Children
-  
-  (none)
-
-**Tag:** ``<script>``
-
-Specifies a script that the grader uses to evaluate a student's response. A problem behaves as if all of the code in all of the script tags were in a single script tag. Specifically, any variables that are used in multiple ``<script>`` tags share a namespace and can be overriden.
-
-As with all Python, indentation matters, even though the code is embedded in XML.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - type (required)
-       - Must be set to "loncapa/python".
-
-  Children
-  
-  (none)
diff --git a/docs/en_us/course_authors/source/exercises_tools/open_response_assessment.rst b/docs/en_us/course_authors/source/exercises_tools/open_response_assessment.rst
deleted file mode 100644
index 753896f98e..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/open_response_assessment.rst
+++ /dev/null
@@ -1,803 +0,0 @@
-.. _Open Response Assessment:
-
-#################################
-Open Response Assessment Problems
-#################################
-
-.. warning:: **Version 1 of of our Open Response Assessments suite has been deprecated.** This documentation is meant for past courses that have used this first version of open response assessments. We no longer support new open response assessments of this type.
-
-  Version 2 of our Open Response Assessments suite was released to a few courses in April 2014 and more broadly in May 2014. If you want to create a new open response assessment in your course, see `the new ORA documentation <http://edx.readthedocs.org/projects/edx-open-response-assessments/en/latest/>`_. 
-
-*********************************************
-Introduction to Open Response Assessments
-*********************************************
-
-.. note:: Problems can occur when you move your course from edge.edx.org to edx.org, or vice versa, if your course has the same URL in both places. To work around this problem, make sure that the URLs are different by specifying a different university or course number when you create each course. For example, if your university is edX and your course number is edX101, you can specify the course number as **edx_101** (note the underscore) on Edge and **edX101** on edX.
-
-Open response assessments allow instructors to assess student learning through questions that may not have definite answers. Tens of thousands of students can receive feedback on written responses of varying lengths as well as files, such as computer code or images, that the students upload. Open response assessment technologies include self assessment and peer assessment. With self assessments, students learn by comparing their answers to a rubric that you create. With peer assessments, students compare their peers' answers to the rubric.
-
-For more information, see the following:
-
-* :ref:`ORA Notes`
-* :ref:`ORA Components`
-* :ref:`ORA Types`
-* :ref:`ORA Effective Questions`
-* :ref:`ORA Rubrics`
-* :ref:`ORA Create an ORA Problem`
-* :ref:`ORA Grade an ORA`
-* :ref:`ORA Access Scores`
-
-.. _ORA Notes:
-
-*********************************************
-A Few Notes about Open Response Assessments
-*********************************************
-
-**Open response assessment technology is still in beta.** For a good
-experience with open response assessments, you'll need to follow a few
-guidelines.
-
--  Do not create a new open response assessment in a running course.
-   Only create open response assessments in a test course.
--  If your course will include open response assessments, add and
-   thoroughly test all the open response assessments *before* the course
-   is live.
--  Set open response assessments to be optional, ungraded, or droppable
-   exercises until you've used the technology a few times and have
-   become familiar with it.
--  Use open response assessments sparingly at first. Only include a few
-   in your course, and make sure that you have contingency plans in case
-   you run into problems.
-
-Finally, if you're at an edX consortium university and you plan to
-include open response assessments in a MOOC, make sure to notify your
-edX project manager (PM).
-
-.. _ORA Components:
-
-*********************************************
-Components of an Open Response Assessment
-*********************************************
-
-An open response assessment has three elements:
-
--  The assessment type or types--self, peer, or artificial intelligence
-   (AI). The type of assessment and the order in which the assessments
-   run appears in the upper right corner of the ORA problem. In the
-   following example, the student performs a self assessment, then peers
-   perform peer assessments, and then an AI assessment runs.
-
-   .. image:: /Images/CITL_AssmtTypes.png
-      :alt: Image of ORA with assessment types circled
-
--  The question that you want your students to answer. This appears near
-   the top of the component, followed by a field where the student
-   enters a response.
-
-   .. image:: /Images/CITLsample.png
-      :alt: Image of ORA question
-
--  A rubric that you design. After the student enters a response and
-   clicks **Submit**, if the assessment is a self assessment, the
-   student sees the rubric below his answer and compares his answer to
-   the rubric. (If the assessment is an AI or peer assessment, the
-   student sees a "Your response has been submitted" message but doesn't
-   see the rubric.)
-
-   .. image:: /Images/CITL_SA_Rubric.png
-      :alt: Image of ORA with rubric showing below the student's response
-
-.. _ORA Types:
-
-******************************
-Open Response Assessment Types
-******************************
-
-There are three types of assessments for ORAs: self assessment, AI
-assessment, and peer assessment.
-
--  Self assessment allows students to answer a question, and then assess
-   their response according to the rubric you created for the question.
--  In AI assessment, a computer algorithm learns how to grade according
-   to the rubric from 100 or more instructor-graded responses, and
-   attempts to grade the rest of the student responses in the same way.
--  Peer assessment allows students to score each other and provide
-   feedback, again using the same rubric.
-
-   .. warning:: In peer assessments, the **due date** that you set for the subsection that contains the ORA problem is the date by which students must not only submit their own responses, but finish grading the required number of peer responses.
-
-You can use one or more of these assessments in any problem. You can
-also set thresholds within the problem for each assessment, so that a
-response with a low score in one assessment does not move on to the next
-assessment.
-
-.. _ORA Effective Questions:
-
-******************************
-Effective Questions
-******************************
-
-When you write your question, we recommend that you specify an
-approximate number of words or sentences that a student's response has
-to have in the body of your question. You may also want to provide
-information about how to use the LMS. If you require students to upload
-a file as a response, you can provide specific instructions about how to
-upload and submit their files. You can let students know what to expect
-after they submit responses. You can also mention the number of times
-that a student will be able to submit a response for the problem.
-
-.. _ORA Rubrics:
-
-***************
-Rubrics
-***************
-
-The same rubric is used for all three ORA types, and it can include
-anything that you want it to include.
-
-In Studio, rubrics are arranged by *categories*. Each category has two
-or more *options*, and each option has a point value.
-
-Options must be listed in ascending order starting at 0 points. For
-example, in a category with three options, the first option is worth 0
-points, the second is worth 1 point, and the third is worth 2 points.
-The person or algorithm that grades the problem selects one value for
-each category.
-
-Different categories in the same problem can have different numbers of
-options.
-
-.. _ORA Create an ORA Problem:
-
-*********************************************
-Create an Open Response Assessment Problem
-*********************************************
-
-.. warning:: Open response assessments are still in beta. To enable open response assessments in your course, you'll need to work with your edX program manager.
-
-Creating an open response assessment is a multi-step process.
-
-* :ref:`ORA Step 1`
-* :ref:`ORA Step 2`
-* :ref:`ORA Step 3`
-* :ref:`ORA Step 4`
-* :ref:`ORA Step 5`
-* :ref:`ORA Step 6`
-* :ref:`ORA Step 7`
-* :ref:`ORA Step 8`
-* :ref:`ORA Step 9`
-
-Each of these steps is described in detail below.
-
-.. warning:: Problems can occur when you move your course from edge.edx.org to edx.org, or vice versa, if your course has the same URL in both places. To work around this problem, make sure that the URLs are different by specifying a different university or course number when you create each course. For example, if your university is edX and your course number is edX101, you can specify the course number as **edx_101** (note the underscore) on Edge and **edX101** on edX.
-
-.. _ORA Step 1:
-
-================================
-Step 1. Create the ORA Component
-================================
-
-#. Modify your course's advanced settings to allow open response assessments. For more information about how to do this, contact your edX program manager.
-#. In Studio, open the unit where you want to create the ORA.
-#. Under **Add New Component**, click **Advanced**, and then click
-   **Open Response Assessment**.
-#. In the problem component that appears, click **Edit**, and then click
-   **OK** in the dialog box that appears.
-#. The component editor opens. The component editor contains a sample
-   question ("prompt"), rubric, and the code for the assessment type and
-   scoring. You'll replace this sample content with the content for your
-   problem.
-
-.. image:: /Images/ORAComponentEditor.png
-   :alt: Image of component editor with prompt, rubric, and assessment type highlighted
-
-.. _ORA Step 2:
-
-========================
-Step 2. Add the Question
-========================
-
-#. In the component editor, locate the [prompt] tags.
-
-.. image:: /Images/ORA_Prompt.png
-      :alt: Image of component editor with prompt text highlighted
-
-2. Replace the sample text between the **[prompt]** tags with the text of
-   your question. When you replace the sample text, make sure you follow
-   these guidelines to avoid common formatting mistakes.
-
-   -  Leave the **[prompt]** tags in place.
-   -  Enclose all text in HTML tags.
-
-.. _ORA Step 3:
-
-========================
-Step 3. Add the Rubric
-========================
-
-.. note:: After you release your problem to students in your live course, make sure
-          you don't make any changes to the rubric that affect scoring, such as adding or removing an option
-          in a category. Changing the rubric can cause errors in live courses.*
-
-#. In the component editor, locate the [rubric] tags. (The sample rubric
-   is long, so you'll have to scroll down to locate the second tag.)
-
-.. image:: /Images/ORA_Rubric.png
-      :alt: Image of component editor with rubric text highlighted
-
-2. Replace the sample rubric with the text of your rubric. Make sure to
-   do the following.
-
-   -  Include the beginning and ending [rubric] tags.
-   -  Precede the categories with a plus (+) sign.
-   -  Precede the options with a minus (-) sign.
-   -  List the option that scores zero points first, followed by the option that scores one point, and so on.
-
-   For example, your rubric might resemble the following rubric.
-
-::
-
-    [rubric]
-
-    + Writing Applications
-    - The essay loses focus, has little information or supporting details, and the organization makes it difficult to follow.
-    - The essay presents a mostly unified theme, includes sufficient information to convey the theme, and is generally organized well.
-
-    + Language Conventions
-    - The essay demonstrates a reasonable command of proper spelling and grammar.
-    - The essay demonstrates superior command of proper spelling and grammar.
-
-    [rubric]
-
-.. _ORA Step 4:
-
-============================================
-Step 4. Set the Assessment Type and Scoring
-============================================
-
-.. note:: After you release your problem to students in your live course, make sure
-          you don't make any changes to the code for the assessment type and scoring. Changing
-          this code can cause errors in live courses.
-
-To set the assessment type and scoring for your open response assessment, you'll
-enter code that specifies the type and order of assessments to use along with
-the scoring thresholds for each assessment. The code uses the following format.
-
-::
-
-    [tasks]
-    (Type 1), ({min-max}Type 2), ({min-max}Type 3)
-    [tasks]
-
--  The **[tasks]** tags surround the code.
--  **Type 1**, **Type 2**, and **Type 3** are the names of the types of
-   assessments. Assessments run in the order in which they're listed.
--  **min** is the point value the response must receive in the previous
-   assessment to move to this assessment. Note that you do not define a
-   scoring threshold for the first assessment, because there is no
-   required previous assessment.
--  **max** is the maximum point value for the assessment. The maximum
-   score is the second number in the pair of numbers for each assessment
-   after the first assessment.
-
-For example, a problem might contain the following code.
-
-::
-
-    [tasks]
-    (Self), ({5-7}Peer), ({4-7}AI)
-    [tasks]
-
-The problem that includes this code has the following characteristics.
-
--  The problem has a self assessment, a peer assessment, and then an AI
-   assessment.
--  The maximum score for the problem is 7.
--  To advance to the peer assessment, the response must have a self
-   assessment score of 5 or greater.
--  To advance to the AI assessment, the response must have a peer
-   assessment score of 4 or greater.
-
-.. note:: If a response's score isn't high enough for the response to move to the next
-          assessment,
-
-Set the Assessment Type and Scoring
-************************************
-
-#. In the component editor, locate the [tasks] tags.
-
-.. image:: /Images/ORA_Tasks.png
-       :alt: Image of component editor with tasks tags and text highlighted
-
-#. Replace the sample code with the code for your problem.
-
-.. _ORA Step 5:
-
-============================
-Step 5. Set the Problem Name
-============================
-
-.. note::   After you release your problem to students in your live course, make sure
-            you don't change the name of the problem. Changing the display name when the problem
-            is live can cause a loss of student data.
-
-            You can change the display name of a problem while you're still testing the problem.
-            However, note that all the test responses and scores associated with the problem
-            will be lost when you change the name. To update the problem name on the
-            instructor dashboard, submit a new test response to the problem.
-
-The name of the problem appears as a heading above the problem in the
-courseware. It also appears in the list of problems on the **Staff
-Grading** page.
-
-.. image:: /Images/ORA_ProblemName1.png
-   :alt: Image of Staff Grading page with a problem name circled
-
-To change the name:
-
-#. In the upper-right corner of the component editor, click
-   **Settings**.
-
-#. In the **Display Name** field, replace **Open Response Assessment**
-   with the name of your problem.
-
-.. _ORA Step 6:
-
-=========================
-Step 6. Set Other Options
-=========================
-
-If you want to change the problem settings, which include the number of
-responses a student has to peer grade and whether students can upload
-files as part of their response, click the **Settings** tab, and then
-specify the options that you want.
-
-.. image:: /Images/ORA_Settings.png
-   :alt: Image of component editor with Settings tab selected
-
-Open response assessments include the following settings.
-
-+---------------------------------------------+--------------------------------------------------------------------+
-| **Allow "overgrading" of peer submissions** | This setting applies only to peer grading. If all of the responses |
-|                                             | for a question have been graded, the instructor can allow          |
-|                                             | additional students to grade responses that were previously        |
-|                                             | graded. This can be helpful if an instructor feels that peer       |
-|                                             | grading has helped students learn, or if some students haven't     |
-|                                             | graded the required number of responses yet, but all available     |
-|                                             | responses have been graded.                                        |
-+---------------------------------------------+--------------------------------------------------------------------+
-| **Allow File Uploads**                      | This setting specifies whether a student can upload a file, such   |
-|                                             | as an image file or a code file, as a response. Files can be of    |
-|                                             | any type.                                                          |
-+---------------------------------------------+--------------------------------------------------------------------+
-| **Disable Quality Filter**                  | This setting applies to peer grading and AI grading. When the      |
-|                                             | quality filter is disabled (when this value is set to True),       |
-|                                             | Studio allows submissions that are of "poor quality" (such as      |
-|                                             | responses that are very short or that have many spelling or        |
-|                                             | grammatical errors) to be peer graded. For example, you may        |
-|                                             | disable the quality filter if you want students to include URLs to |
-|                                             | external content - otherwise Studio sees a URL, which may contain a|
-|                                             | long string of seemingly random characters, as a misspelled word.  |
-|                                             | When the quality filter is enabled (when this value is set to      |
-|                                             | False), Studio does not allow poor-quality submissions to be peer  |
-|                                             | graded.                                                            |
-+---------------------------------------------+--------------------------------------------------------------------+
-| **Display Name**                            | This name appears in two places in the LMS: in the course ribbon   |
-|                                             | at the top of the page and above the exercise.                     |
-+---------------------------------------------+--------------------------------------------------------------------+
-| **Graded**                                  | This setting specifies whether the problem counts toward a         |
-|                                             | student's grade. By default, if a subsection is set as a graded    |
-|                                             | assignment, each problem in that subsection is graded. However, if |
-|                                             | a subsection is set as a graded assignment, and you want this      |
-|                                             | problem to be a "test" problem that doesn't count toward a         |
-|                                             | student's grade, you can change this setting to **False**.         |
-+---------------------------------------------+--------------------------------------------------------------------+
-| **Maximum Attempts**                        | This setting specifies the number of times the student can try to  |
-|                                             | answer the problem. Note that each time a student answers a        |
-|                                             | problem, the student's response is graded separately. If a student |
-|                                             | submits two responses to a peer-assessed problem (for example, by  |
-|                                             | using the **New Submission** button after her first response       |
-|                                             | receives a bad grade or because she wants to change her original   |
-|                                             | response), and the problem requires three peer graders, three      |
-|                                             | separate peer graders will have to grade each of the student's two |
-|                                             | responses. We thus recommend keeping the maximum number of         |
-|                                             | attempts for each question low.                                    |
-+---------------------------------------------+--------------------------------------------------------------------+
-| **Maximum Peer Grading Calibrations**       | This setting applies only to peer grading. You can set the maximum |
-|                                             | number of responses a student has to "practice grade" before the   |
-|                                             | student can start grading other students' responses. The default   |
-|                                             | value is 6, but you can set this value to any number from 1 to 20. |
-|                                             | This value must be greater than or equal to the value set for      |
-|                                             | **Minimum Peer Grading Calibrations**.                             |
-+---------------------------------------------+--------------------------------------------------------------------+
-| **Minimum Peer Grading Calibrations**       | This setting applies only to peer grading. You can set the minimum |
-|                                             | number of responses a student has to "practice grade" before the   |
-|                                             | student can start grading other students' responses. The default   |
-|                                             | value is 3, but you can set this value to any number from 1 to 20. |
-|                                             | This value must be less than or equal to the value set for         |
-|                                             | **Maximum Peer Grading Calibrations**.                             |
-+---------------------------------------------+--------------------------------------------------------------------+
-| **Peer Graders per Response**               | This setting applies only to peer grading. This setting specifies  |
-|                                             | the number of times a response must be graded before the score and |
-|                                             | feedback are available to the student who submitted the response.  |
-+---------------------------------------------+--------------------------------------------------------------------+
-| **Peer Track Changes**                      | This setting is new and still under development. This setting      |
-|                                             | applies only to peer grading. When this setting is enabled (set to |
-|                                             | **True**), peer graders can make inline changes to the responses   |
-|                                             | they're grading. These changes are visible to the student who      |
-|                                             | submitted the response, along with the rubric and comments for the |
-|                                             | problem.                                                           |
-+---------------------------------------------+--------------------------------------------------------------------+
-| **Problem Weight**                          | This setting specifies the number of points the problem is worth.  |
-|                                             | By default, each problem is worth one point.                       |
-|                                             |                                                                    |
-|                                             | **Note** *Every problem must have a problem weight of at least     |
-|                                             | one point. Problems that have a problem weight of zero points      |
-|                                             | don't appear on the instructor dashboard.*                         |
-+---------------------------------------------+--------------------------------------------------------------------+
-| **Required Peer Grading**                   | This setting specifies the number of responses that each student   |
-|                                             | who submits a response has to grade before the student receives a  |
-|                                             | grade for her response. This value can be the same as the value    |
-|                                             | for the **Peer Graders per Response** setting, but we recommend    |
-|                                             | that you set this value higher than the **Peer Graders per         |
-|                                             | Response** setting to make sure that every student's work is       |
-|                                             | graded. (If no responses remain to be graded, but a student still  |
-|                                             | needs to grade responses, you can set the **Allow "overgrading" of |
-|                                             | peer submissions** setting to allow more students to grade         |
-|                                             | previously graded responses.)                                      |
-+---------------------------------------------+--------------------------------------------------------------------+
-
-.. _ORA Step 7:
-
-========================
-Step 7. Save the Problem
-========================
-
--  After you have created the prompt and the rubric, set the assessment
-   type and scoring, changed the name of the problem, and specified any
-   additional settings, click **Save**.
-
-   The component appears in Studio. In the upper right corner, you can
-   see the type of assessments that you have set for this problem.
-
-   .. image:: /Images/ORA_Component.png
-      :alt: Image of ORA component with assessment types circled
-
-.. _ORA Step 8:
-
-==================================================================
-Step 8. Add the Peer Grading Interface (for peer assessments only)
-==================================================================
-
-You can add just one peer grading interface for the whole course, or you
-can add a separate peer grading interface for each individual problem.
-
-.. warning:: In peer assessments, the **due date** that you set for the subsection that contains the ORA problem is the date by which students must not only submit their own responses, but finish grading the required number of peer responses.
-
-.. _ORA Add a Single PGI:
-
-Add a Single Peer Grading Interface for the Course
-**************************************************
-
-When you add just one peer grading interface for the entire course, we
-recommend that you create that peer grading interface in its own section
-so that students can find it easily. Students will be able to access all
-the ORA problems for the course through this peer grading interface.
-
-#. Create a new section, subsection, and unit. You can use any names
-   that you want. One course used "Peer Grading Interface" for all
-   three.
-#. Under **Add New Component** in the new unit, click **Advanced**, and
-   then click **Peer Grading Interface**.
-
-   A new Peer Grading Interface component appears.
-
-#. To see the peer grading interface in the course, set the visibility
-   of the unit to **Public**, and then click **View Live**.
-
-   The **Peer Grading** page opens.
-
-   .. image:: /Images/PGI_Single.png
-      :alt: Image of LMS open to the Peer Grading page for the course
-
-   When students submit responses for peer assessments in your course,
-   the names of the problems appear in this interface.
-
-.. _ORA Add an Individual PGI:
-
-Add the Peer Grading Interface to an Individual Problem
-*******************************************************
-
-When you add a peer grading interface for an individual problem, you
-must add the identifier for the problem to that peer grading interface.
-If you don't add the identifier, the interface will show all of the peer
-assessments in the course.
-
-Note that the peer grading interface doesn't have to appear under the
-problem you want it to be associated with. As long as you've added the
-identifier of the problem, the peer grading interface will be associated
-with the problem, even if you include the peer grading interface in a
-later unit (for example, if you want the problem to be due after a
-week).
-
-#. Open the unit that contains the ORA.
-#. If the visibility of the unit is set to Public, click **View Live**.
-   If the visibility is set to Private, click **Preview**. The unit
-   opens in the LMS in a new tab. Make sure you're in Staff view rather
-   than Student view.
-#. Scroll down to the bottom of the ORA, and then click **Staff Debug
-   Info**.
-#. In the page that opens, locate the string of alphanumeric characters
-   to the right of the word **location**. Press CTRL+C to copy this
-   string, starting with **i4x**.
-
-   .. image:: /Images/PA_StaffDebug_Location.png
-      :alt: Image of Staff Debug screen with ORA problem location circled
-
-5. Switch back to the unit in Studio. If the visibility of the unit is
-   set to **Public**, change the visibility to **Private**.
-#. Scroll to the bottom of the unit, click **Advanced** under **Add New
-   Component**, and then click **Peer Grading Interface**.
-#. On the Peer Grading Interface component that opens, click **Edit**.
-#. In the Peer Grading Interface component editor, click **Settings**.
-#. In the **Link to Problem Location** field, paste the string of
-   alphanumeric characters that you copied in step 4. Then, change the
-   **Show Single Problem** setting to **True**.
-
-   .. image:: /Images/PGI_CompEditor_Settings.png
-
-#. Click **Save** to close the component editor.
-
-.. _ORA Step 9:
-
-========================
-Step 9. Test the Problem
-========================
-
-Test your problem by adding and grading a response.
-
-#. In Studio, open the unit that contains your ORA problem.
-#. Under **Unit Settings**, change the **Visibility** setting to
-   **Public**, and then click **View Live**.
-
-   When you click **View Live**, the unit opens in the LMS in a new tab.
-
-3. In the LMS, locate your ORA question, and then type your response in
-   the Response field under the question.
-
-   .. image:: /Images/ThreeAssmts_NoResponse.png
-
-   Note that when you view your ORA problem in the LMS as an instructor,
-   you see the following message below the problem. This message never
-   appears to students.
-
-   .. image:: /Images/ORA_DuplicateWarning.png
-
-4. Test the problem to make sure that it works as expected.
-
-To test your open response assessment, you may want to sign into your
-course as a student, using an account that's different from the account
-that you use as an instructor.
-
--  If you want to keep your course open as an instructor when you sign
-   in as a student, either open a window in Incognito Mode in Firefox or
-   Chrome or use a different browser to access your course. For example,
-   if you used Firefox to create the course, use Chrome when you sign in
-   as a student.
--  If you don't need to keep your course open, sign out of your course,
-   and then sign back in using a different account. Note that if you do
-   this, you can't make changes to your course without signing out and
-   signing back in as an instructor.
-
-When you test your problem, you may want to submit test responses that contain little
-text, random characters, or other content that doesn't resemble the responses that you
-expect from your students. Open response assessments include a quality filter that
-prevents instructors and other students from seeing these "low-quality" responses.
-This quality filter is enabled by default. If you want to see all of your test
-responses, including the "low-quality" responses, disable the quality filter.
-
-To disable the quality filter, open the problem component, click the **Settings** tab,
-and then set the **Disable Quality Filter** setting to **True**.
-
-.. _ORA Grade an ORA:
-
-*********************************************
-Grade an Open Response Assessment Problem
-*********************************************
-
-You'll grade student responses to both AI assessments and peer
-assessments from the **Staff Grading** page in the LMS. Take a moment to
-familiarize yourself with the features of this page.
-
-=======================
-The Staff Grading Page
-=======================
-
-When a response is available for you to grade, a yellow exclamation mark
-appears next to **Open Ended Panel** at the top of the screen.
-
-.. image:: /Images/OpenEndedPanel.png
-
-To access the **Staff Grading** page, click **Open Ended Panel**.
-
-When the **Open Ended Console** page opens, click **Staff Grading**.
-Notice the **New submissions to grade** notification.
-
-.. image:: /Images/OpenEndedConsole_NewSubmissions.png
-
-When the **Staff Grading** page opens, information about your open
-response assessment appears in several columns.
-
-.. image:: /Images/ProblemList-DemoCourse.png
-
-+----------------------------------------------------+--------------------------------------------------------------------+
-| **Problem Name**                                   | The name of the problem. Click the name of the problem to open it. |
-|                                                    | Problems in your course do not appear under **Problem Name** on    |
-|                                                    | the **Staff Grading** page until at least one response to the      |
-|                                                    | problem has been submitted and is available to grade.              |
-+----------------------------------------------------+--------------------------------------------------------------------+
-| **Graded**                                         | The number of responses for that problem that you have already     |
-|                                                    | graded. Even if the AI algorithm has graded all available          |
-|                                                    | responses, you can still grade the responses that the algorithm    |
-|                                                    | designates as low-confidence responses by clicking the problem     |
-|                                                    | name in the list.                                                  |
-+----------------------------------------------------+--------------------------------------------------------------------+
-| **Available to grade**                             | The total number of ungraded student submissions.                  |
-+----------------------------------------------------+--------------------------------------------------------------------+
-| **Required**                                       | The number of responses remaining to be graded to train the        |
-|                                                    | algorithm for AI or to calibrate the responses for peer grading.   |
-|                                                    | If your open response assessment calls for both AI and peer        |
-|                                                    | assessment, the 20 responses that you grade for the peer           |
-|                                                    | assessment count toward the 100 responses for the AI assessment.   |
-+----------------------------------------------------+--------------------------------------------------------------------+
-| **Progress**                                       | A visual indication of your progress through the grading process.  |
-+----------------------------------------------------+--------------------------------------------------------------------+
-
-===============
-Grade Responses
-===============
-
-.. warning:: In peer assessments, the **due date** that you set for the subsection that contains the ORA problem is the date by which students must not only submit their own responses, but finish grading the required number of peer responses.
-
-#. Go to the **Staff Grading** page.
-#. Under **Problem Name**, click the name of the problem that you want.
-
-   When the problem opens, the information about the number of responses
-   that are still available to grade, that have been graded, and that an
-   instructor is required to grade appears under the problem name. You
-   can also find out about the AI algorithm's error rate. The error rate
-   is a calculation of the difference between the scores that AI
-   algorithm provides and the scores that the instructor provides.
-
-.. image:: /Images/ResponseToGrade.png
-
-3. In the rubric below the response, select the option that best
-   describes the response.
-#. If applicable, add additional feedback.
-
-   -  You can provide comments for the student in the **Written Feedback** field.
-   -  If you do not feel that you can grade the response (for example,
-      if you're a member of course staff but you would rather have the
-      instructor grade the response), you can click **Skip** to skip it.
-   -  If the response contains inappropriate content, you can select the
-      **Flag as inappropriate content for later review** check box.
-      Flagged content is accessed on the **Staff Grading** page. If
-      necessary, course staff can ban a student from peer grading.
-
-.. image:: /Images/AdditionalFeedback.png
-
-5. When you are done grading the response, click **Submit**.
-
-When your course is running, another response opens automatically after
-you grade the first response, and a message appears at the top of the
-page.
-
-.. image:: /Images/FetchingNextSubmission.png
-
-After you've graded all responses for this problem, **No more
-submissions to grade** appears on the page.
-
-.. image:: /Images/NoMoreSubmissions.png
-
-Click **Back to problem list** to return to the list of problems. You
-can also wait for a few minutes and click **Re-check for submissions**
-to see if any other students have submitted responses.
-
-.. note:: After you've graded enough responses for AI assessments to start, the number
-          of responses in the **Available to grade** column decreases rapidly as
-          the algorithm grades responses and returns them to your students in just
-          a few seconds. No student data is lost.
-
-.. note:: When a response opens for you to grade, it leaves the current "grading pool"
-          that other instructors or students are grading from, which prevents other
-          instructors or students from grading the response while you are working on
-          it. If you do not submit a score for this response within 30 minutes,
-          the response returns to the grading pool (so that it again becomes available
-          for others to grade), even if you still have the response open on your screen.
-
-          If the response returns to the grading pool (because the 30 minutes have passed),
-          but the response is still open on your screen, you can still submit feedback for
-          that response. If another instructor or student grades the response after it returns to the
-          grading pool but before you submit your feedback, the response receives two grades.
-
-          If you click your browser's **Back** button to return to the problem list before you
-          click **Submit** to submit your feedback for a response, the response stays outside
-          the grading pool until 30 minutes have passed. When the response returns to the
-          grading pool, you can grade it.
-
-.. _ORA Access Scores:
-
-******************************
-Access Scores and Feedback
-******************************
-
-=======
-Scoring
-=======
-
-Scores for open response assessment problems that have more than one assessment type are not cumulative. That is, if a problem has a value of 10 points and it contains both a self assessment and an AI assessment, the total score is out of 10 points rather than 20.
-
-The final score for an open response assessment is the score that the response receives in the last assessment that it undergoes. If a response doesn't score high enough to move to another assessment, the final score is the score that the response receives in the last assessment that it qualifies for.
-
-In peer assessment, the final score is the median of the scores that the response receives from each peer grader.
-
-For example:
-
-A 20-point problem includes self assessment, peer assessment, and AI assessment. To move from self assessment to peer assessment, the response must score 10 points. To move from peer assessment to AI assessment, the response must score 12 points.
-
-* Student A gives himself 9 points in the self assessment. Because the minimum score to move from self assessment to peer assessment is 10, the response cannot continue to peer assessment. Student A's final score is 9 out of 20.
-
-* Student B gives herself 16 points in the self assessment. In the peer assessment, the response receives scores of 14, 11, and 10. Because the median is 11, the response cannot continue to AI assessment. Student B's final score is 11 out of 20.
-
-* Student C gives herself 17 points in the self assessment. In the peer assessment, the response receives scores of 10, 18, and 14. Because the median is 14, the response moves to AI assessment. AI assessment gives the response a score of 16. Student C's final score is 16 out of 20.
-
-
-Note that if the same 20-point problem changes the assessment order, the student's final score may be different. For example, suppose the assessment order for the above example changes to self assessment, then AI assessment, and then peer assessment. To move from self assessment to AI assessment, the response must score 10 points. To move from AI assessment to peer assessment, the response must score 12 points.
-
-* Student D gives himself 17 points in the self assessment. AI assessment gives the response a score of 16. In the peer assessment, the response receives scores of 10, 18, and 14; the median is 14. Student D's final score is 14 out of 20.
-
-.. note:: Because the assessment order can affect a student's final score, we recommend that you specify peer assessments as the last assessments for ORA problems. If the last assessment is a self assessment, the student can award herself full points for a response, even if the response received low grades from the AI and peer assessments.
-
-================
-Accessing Scores
-================
-
-You access your scores for your responses to AI and peer assessment problems through the **Open Ended Console** page.
-
-#. From any page in the LMS, click the **Open Ended Panel** tab at the
-   top of the page.
-
-.. image:: /Images/OpenEndedPanel.png
-
-2. On the **Open Ended Console** page, click **Problems You Have
-   Submitted**.
-
-.. image:: /Images/ProblemsYouHaveSubmitted.png
-
-3. On the **Open Ended Problems** page, check the **Status** column to
-   see whether your responses have been graded.
-#. When grading for a problem has been finished, click the name of a
-   problem in the list to see your score for that problem. When you
-   click the name of the problem, the problem opens in the courseware.
-
-For both AI and peer assessments, the score appears below your response
-in an abbreviated version of the rubric. For peer assessments, you can
-also see the written feedback that your response received from different
-graders.
-
-**Graded AI Assessment**
-
-.. image:: /Images/AI_ScoredResponse.png
-
-**Graded Peer Assessment**
-
-.. image:: /Images/Peer_ScoredResponse.png
-
-If you want to see the full rubric for either an AI or peer assessment,
-click **Toggle Full Rubric**.
-
-.. note:: For a peer assessment, if you haven't yet graded enough
-          problems to see your score, you receive a message that lets you know how
-          many problems you still need to grade.
-
-.. image:: /Images/FeedbackNotAvailable.png
diff --git a/docs/en_us/course_authors/source/exercises_tools/periodic_table.rst b/docs/en_us/course_authors/source/exercises_tools/periodic_table.rst
deleted file mode 100644
index b39a27b764..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/periodic_table.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-.. _Periodic Table:
-
-#####################
-Periodic Table Tool
-#####################
-
-You can create an interactive periodic table of the elements to help your students learn about various elements' properties. In the table below, detailed information about each element appears as the student moves the mouse over the element.
-
-.. image:: /Images/Periodic_Table.png
-  :alt: Image of the interactive periodic table
-
-.. _Create the Periodic Table:
-
-******************************
-Create the Periodic Table Tool
-******************************
-
-To create a periodic table, you need the following files:
-
-* Periodic-Table.js
-* Periodic-Table.css
-* Periodic-Table-Colors.css
-* PeriodicTableHTML.txt
-
-To download all of these files in a .zip archive, click http://files.edx.org/PeriodicTableFiles.zip. 
-
-To create the periodic table, you need an HTML component.
-
-#. Upload all of the files listed above *except PeriodicTable.txt* to the **Files & Uploads** page in your course.
-#. In the unit where you want to create the problem, click **HTML** under **Add New Component**, and then click **HTML**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, switch to the **HTML** tab.
-#. Open the PeriodicTable.txt file in any text editor.
-#. Copy all of the text in the PeriodicTable.txt file, and paste it into the HTML component editor. (Note that the PeriodicTableHTML.txt file contains over 6000 lines of code. Paste all of this code into the component editor.)
-#. Click **Save**.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/poll.rst b/docs/en_us/course_authors/source/exercises_tools/poll.rst
deleted file mode 100644
index ad34f0cf67..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/poll.rst
+++ /dev/null
@@ -1,173 +0,0 @@
-
-.. _Poll:
-
-##########
-Poll Tool
-##########
-
-You can run polls in your course so that your students can share opinions on different questions.
-
-.. image:: /Images/PollExample.png
-
-.. note:: Creating a poll requires you to export your course, edit some of your course's XML files in a text editor, and then re-import your course. We recommend that you create a backup copy of your course before you create the poll. We also recommend that you only edit the files that will contain polls in the text editor if you're very familiar with editing XML. 
-
-**************
-Terminology
-**************
-
-Sections, subsections, units, and components have different names in the **Course Outline** view and in the list of files that you'll see after you export your course and open the .xml files for editing. The following table lists the names of these elements in the **Course Outline** view and in a list of files.
-
-.. list-table::
-   :widths: 15 15
-   :header-rows: 0
-
-   * - Course Outline View
-     - File List
-   * - Section
-     - Chapter
-   * - Subsection
-     - Sequential
-   * - Unit
-     - Vertical
-   * - Component
-     - Discussion, HTML, problem, or video
-
-For example, when you want to find a specific section in your course, you'll look in the **Chapter** folder when you open the list of files that your course contains. To find a unit, you'll look in the **Vertical** folder.
-
-.. _Create a Poll:
-
-**************
-Create a Poll
-**************
-
-#. In the unit where you want to create the poll, create components that contain all the content that you want *except* for the poll. Make a note of the 32-digit unit ID that appears in the **Unit Identifier** field under **Unit Location**.
-
-#. Export your course. For information about how to do this, see :ref:`Exporting and Importing a Course`. Save the .tar.gz file that contains your course in a memorable location so that you can find it easily.
-
-#. Locate the .tar.gz file that contains your course, and then unpack the .tar.gz file so that you can see its contents in a list of folders and files.
-
-   - To do this on a Windows computer, you'll need to download a third-party program. For more information, see `How to Unpack a tar File in Windows <http://www.haskell.org/haskellwiki/How_to_unpack_a_tar_file_in_Windows>`_, `How to Extract a Gz File <http://www.wikihow.com/Extract-a-Gz-File>`_, `The gzip Home Page <http://www.gzip.org/>`_, or the `Windows <http://www.ofzenandcomputing.com/how-to-open-tar-gz-files/#windows>`_ section of the `How to Open .tar.gz Files <http://www.ofzenandcomputing.com/how-to-open-tar-gz-files/>`_ page.
-
-   - For information about how to do this on a Mac, see the `Mac OS X <http://www.ofzenandcomputing.com/how-to-open-tar-gz-files/#mac-os-x>`_ section of the `How to Open .tar.gz Files <http://www.ofzenandcomputing.com/how-to-open-tar-gz-files/>`_ page.
-
-#. In the list of folders and files, open the **Vertical** folder. 
-
-   .. note:: If your unit is not published, open the **Drafts** folder, and then open the **Vertical** folder in the **Drafts** folder.
-
-#. In the **Vertical** folder, locate the .xml file that has the same name as the unit ID that you noted in step 1, and then open the file in a text editor such as Sublime 2. For example, if the unit ID is e461de7fe2b84ebeabe1a97683360d31, you'll open the e461de7fe2b84ebeabe1a97683360d31.xml file.
-
-   The file contains a list of all the components in the unit, together with the URL names of the components. For example, the following file contains an HTML component followed by a Discussion component.
-
-   .. code-block:: xml
-     
-       <vertical display_name="Test Unit">
-        <html url_name="b59c54e2f6fc4cf69ba3a43c49097d0b"/>
-        <discussion url_name="8320c3d511484f3b96bdedfd4a44ac8b"/>
-       </vertical>
-
-#. Add the following poll code in the location where you want the poll. Change the text of the prompt to the text that you want.
-
-   .. code-block:: xml
-      
-    <poll_question display_name="Poll Question">
-      <p>Text of the prompt</p>
-      <answer id="yes">Yes</answer>
-      <answer id="no">No</answer>
-    </poll_question>
-
-   In the example above, if you wanted your poll to appear between the HTML component and the Discussion component in the unit, your code would resemble the following.
-
-   .. code-block:: xml
-
-     <vertical display_name="Test Unit">
-      <html url_name="b59c54e2f6fc4cf69ba3a43c49097d0b"/>
-      <poll_question display_name="Poll Question">
-        <p>Text of the prompt</p>
-        <answer id="yes">Yes</answer>
-        <answer id="no">No</answer>
-      </poll_question>
-      <discussion url_name="8320c3d511484f3b96bdedfd4a44ac8b"/>
-     </vertical>
-
-#. After you add the poll code, save and close the .xml file.
-
-#. Re-package your course as a .tar.gz file.
-
-   * For information about how to do this on a Mac, see `How to Create a Tar GZip File from the Command Line <http://osxdaily.com/2012/04/05/create-tar-gzip/>`_.
-
-   * For information about how to do this on a Windows computer, see `How to Make a .tar.gz on Windows <http://stackoverflow.com/questions/12774707/how-to-make-a-tar-gz-on-windows>`_.
-
-#. In Studio, re-import your course. You can now review the poll question and answers that you added in Studio.
-
-.. note::
-
-  * Although polls render correctly in Studio, you cannot edit them in Studio. You will need to follow the export/import process outlined above to make any edits to your polls.
-  
-  * A .csv file that contains student responses to the problem is not currently available for polls. However, you can obtain the aggregate data directly in the problem.  
-
-*********************
-Format description
-*********************
-
-The main tag of Poll module input is:
-
-.. code-block:: xml
-
-    <poll_question> ... </poll_question>
-
-``poll_question`` can include any number of the following tags:
-any xml and ``answer`` tag. All inner xml, except for ``answer`` tags, we call "question".
-
-==================
-poll_question tag
-==================
-
-Xmodule for creating poll functionality - voting system. The following attributes can
-be specified for this tag::
-
-    name - Name of xmodule.
-    [display_name| AUTOGENERATE] - Display name of xmodule. When this attribute is not defined - display name autogenerate with some hash.
-    [reset | False] - Can reset/revote many time (value = True/False)
-
-============
-answer tag
-============
-
-Define one of the possible answer for poll module. The following attributes can
-be specified for this tag::
-
-    id - unique identifier (using to identify the different answers)
-
-Inner text - Display text for answer choice.
-
-***********
-Example
-***********
-
-==================
-Example of poll
-==================
-
-.. code-block:: xml
-
-    <poll_question name="second_question" display_name="Second question">
-        <h3>Age</h3>
-        <p>How old are you?</p>
-        <answer id="less18">&lt; 18</answer>
-        <answer id="10_25">from 10 to 25</answer>
-        <answer id="more25">&gt; 25</answer>
-    </poll_question>
-
-================================================
-Example of poll with unable reset functionality
-================================================
-
-.. code-block:: xml
-
-    <poll_question name="first_question_with_reset" display_name="First question with reset"
-        reset="True">
-        <h3>Your gender</h3>
-        <p>You are man or woman?</p>
-        <answer id="man">Man</answer>
-        <answer id="woman">Woman</answer>
-    </poll_question>
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/problem_in_latex.rst b/docs/en_us/course_authors/source/exercises_tools/problem_in_latex.rst
deleted file mode 100644
index 963a397d15..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/problem_in_latex.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-.. _Problem Written in LaTeX:
-
-############################
-Problem Written in LaTeX
-############################
-
-.. warning:: This problem type is still a prototype and may not be supported in the future. By default, the ability to create these problems is not enabled in Studio. You must change the advanced settings in your course before you can create problems with LaTeX. Use this problem type with caution.
-
-If you have an problem that is already written in LaTeX, you can use this problem type to easily convert your code into XML. After you paste your code into the LaTeX editor, you'll only need to make a few minor adjustments. 
-
-.. note:: If you want to use LaTeX to typeset mathematical expressions
-          in problems that you haven't yet written, use any of the other problem
-          templates together with `MathJax <http://www.mathjax.org>`_. For more
-          information about how to create mathematical expressions in Studio using
-          MathJax, see *A Brief Introduction to MathJax in Studio*.
-
-.. image:: /Images/ProblemWrittenInLaTeX.png
- :alt: Image of a problem written in LaTeX
-
-************************************
-Create a Problem Written in LaTeX
-************************************
-
-To create a problem written in LaTeX:
-
-#. Enable the policy key in your course.
-
-   #. In Studio, click **Settings**, and then click **Advanced Settings**.
-   #. In the field for the **Enable LaTeX Compiler** policy key, change
-      **false** to **true**.
-   #. At the bottom of the page, click **Save Changes**.
-   
-#. In the unit where you want to create the problem, click **Problem**
-   under **Add New Component**, and then click the **Advanced** tab.
-#. Click **Problem Written in LaTeX**.
-#. In the component editor that appears, click **Edit**.
-#. In the lower left corner of the component editor, click **Launch
-   LaTeX Source Compiler**.
-#. Replace the example code with your own code. You can also upload a Latex file into the editor from your computer by clicking **Upload** in the bottom right corner.
-#. In the lower left corner of the LaTeX source compiler, click **Save &
-   Compile to edX XML**.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/problem_with_hint.rst b/docs/en_us/course_authors/source/exercises_tools/problem_with_hint.rst
deleted file mode 100644
index 1f7b483a89..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/problem_with_hint.rst
+++ /dev/null
@@ -1,164 +0,0 @@
-.. _Problem with Adaptive Hint:
-
-################################
-Problem with Adaptive Hint
-################################
-
-A problem with an adaptive hint evaluates a student's response, then gives the student feedback or a hint based on that response so that the student is more likely to answer correctly on the next attempt. These problems can be multiple choice, text input, numerical input, or math expression input problems.
-
-.. image:: /Images/ProblemWithAdaptiveHintExample.png
- :alt: Image of a problem with an adaptive hint
-
-******************************************
-Create a Problem with an Adaptive Hint
-******************************************
-
-To create the above problem:
-
-#. In the unit where you want to create the problem, click **Problem**
-   under **Add New Component**, and then click the **Advanced** tab.
-#. Click **Problem with Adaptive Hint**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, replace the example code with the code below.
-#. Click **Save**.
-
-.. code-block:: xml
-
-    <problem>
-	    <text>
-	        <script type="text/python" system_path="python_lib">
-	def test_str(expect, ans):
-	  print expect, ans
-	  ans = ans.strip("'")
-	  ans = ans.strip('"')
-	  return expect == ans.lower()
-
-	def hint_fn(answer_ids, student_answers, new_cmap, old_cmap):
-	  aid = answer_ids[0]
-	  ans = str(student_answers[aid]).lower()
-	  print 'hint_fn called, ans=', ans
-	  hint = ''
-	  if '10' in ans:
-	     hint = 'If the ball costs 10 cents, and the bat costs one dollar more than the ball, how much does the bat cost? If that is the cost of the bat, how much do the ball and bat cost together?'
-	  elif '.05' in ans:
-	     hint = 'Make sure to enter the number of cents as a whole number.'
-
-	  if hint:
-	    hint = "&lt;font color='blue'&gt;Hint: {0}&lt;/font&gt;".format(hint)
-	    new_cmap.set_hint_and_mode(aid,hint,'always')
-	        </script>
-	        <p>If a bat and a ball cost $1.10 together, and the bat costs $1.00 more than the ball, how much does the ball cost? Enter your answer in cents, and include only the number (that is, do not include a $ or a ¢ sign).</p>
-	        <p>
-	            <customresponse cfn="test_str" expect="5">
-	                <textline correct_answer="5" label="How much does the ball cost?"/>
-	                <hintgroup hintfn="hint_fn"/>
-	            </customresponse>
-	        </p>
-	    </text>
-    </problem>
-
-.. _Problem with Adaptive Hint XML:
-
-*********************************
-Problem with Adaptive Hint XML
-*********************************
-
-========
-Template
-========
-
-.. code-block:: xml
-
-	<problem>
-	  <text>
-	    <script type="text/python" system_path="python_lib">
-	def test_str(expect, ans):
-	  print expect, ans
-	  ans = ans.strip("'")
-	  ans = ans.strip('"')
-	  return expect == ans.lower()
-
-	def hint_fn(answer_ids, student_answers, new_cmap, old_cmap):
-	  aid = answer_ids[0]
-	  ans = str(student_answers[aid]).lower()
-	  print 'hint_fn called, ans=', ans
-	  hint = ''
-	  if 'incorrect answer 1' in ans:
-	     hint = 'hint for incorrect answer 1'
-	  elif 'incorrect answer 2' in ans:
-	     hint = 'hint for incorrect answer 2'
-
-	  if hint:
-	    hint = "&lt;font color='blue'&gt;Hint: {0}&lt;/font&gt;".format(hint)
-	    new_cmap.set_hint_and_mode(aid,hint,'always')
-	</script>
-	    <p>TEXT OF PROBLEM</p>
-	    <p>
-	      <customresponse cfn="test_str" expect="ANSWER">
-	        <textline correct_answer="answer" label="LABEL TEXT"/>
-	        <hintgroup hintfn="hint_fn"/>
-	      </customresponse>
-	    </p>
-	  </text>
-	</problem>
-
-.. note:: If the hints that you supply include characters, the letters must be lowercase.
-
-========
-Tags
-========
-
-* ``<text>``: Surrounds the script and text in the problem.
-* ``<customresponse>``: Indicates that this problem has a custom response.
-* ``<textline>``: Creates a response field in the LMS where the student enters a response.
-* ``<hintgroup>``: Specifies that the problem contains at least one hint.
-
-**Tag:** ``<customresponse>``
-
-  Attributes
-
-  (none)
-
-  Children
-
-     * ``<textline>``
-     * ``<hintgroup>``
-
-**Tag:** ``<textline>``
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-     :header-rows: 1
-
-     * - Attribute
-       - Description
-     * - label (required)
-       - Contains the text of the problem.
-     * - size (optional)
-       - Specifies the size, in characters, of the response field in the LMS.
-     * - hidden (optional)
-       - If set to "true", students cannot see the response field.
-     * - correct_answer (optional)
-       - The answer to the problem. To supply a correct_answer value that
-         includes letters, all letters **must be lowercase**. (Students'
-         responses to the problem are not case sensitive. They can contain both
-         uppercase and lowercase letters.)
-
-  Children
-  
-  (none)
-
-**Tag:** ``<hintgroup>``
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-     :header-rows: 1
-
-     * - Attribute
-       - Description
-     * - hintfn
-       - Must be set to **hint_fn** (that is, the tag must appear as ``<hintgroup hintfn="hint_fn"/>``).
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/exercises_tools/protein_builder.rst b/docs/en_us/course_authors/source/exercises_tools/protein_builder.rst
deleted file mode 100644
index 785c5010c8..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/protein_builder.rst
+++ /dev/null
@@ -1,94 +0,0 @@
-.. _Protein Builder:
-
-############################
-Protex Protein Builder Tool
-############################
-
-The Protex protein builder asks students to create specified protein shapes by stringing together amino acids. In the example below, the goal protein shape is a simple line. 
-
-
-.. image:: /Images/ProteinBuilder.png
-  :alt: Image of the protein builder
-
-.. _Create the Protein Builder:
-
-********************************
-Create the Protein Builder Tool
-********************************
-
-To create the protein builder:
-
-#. Under **Add New Component**, click **Problem**, and then click **Blank Advanced Problem**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, paste the Problem component code from below.
-#. Make any changes that you want, and then click **Save**.
-
-.. _Protein Builder Code:
-
-*************************
-Protein Builder Tool Code
-*************************
-
-.. code-block:: xml
-
-  <problem>
-      <p>The protein builder allows you string together the building blocks of proteins, amino acids, and see how that string will form into a structure. You are presented with a goal protein shape, and your task is to try to re-create it. In the example below, the shape that you are asked to form is a simple line.</p> 
-     <p>Be sure to click "Fold" to fold your protein before you click "Check".</p>
-
-  <script type="loncapa/python">
-
-  def protex_grader(expect,ans):
-    import json
-    ans=json.loads(ans)
-    if "ERROR" in ans["protex_answer"]:
-      raise ValueError("Protex did not understand your answer. Try folding the protein.")
-    return ans["protex_answer"]=="CORRECT"
-
-  </script>
- 
-    <text>
-      <customresponse cfn="protex_grader">
-        <designprotein2dinput width="855" height="500" target_shape="W;W;W;W;W;W;W"/>
-      </customresponse>
-    </text>
-    <solution>
-      <p>
-        Many protein sequences, such as the following example, fold to a straight line.You can play around with the protein builder if you're curious.
-      </p>
-      <ul>
-        <li>
-            Stick: RRRRRRR
-        </li>
-      </ul>
-    </solution>
-  </problem>
-
-In this code:
- 
-* **width** and **height** specify the dimensions of the application, in pixels.
-* **target_shape** lists the amino acids that, combined in the order specified, create the shape you've asked students to create. The list can only include the following letters, which correspond to the one-letter code for each amino acid. (This list appears in the upper-left corner of the protein builder.)
-
-  .. list-table::
-     :widths: 15 15 15 15
-     :header-rows: 0
-
-     * - A
-       - R
-       - N
-       - D
-     * - C
-       - Q
-       - E
-       - G
-     * - H
-       - I
-       - L
-       - K
-     * - M
-       - F
-       - P
-       - S
-     * - T
-       - W
-       - Y
-       - V
diff --git a/docs/en_us/course_authors/source/exercises_tools/text_input.rst b/docs/en_us/course_authors/source/exercises_tools/text_input.rst
deleted file mode 100644
index d02fa3c595..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/text_input.rst
+++ /dev/null
@@ -1,394 +0,0 @@
-.. _Text Input:
-
-########################
-Text Input Problem
-########################
-
-
-
-In text input problems, students enter text into a response field. The response can include numbers, letters, and special characters such as punctuation marks. Because the text that the student enters must match the instructor's specified answer exactly, including spelling and punctuation, we recommend that you specify more than one attempt for text input problems to allow for typographical errors.
-
-.. image:: /Images/TextInputExample.png
- :alt: Image of a text input probem
-
-****************************
-Create a Text Input Problem
-****************************
-
-You can create text input problems in the Simple Editor or in the Advanced Editor.
-
-.. note:: All problems must include labels for accessibility. The label generally includes the text of the main question in your problem. To add a label for a common problem, surround the text of the label with angle brackets pointed toward the text (>>label text<<).
-
-==============
-Simple Editor
-==============
-
-To create a text input problem in the Simple Editor, follow these steps.
-
-#. Under **Add New Component**, click **Problem**.
-#. In the **Select Problem Component Type** screen, click **Text Input**
-   on the **Common Problem Types** tab.
-#. In the new Problem component that appears, click **Edit**.
-#. Replace the default text with the text for your problem.
-#. Determine the text of the problem to use as a label, and then surround that text with two sets of angle brackets (>><<).
-#. Select the text of the answer, and then click the text input button. 
-   
-   .. image:: /Images/ProbCompButton_TextInput.png
-    :alt: Image of the text input button
-   
-   When you do this, an equal sign appears next to the answer.
-  
-   
-#. In the component editor, select the text of the explanation, and then click the 
-   explanation button to add explanation tags around the text.
-
-   .. image:: /Images/ProbCompButton_Explanation.png
-    :alt: Image of the explanation button
-
-#. On the **Settings** tab, specify the settings that you want. 
-#. Click **Save**.
-
-For the example problem above, the text in the Problem component is the
-following.
-
-::
-
-    >>What is the technical term that refers to the fact that, when enough people 
-    sleep under a bednet, the disease may altogether disappear?<<
-    = herd immunity
-
-    [explanation]
-    The correct answer is herd immunity. As more and more people use bednets, 
-    the risk of malaria begins to fall for everyone – users and non-users alike. 
-    This can fall to such a low probability that malaria is effectively eradicated 
-    from the group (even when the group does not have 100% bednet coverage).
-    [explanation]
-
-=====================
-Advanced Editor
-=====================
-
-To create this problem in the Advanced Editor, click the **Advanced** tab in the Problem component editor, and then replace the existing code with the following code.
-
-.. code-block:: xml
-
-  <problem>
-  <p>
-    <em>This problem is adapted from an exercise that first appeared in MITx's 14.73x The Challenges of Global Poverty course, spring 2013.</em>
-  </p>
-  <p>What is the technical term that refers to the fact that, when enough people sleep under a bednet, the disease may altogether disappear?</p>
-  <stringresponse answer="herd immunity" type="ci regexp">
-         <additional_answer>community immunity</additional_answer>
-          <additional_answer>population immunity</additional_answer>
-          <textline size="20" label="What is the technical term that refers to the fact that, when enough people sleep under a bednet, the disease may altogether disappear?"/>
-          <hintgroup>
-              <stringhint answer="contact immunity" type="ci" name="contact_immunity_hint" />
-              <hintpart on="contact_immunity_hint">
-                  <startouttext />
-                  In contact immunity, a vaccinated individual passes along his immunity to another person through contact with feces or bodily fluids. The answer to the question above refers to the form of immunity that occurs when so many members of a population are protected, an infectious disease is unlikely to spread to the unprotected population.
-                  <endouttext />
-              </hintpart >
-              <stringhint answer="firewall immunity" type="ci" name="firewall_immunity_hint" />
-              <hintpart on="firewall_immunity_hint">
-                  <startouttext />
-                  Although a firewall provides protection for a population, the term "firewall" is used more in computing and technology than in epidemiology.
-                  <endouttext />
-              </hintpart >
-          </hintgroup>
-  </stringresponse>
-  <solution>
-    <div class="detailed-solution">
-      <p>Explanation</p>
-      <p>The correct answer is <b>herd immunity</b>. As more and more people use bednets, the risk of malaria begins to fall for everyone – users and non-users alike. This can fall to such a low probability that malaria is effectively eradicated from the group (even when the group does not have 100% bednet coverage).</p>
-    </div>
-  </solution>
-  </problem>
-
-
-
-
-******************************************
-Multiple Responses in Text Input Problems
-******************************************
-
-You can specify more than one correct response for text input problems. 
-For example, instead of requiring students to enter exactly "Dr. Martin Luther 
-King, Junior," you can allow answers of "Martin Luther King," "Doctor Martin 
-Luther King," and other variations. To do this, you can use the Simple Editor or the Advanced Editor.
-
-==============
-Simple Editor
-==============
-
-To specify additional correct responses in the Simple Editor, include "or=" (without the quotation marks) before each additional correct response.
-
-::
-
-    >>What African-American led the United States civil rights movement during the 1960s?<<
-    = Dr. Martin Luther King, Jr.
-    or= Dr. Martin Luther King, Junior
-    or= Martin Luther King, Jr.
-    or= Martin Luther King
-
-=====================
-Advanced Editor
-=====================
-
-To specify additional correct responses in the Advanced Editor, add an ``<additional_answer>``  for each correct response inside the opening and closing ``<stringresponse>`` tags.
-
-.. code-block:: xml
-
-  <problem>
-
-  <p>What African-American led the United States civil rights movement during the 1960s?</p>
-    
-  <stringresponse answer="Dr. Martin Luther King, Jr." type="ci" >
-    <additional_answer>Dr. Martin Luther King, Junior</additional_answer>
-    <additional_answer>Martin Luther King, Jr.</additional_answer>
-    <additional_answer>Martin Luther King</additional_answer>
-    <textline label="What African-American led the United States civil rights movement during the 1960s?" size="20"/>
-  </stringresponse>
-
-  </problem>
-
-
-******************************************
-Case Sensitivity and Text Input Problems
-******************************************
-
-By default, text input problems do not require a case sensitive response. You can change this
-and require a case sensitive answer.
-
-To make a text input response case sensitive, you must use :ref:`Advanced Editor`.
-
-In the Advanced Editor, you see that the **type** attribute of the **stringresponse** 
-element equals **ci**, for *case insensitive*. For example:
-
-::
-
-    <stringresponse answer="Michigan" type="ci">
-      <textline size="20"/>
-    </stringresponse>
-
-To make the response case sensitive, change the value of the **type** attribute to **cs**.
-
-::
-
-    <stringresponse answer="Michigan" type="cs">
-      <textline size="20"/>
-    </stringresponse>
-
-*************************************************
-Response Field Length of Text Input Problems
-*************************************************
-
-By default, the response field for text input problems is 20 characters long. 
-
-You should preview the unit to ensure that the length of the response input field
-accommodates the correct answer, and provides extra space for possible incorrect answers.
-
-If the default response field length is not sufficient, you can change it using :ref:`Advanced Editor`.
-
-In the advanced editor, in the XML block for the answer, you see that the **size** attribute of the **textline** element equals **20**:
-
-::
-
-    <stringresponse answer="Democratic Republic of the Congo" type="ci">
-      <textline size="20"/>
-    </stringresponse>
-
-To change the response field length, change the value of the **size** attribute:
-
-::
-
-    <stringresponse answer="Democratic Republic of the Congo" type="ci">
-      <textline size="40"/>
-    </stringresponse>
-
-********************************************************
-Hints and Regular Expressions in Text Input Problems
-********************************************************
-
-You can provide hints that appear when students enter common incorrect answers in text input problems. You can also set a text input problem to allow a regular expression as an answer. To do this, you'll have to modify the problem's XML in the Advanced Editor. 
-
-The regular expression that the student enters must contain the part of the answer that the instructor specifies. For example, if an instructor has specified  ``<answer="example answer" type="regexp">``, correct answers include ``example answered``, ``two example answers``, or even ``==example answer==``, but not ``examples`` or ``example anser``.
-
-You can add ``regexp`` to the value of the ``type`` attribute, for example: ``type="ci regexp"`` or ``type="regexp"`` or ``type="regexp cs"``. In this case, any answer or hint are treated as regular expressions.
-
-.. _Text Input Problem XML:
-
-***********************
-Text Input Problem XML
-***********************
-
-==============
-Template
-==============
-
-.. code-block:: xml
-
-  <problem>
-      <p>Problem text</p>
-      <stringresponse answer="Correct answer 1" type="ci regexp">
-          <additional_answer>Correct answer 2</additional_answer>
-          <additional_answer>Correct answer 3</additional_answer>
-          <textline size="20" label="label text"/>
-          <hintgroup>
-              <stringhint answer="Incorrect answer A" type="ci" name="hintA" />
-                <hintpart on="hintA">
-                    <startouttext />Text of hint for incorrect answer A<endouttext />
-                </hintpart >
-              <stringhint answer="Incorrect answer B" type="ci" name="hintB" />
-                <hintpart on="hintB">
-                    <startouttext />Text of hint for incorrect answer B<endouttext />
-                </hintpart >
-              <stringhint answer="Incorrect answer C" type="ci" name="hintC" />
-                <hintpart on="hintC">
-                    <startouttext />Text of hint for incorrect answer C<endouttext />
-                </hintpart >
-          </hintgroup>
-      </stringresponse>
-      <solution>
-      <div class="detailed-solution">
-      <p>Explanation or Solution Header</p>
-      <p>Explanation or solution text</p>
-      </div>
-    </solution>
-  </problem>
-
-=======
-Tags
-=======
-
-* ``<stringresponse>``: Indicates that the problem is a text input problem. 
-* ``<textline>``: Child of ``<stringresponse>``. Creates a response field in the LMS where the student enters a response.
-* ``<additional_answer>`` (optional): Specifies an additional correct answer for the problem. A problem can contain an unlimited number of additional answers.
-* ``<hintgroup>`` (optional): Indicates that the instructor has provided hints for certain common incorrect answers.
-* ``<stringhint />`` (optional): Child of ``<hintgroup>``. Specifies the text of the incorrect answer to provide the hint for. Contains answer, type, name.
-* ``<hintpart>``: Contains the name from ``<stringhint>``. Associates the incorrect answer with the hint text for that incorrect answer.
-* ``<startouttext />``: Indicates the beginning of the text of the hint.
-* ``<endouttext />``: Indicates the end of the text of the hint.
-
-**Tag:** ``<stringresponse>``
-
-Indicates that the problem is a text input problem.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - answer (required)
-       - Specifies the correct answer. To designate the answer as a regular expression, add "regexp" to the **type** attribute. If you do not add "regexp" to the **type** attribute, the student's answer must match the value in this attribute exactly.
-     * - type (optional)
-       - Can specify whether the problem is case sensitive and allows regular expressions. If the ``<stringresponse>`` tag includes ``type="ci"``, the problem is not case sensitive. If the tag includes ``type="cs"``, the problem is case sensitive. If the tag includes ``type="regexp"``, the problem allows regular expressions. A **type** attribute in a ``<stringresponse>`` tag can also combine these values. For example, ``<stringresponse type="regexp cs">`` specifies that the prolem allows regular expressions and is case sensitive.
-
-  Children
-
-  * ``<textline />`` (required)
-  * ``<additional_answer>`` (optional)
-  * ``<hintgroup>`` (optional)
-    
-**Tag:** ``<textline />``
- 
-Creates a response field in the LMS where the student enters a response.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - label (required)
-       - Contains the text of the problem.
-     * - size (optional)
-       - Specifies the size, in characters, of the response field in the LMS.
-     * - hidden (optional)
-       - If set to "true", students cannot see the response field.
-     * - correct_answer (optional)
-       - Lists the correct answer to the problem.
-
-  Children
-  
-  (none)
-
-**Tag:** ``<additional_answer>``
-
-Specifies an additional correct answer for the problem. A problem can contain an unlimited number of additional answers.
-
-  Attributes
-
-  (none)
-
-  Children
-
-  (none)
-
-**Tag:** ``<hintgroup>``
-
-Indicates that the instructor has provided hints for certain common incorrect answers.
-
-  Attributes
-
-  (none)
-
-  Children
-  
-  * ``<stringhint>`` (required)
-
-**Tag:** ``<stringhint>``
-
-Specifies a common incorrect answer to the problem.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - answer (required)
-       - The text of the incorrect answer.
-     * - name (required)
-       - The name of the hint that you want to provide.
-     * - type
-       - Specifies whether the text of the specified incorrect answer is case sensitive. Can be set to "cs" (case sensitive) or "ci" (case insensitive).
-
-  Children
-
-  * ``<hintpart>`` (required)
-
-**Tag:** ``<hintpart>``
-
-Associates a common incorrect answer with the hint for that incorrect answer.
-
-  Attributes
-
-  .. list-table::
-     :widths: 20 80
-
-     * - Attribute
-       - Description
-     * - on
-       - The name of the hint. This must be the same as the **name** attribute of the ``<stringhint>`` tag. (The ``<stringhint>`` tag provides the name of the hint and the incorrect answer to associate with the hint. The ``<hintpart>`` tag contains the name of the hint and the text of the hint.)
-
-  Children
-
-  * ``<startouttext />`` (required)
-  * ``<endouttext />`` (required)
-
-**Tags:** ``<startouttext />`` and ``<endouttext>``
-
-Surround the text of the hint.
-
-  Attributes
-  
-  (none)
-
-  Children
-  
-  (none)
-
diff --git a/docs/en_us/course_authors/source/exercises_tools/word_cloud.rst b/docs/en_us/course_authors/source/exercises_tools/word_cloud.rst
deleted file mode 100644
index 9b9e94d4fe..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/word_cloud.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-.. _Word Cloud:
-
-##################
-Word Cloud Tool
-##################
-
-
-In a word cloud tool, students enter words into a field in response
-to a question or prompt. The words all the students have entered then
-appear instantly as a colorful graphic, with the most popular responses
-appearing largest. The graphic becomes larger as more students answer.
-Students can both see the way their peers have answered and contribute
-their thoughts to the group.
-
-
-For example, the following word cloud was created from students'
-responses to a question in a HarvardX course.
-
-.. image:: /Images/WordCloudExample.png
-  :alt: Image of a word cloud problem
-
-****************************
-Create a Word Cloud Tool
-****************************
-
-To create a word cloud tool:
-
-#. Add the Word Cloud advanced component. 
-
-    #. On the **Settings** menu, click **Advanced Settings**.
-
-    #. In the field for the **Advanced Module List** policy key, place your
-       cursor between the brackets.
-
-    #. Enter the following value. Make sure to include the quotation marks.
-
-       ``"word_cloud"``
-
-    4. At the bottom of the page, click **Save Changes**.
-
-       The page refreshes automatically. At the top of the page, you see a
-       notification that your changes have been saved.
-
-    5. Return to the unit where you want to add the specialized problem. The
-       list of possible components now contains an Advanced component.
-
-#. In the unit where you want to create the problem, click **Advanced**
-   under **Add New Component**.
-#. In the list of problem types, click **Word Cloud**.
-#. In the component that appears, click **Edit**.
-#. In the component editor, specify the settings that you want. You can
-   leave the default value for everything except **Display Name**.
-
-   -  **Display Name**: The name that appears in the course ribbon and
-      as a heading above the problem.
-   -  **Inputs**: The number of text boxes into which students can enter
-      words, phrases, or sentences.
-   -  **Maximum Words**: The maximum number of words that the word cloud
-      displays. If students enter 300 different words but the maximum is
-      set to 250, only the 250 most commonly entered words appear in the
-      word cloud.
-   -  **Show Percents**: The number of times that students have entered
-      a given word as a percentage of all words entered appears near
-      that word.
-
-#. Click **Save**.
diff --git a/docs/en_us/course_authors/source/exercises_tools/zooming_image.rst b/docs/en_us/course_authors/source/exercises_tools/zooming_image.rst
deleted file mode 100644
index 65bd5408f5..0000000000
--- a/docs/en_us/course_authors/source/exercises_tools/zooming_image.rst
+++ /dev/null
@@ -1,65 +0,0 @@
-.. _Zooming Image:
-
-##################
-Zooming Image Tool
-##################
-
-You may want to present information to your students as an image. If your image is very large or very detailed, students may not be able to see all the information in the image. You can use the zooming image tool to enlarge areas of your image as the student moves the mouse over the image, as in the example below.
-
-.. image:: /Images/Zooming_Image.png
-  :alt: Example zooming image tool showing a chemistry exercise
-
-***********************************
-Components of a Zooming Image Tool
-***********************************
-
-To create a zooming image tool, you need the following files.
-
-* The image that you want students to see when they access the unit.
-* The image that appears in the magnified area when a student clicks the regular image. This image may be larger than the regular image.
-* The **jquery.loupeAndLightbox.js** JavaScript file. Every zooming image tool uses this JavaScript file, and you won't make any changes to it. `To download this file, right-click here <http://files.edx.org/jquery.loupeAndLightbox.js>`_, and then click **Save Link As** to save the file on your computer.
-
-****************************
-Create a Zooming Image Tool
-****************************
-
-#. Upload your regular-sized image file, your small image file, and the **jquery.loupeAndLightbox.js** file to the **Files & Uploads** page. For more information about how to do this, see :ref:`Add Files to a Course`.
-
-#. Under **Add New Component**, click **html**, and then click **Zooming Image**.
-
-#. In the new component that appears, click **Edit**.
-
-#. In the component editor, replace the default problem text with your own text.
-
-#. Switch to the **HTML** tab.
-
-#. Replace the following placeholders with your own content.
-
-   - Replace the following file name and path with the name and path of the image that you want to appear magnified when the user hovers over the regular image.
-
-     **https://studio.edx.org/c4x/edX/DemoX/asset/pathways_detail_01.png**
-
-     For example, your file name and path may be **/static/Image1.jpg**.
-
-   - Replace the following file name and path with the name and path of the image that you want to appear when the page opens.
-     
-     **https://studio.edx.org/c4x/edX/DemoX/asset/pathways_overview_01.png**
-
-     For example, your file name and path may be **/static/Image2.jpg**.
-
-   - Replace the following name and file path with the name and path of the JavaScript file for your course.
-
-     **https://studio.edx.org/c4x/edX/DemoX/asset/jquery.loupeAndLightbox.js**
-
-     Because you uploaded the **jquery.loupeAndLightbox.js** file to the **Files & Uploads** page, your file name and path is **/static/jquery.loupeAndLightbox.js**.
-
-   - (Optional) If you want the magnified area to be larger or smaller, change the **width** and **height** values from 350 to larger or smaller numbers. For example, you can change both numbers to 450. Or, if you want a horizontal oval instead of a circle, you can change the **width** value to a number such as 500 and the **height** value to a number such as 150.
-
-   The HTML in your zooming image tool may resemble the following.
-
-   .. image:: /Images/ZoomingImage_Modified.png
-     :alt: Example HTML for a zooming image tool
-
-#. Click **Save** to save the HTML component.
-
-
diff --git a/docs/en_us/course_authors/source/getting_started/accessibility.rst b/docs/en_us/course_authors/source/getting_started/accessibility.rst
deleted file mode 100644
index 81824dc4f0..0000000000
--- a/docs/en_us/course_authors/source/getting_started/accessibility.rst
+++ /dev/null
@@ -1,542 +0,0 @@
-.. _Guidelines for Creating Accessible Content:
-
-###################################################
-Guidelines for Creating Accessible Content
-###################################################
-
- 
-EdX strives to create an innovative, online-learning platform that promotes accessibility for everyone, including learners with disabilities. 
-We intend for these guidelines to help the course teams understand the importance of considering accessibility when designing courses and provide guidance so that they can serve the widest possible audience. 
-*Accessibility* in online instruction refers to the degree to which information and activities are available to all students equally, regardless of physical or other disabilities.
-
-Our guidance is based on international standards and principles for web accessibility (W3C WCAG 2.0) and universal design (usable by all, to the greatest extent possible, without the need for adaptation or specialized design). 
-Instructors who build courses based on these principles promote the opportunity to create an inclusive experience that considers the diverse set of learning styles and needs of all learners—including learners with disabilities, learners who speak English as a second language, learners with technical issues such as low bandwidth internet or no access to audio, and learners with age-related capability issues. For purposes of these guidelines, we have assumed that end users will be equipped with the appropriate adaptive technology and compatible software.
-
-Occasionally, unanticipated accessibility barriers will arise. 
-To supplement the accessibility you can achieve within the edX platform, we recommend that you engage the resources available at your institution to support learners with disabilities. 
-Most institutions offer disability support services and information technology resources that provide accessibility advice and support. These professionals are trained in making disability accommodation decisions and can advise you on what accommodations may be appropriate in light of the goals of the course and the inherent instructional methodologies employed.
-
-As technology and accessibility improvements are constantly emerging, we plan to update these guidelines periodically. 
-
-See the following sections for more information:
-
-* :ref:`Supporting Learners with Diverse Needs`
-* :ref:`Accessibility Best Practices`
-* :ref:`Conclusion`
-
-
-.. _Supporting Learners with Diverse Needs:
-
-************************************************************
-Supporting Learners with Diverse Needs
-************************************************************
-
-Almost one-fifth of the world's population has some kind of disability. 
-Online courses can reduce many barriers to education for these learners by providing access to courses from any location, at any time, and through the use of assistive technologies.
-
-EdX is dedicated to creating a platform that is not only itself accessible, but also enables course creators to create accessible content. 
-If you encounter platform issues that you believe may affect your ability to provide accessible course content, please contact us at accessibility@edx.org. 
-We also welcome your comments and questions.
-
-In the following sections, we outline guidelines for creating and delivering course content that allows students to use built-in accessibility functionality (such as magnification and zoom features), assistive technologies, and alternative formats. 
-These practices consider learners such as the following:
-
-* Blind learners who use a screen reader, which reads page text aloud, or a Braille display device, which renders page text in Braille.
-
-* Low-vision learners who use screen magnification software to enlarge text and other onscreen content.
-
-* Learners with vision impairments, such as difficulty seeing in low-light conditions, who modify their browser or operating system to change background colors and text settings to make text easier to read.
-
-* Learners with learning disabilities, such as dyslexia, who use text-to-speech technology that reads page content aloud.
-
-* Physically disabled learners who use switching devices, voice recognition software, or eye-gaze activated technology instead of a standard mouse or keyboard to control their computer.
-
-* Learners who modify their operating system settings to make the mouse or keyboard easier to use.
-
-* Learners with hearing impairments who cannot access audio content and need the equivalent information in an alternative format, such as captions or a transcript.
-
-We highly recommend that you implement the best practices shared with you in this document and other widely available resources (some of which are referred to herein). 
-As mentioned above, if you cannot easily address these barriers, we recommend that you consult with any disability-related resources at your institution 
-(Disability Services, Assistive Technology, or Accessibility). 
-While your ability to support students in the MOOC context may be different from supporting on-campus students, 
-we encourage you to develop a plan to respond to students who inform you of accessibility barriers to learning. 
-However, given the large numbers of learners enrolling in many of the courses, you will quickly see how important it is to address accessibility concerns when creating a course.
-
-
-.. _Accessibility Best Practices:
-
-************************************************************
-Accessibility Best Practices
-************************************************************
-
-* :ref:`Best Practices for Universal Design for Learning`
-* :ref:`Best Practices for Readability`
-* :ref:`Best Practices for Accessible PDFs`
-* :ref:`Best Practices for Custom Content Types`
-* :ref:`Best Practices for Describing Images`
-* :ref:`Best Practices for Accessible Media`
-* :ref:`Best Practices for HTML Markup`
-
-
-.. _Best Practices for Universal Design for Learning:
-
-====================================================
-Best Practices for Universal Design for Learning
-====================================================
-
-Universal Design for Learning focuses on delivering courses in a format so that as many of your learners as possible can 
-successfully interact with the learning resources and activities you provide them, without compromising on pedagogic rigor and quality.
-
-The principles of Universal Design for Learning can be summarized as:
-
-#. Present information and content in different ways.
-#. Differentiate the ways that students can express what they know.
-#. Stimulate interest and motivation for learning.
-
-Instructors can apply these principles in course design by:
-
-* Designing resources and activities that can be accessed by learners in different ways 
-  (for example, providing text that allows a student to enlarge it or change color, a diagram with an equivalent text description, or a video with audio and text captions).
-
-* Providing multiple ways for learners to engage with information and demonstrate their knowledge. 
-  This is particularly important when developing exercises and assessments.
-  
-* Identifying activities that require specific sensory or physical capability, such as activities that require color identification, 
-  for which accommodating the specific accessibility needs of students will be difficult or impossible. 
-  In these cases, consider whether there is a pedagogical justification for these requirements. 
-  If there is a justification, consider communicating these requirements to prospective students in the course description and establish a 
-  plan for responding to students who encounter barriers that can be addressed without fundamental alteration. 
-  If there is no justification for the requirements, we recommend that you modify the learning activities to be more flexible and broadly accessible.
-  
-**Resources**
-
-* Delivering Accessible Digital Learning (JISC Techdis) provides a useful overview of an inclusive approach to course design: 
-  http://www.jisctechdis.ac.uk/techdis/resources/accessiblecontent
-
-* The National Center on Universal Design for Learning provides a helpful overview on Universal Design for Learning: 
-  http://www.udlcenter.org/implementation/postsecondary
-
-
-.. _Best Practices for Readability:
-
-====================================================
-Best Practices for Readability
-====================================================
-
-EdX courses have a global and diverse audience. 
-Learners will be better positioned to access the concepts of your content if it is written in clear, straightforward language and the content is well structured. 
-Use appropriate terminology to your subject area, but keep it as clear and unambiguous as possible to help learners who:
-
-* Are not native English speakers; or
-* Have a disability that affects reading, such as dyslexia or a visual impairment.
-
-To produce content that is more readable by all students:
-
-* Make the names of elements such as course sections, subsections, units, components, and discussion topics descriptive 
-  and easy to skim by putting the important information first in the name. 
-  These names are used in navigation menus, page headings, and section headings and are signposts that help learners navigate your course and read course content. 
-  “Front-loading” menus and headings particularly helps screen reader users, who can more quickly assess the relevance of a link or heading.
-
-* When creating written learning resources, break text into sections by using HTML elements, such as headings, paragraphs, and lists. 
-  Long blocks of unbroken text are a barrier to most readers. Segmented content is more inviting and is easier to navigate and search. 
-  See :ref:`Best Practices for HTML Markup` for guidance on creating accessible HTML.
-
-* Avoid jargon. If unfamiliar words or phrases are relevant to the subject, explain them when they are first used, and include a glossary with your course materials. 
-  When using an abbreviation or acronym, write out the phrase the first time it appears: for example, “National Aeronautics and Space Administration (NASA).”
-
-* Use link text that clearly explains the link destination (for example, “Review the Course Syllabus”). 
-  Avoid using constructs like “You can review the Course Syllabus here.” For links that point to documents rather than web pages, 
-  include the document type in the link (e.g., “Course Syllabus (PDF)”).
-
-**Resources**
-
-* The Center for Plain Language provides detailed resources on writing clearly and concisely, in language appropriate for your content and target audience: 
-  http://centerforplainlanguage.org/about-plain-language/checklist/
-
-.. _Best Practices for Accessible PDFs:
-
-====================================================
-Best Practices for Accessible PDFs
-====================================================
-
-PDF is a common format for course materials, including textbooks supplied by publishers. 
-However, converting materials to PDFs can create accessibility barriers, particularly for learners with visual impairments. 
-To improve the accessibility of your PDFs, review the guidance below about preparing documents for conversion, using Adobe Acrobat Professional, 
-and working with third-party suppliers.
-
-+++++++++++++++++++++++++++++++++++++++++++++
-Converting Microsoft Office documents to PDF
-+++++++++++++++++++++++++++++++++++++++++++++
-The teaching materials that you will convert to PDFs may use different formats—for example, your syllabus may be in Word, 
-your presentation slides in PowerPoint, and your textbooks in publisher-supplied PDF. 
-Use the tools available in the applicable software to create well-structured source documents. 
-This early step helps minimize issues that may be difficult or impossible to address later in the conversion process.
-
-**Preparing Word documents**
-
-* Keep formatting simple. Use headings, paragraphs, lists, images, and captions, and tables for tabular data. 
-  Don’t add unnecessary indents, rules, columns, blank lines, and typographic variation. The simpler the formatting, the easier it will be to make an accessible PDF document.
-
-* Use styles for formatting your text, such as Normal, Heading 1, and Heading 2, rather than manually formatting text using bold and indents. 
-  Add alternative text to images (see :ref:`Best Practices for Describing Images`) using Word’s picture formatting options.
-
-**Preparing PowerPoint documents**
-
-* To help make your content accessible and comprehensible to learners who use screen reading software, start in Outline view and include all of your content as text. 
-  Add design elements and images after completing the outline, and use PowerPoint’s picture formatting options to include detailed descriptions of images that convey information. Avoid adding animations or transitions, as they will not be saved with the PDF format.
-
-* Use the Home > Drawing > Arrange > Selection Pane option to view the reading order of objects on each slide. If the reading order is not logical, reorder the objects.
-
-* Use the Home > Slides > Reset option to give each slide a unique and informative title. The title can be hidden if preferred.
-
-* Identify column headers for any data table using PowerPoint’s table formatting options (Tables > Table Options > Header Row), 
-  and ensure that each header contains informative text describing the data in that column.
-
-**Preparing Excel spreadsheets**
-
-* Use a unique and informative title for each worksheet tab.
-
-* Include text alternatives for images (see :ref:`Best Practices for Describing Images`) using Excel’s picture formatting options.
-
-* Identify column headers using Excel’s table formatting options (Table > Table Options > Header Row), and include in each header cell informative text describing the data in that column.
-
-* Do not use blank cells for formatting.
-
-* Use descriptive link text rather than URLs in data cells.
-
-**Converting Word, PowerPoint, and Excel documents to PDF**
-
-To generate PDFs from Microsoft Office documents, use the **Save as PDF** option. 
-Make sure the **Document Structure Tags for Accessibility** option is selected (consult your software documentation for more details). 
-Note that PDFs generated from Windows versions of Office will be more accessible than those generated from Mac OS.
-
-+++++++++++++++++++++++++++++++++++++++++++++
-Working with third-party supplied PDFs
-+++++++++++++++++++++++++++++++++++++++++++++
-
-When you control the creation of a PDF, you have greater control over the document’s accessibility. 
-If you use PDFs provided by third parties, including textbooks supplied by publishers, the document’s accessibility may be unknown.
-
-**Asking the right questions about accessible PDFs**
-
-Where possible, ask the supplier of the PDF if the PDF is accessible. If it isn’t, ask whether the supplier can provide an accessible version. Questions to ask include:
-
-* Can screen readers read the document text?
-* Do images in the document include text descriptions?
-* Are all tables, charts, and math provided in an accessible format?
-* Does all media include text equivalents?
-* Does the document have navigational aids, such as a table of contents, index, headings, and bookmarks?
-
-+++++++++++++++++++++++++++++++++++++++++++++
-Updating PDFs for accessibility
-+++++++++++++++++++++++++++++++++++++++++++++
-
-You may need to update your existing teaching materials in PDF format to improve accessibility. This might include PDFs that were:
-
-* Created by scanning a hard-copy document;
-* Generated from a document that was not created with accessibility in mind; or
-* Generated by a process that does not preserve source accessibility information.
-
-In such cases, you need special software, such as Adobe Acrobat Professional, to enhance the accessibility of the PDF. 
-PDFs that are created from scanned documents require a preliminary Optical Character Recognition (OCR) step to generate a text version of the document. 
-The procedure checks documents for accessibility barriers, adds properties and tags for document structure, sets the document’s language, and adds alternative text for images.
-
-**Resources**
-
-* Microsoft provides detailed guidance on generating accessible PDFs from Microsoft Office applications, including Word, Excel, and PowerPoint:
-  http://office.microsoft.com/en-gb/word-help/create-accessible-pdfs-HA102478227.aspx
-
-* Adobe provides a detailed accessibility PDF repair workflow using Acrobat XI: 
-  http://www.adobe.com/content/dam/Adobe/en/accessibility/products/acroba t/pdfs/acrobat-xi-pdf-accessibility-repair-workflow.pdf
-
-* Adobe Accessibility (Adobe) is a comprehensive collection of resources on PDF authoring and repair, using Adobe’s products: 
-  http://www.adobe.com/accessibility.html
-
-* PDF Accessibility (University of Washington) provides a step-by-step guide to creating accessible PDFs from different sources and using different applications: 
-  http://www.washington.edu/accessibility/pdf/
-
-* PDF Accessibility (WebAIM) provides a detailed and illustrated guide on creating accessible PDFs: 
-  http://webaim.org/techniques/acrobat/
-
-* The National Center of Disability and Access to Education has a collection of one- page “cheat sheets” on accessible document authoring: 
-  http://ncdae.org/resources/cheatsheets/
-
-* The Accessible Digital Office Document (ADOD) Project provides guidance on creating accessible Office documents: 
-  http://adod.idrc.ocad.ca/
-
-.. _Best Practices for Custom Content Types:
-
-====================================================
-Best Practices for Custom Content Types
-====================================================
-Using different content types can significantly add to the learning experience. 
-We discuss below how to design several custom content types to be accessible to students with disabilities.
-
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-Information graphics (charts, diagrams, illustrations)
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Although images can be helpful for communicating concepts and information, they present challenges for people with visual impairments. 
-For example, a chart that requires color perception or a diagram with tiny labels and annotations will likely be difficult to comprehend for learners with color blindness or low vision. 
-All images present a barrier to learners who are blind.
-
-The following are best practices for making information graphics accessible to visually impaired students:
-
-* Avoid using only color to distinguish important features of the image. For example, on a line graph, use a different symbol as well as color to distinguish the data elements.
-* Whenever possible, use an image format, such as SVG, that supports scaling. Consider providing a high-resolution version of complex graphics that have small but essential details.
-* Provide a text alternative that describes the information in the graphic. For charts and graphs, a text alternative could be a table displaying the same data. 
-  See :ref:`Best Practices for Describing Images` for details about providing text alternatives for images.
-
-+++++++++++++++++++++++++++++++++++++++++++
-Math content
-+++++++++++++++++++++++++++++++++++++++++++
-
-Math in online courses has been challenging to deliver in a way that is accessible to people with vision impairments. 
-Instructors frequently create images of equations rather than including text equations. 
-Math images cannot be modified by people who need a high-contrast display and cannot be read by screen reader software.
-EdX uses MathJax to render math content in a format that is clear, readable, and accessible to people who use screen readers. 
-MathJax works together with math notation, like LaTeX and MathML, to render mathematical equations as text instead of images. 
-We recommend that you use MathJax to display your math content. 
-You can learn more about using MathJax in the MathJax documentation on accessibility (see the link in “Resources” below). 
-We will update these guidelines as improvements to MathJax are developed.
-
-++++++++++++++++++++++++++++++++++++++++++++
-Simulations and interactive modules
-++++++++++++++++++++++++++++++++++++++++++++
-
-Simulations, including animated or gamified content, can enhance the learning experience. 
-In particular, they benefit learners who may have difficulty acquiring knowledge from reading and processing textual content alone. 
-However, simulations can also present some groups of learners with difficulties. 
-To minimize barriers, consider the intended learning outcome of the simulation. 
-Is it to reinforce understanding that can also come from textual content or a video lecture, or is it to convey new knowledge that other course resources can’t cover? 
-Providing alternative resources will help mitigate the impact of any barriers.
-
-Although you can design simulations to avoid many accessibility barriers, some barriers, particularly in simulations supplied by third parties, 
-may be difficult or impossible to address for technical or pedagogic reasons. 
-Understanding the nature of these barriers can help you provide workarounds for learners who are affected. 
-Keep in mind that attempted workarounds for simulations supplied by third parties may require the supplier’s consent if copyrighted material is involved.
-
-Consider the following questions when creating simulations, keeping in mind that as the course instructor, 
-you enjoy considerable freedom in selecting course objectives and outcomes. 
-Additionally, if the visual components of a simulation are so central to your course design, 
-providing alternate text description and other accommodations may not be practical or feasible:
-
-* Does the simulation require vision to understand? If so, provide text describing the concepts that the simulation conveys.
-* Is the mouse necessary to operate the simulation? If so, provide text describing the concepts that the simulation conveys.
-* Does the simulation include flashing or flickering content that could trigger seizures? If so and this content is critical to the nature of the simulation:
- 
-  * do not require learners to use the simulation for a required assessment
-    activity; and
-  * provide a warning that the simulation contains flickering or flashing content.
-
-As best practices continue to emerge in this area, we will update these guidelines.
-
-++++++++++++++++++++++++++++++++++++++++++++
-Online exercises and assessments
-++++++++++++++++++++++++++++++++++++++++++++
-
-For activities and assessments, consider difficulties students may have in completing an activity and consider using multiple assessment options, 
-keeping in mind that some of the end users have disabilities. 
-Focus on activities that allow students to complete the activity and submit their work without difficulties.
-
-Some students take longer to read information and input responses, such as students with visual or mobility impairments and students who need time to comprehend the information. 
-If an exercise has a time limit, consider whether it’s long enough to allow students to respond. Advanced planning may help cut down on the number of students requesting 
-time extensions.
-
-Some online exercise question types may be difficult for students who have vision or mobility impairments. For example:
-
-* Exercises requiring fine hand-eye coordination, such as image mapped input or drag and drop exercises, 
-  may present difficulties to students who have limited mobility. Consider alternatives that do not require fine motor skills, unless, of course, 
-  such skills are necessary for effective participation in the course. For example, for a drag-and-drop exercise mapping atoms to compounds, provide a
-  checkbox or multiple-choice exercise.
-
-* Highly visual stimuli, such as word clouds, may not be accessible to students
-  who have visual impairments. Provide a text alternative that conveys the same information, such as an ordered list of words in the word cloud.
-
-++++++++++++++++++++++++++++++++++++++++++++    
-Third-party content
-++++++++++++++++++++++++++++++++++++++++++++
-
-When including links to third-party content in your course, be mindful as to the accessibility of such third party resources, 
-which may not be readily accessible to learners with disabilities. We recommend that you test any links prior to sharing them with users.
-
-You can use the eReader tool or :ref:`Add Files to a Course` to incorporate third-party textbooks and other 
-publications in PDF format into your course. You can also incorporate such materials into your course in HTML format. 
-See :ref:`Best Practices for Accessible PDFs` for guidance on working with third- party supplied PDFs, and :ref:`Best Practices for HTML Markup` 
-for guidance on creating accessible HTML.
-
-
-**Resources**
-
-* Effective Practices for Description of Science Content within Digital Talking Books, from the National Center for Accessible Media, provides best practices for describing graphs, 
-  charts, diagrams, and illustrations: 
-  http://ncam.wgbh.org/experience_learn/educational_media/stemdx
-
-* The University of Washington’s DO-IT project provides guidance on creating accessible math content: 
-  http://www.washington.edu/doit/Faculty/articles?465
-
-* AccessSTEM provides guidance on creating accessible science, technology, engineering and math educational content: 
-  http://www.washington.edu/doit/Stem/
-
-* The National Center on Educational Outcomes (NCEO) provides Principles and Characteristics of Inclusive Assessment and Accountability Systems: 
-  http://www.cehd.umn.edu/nceo/onlinepubs/Synthesis40.html
-
-* MathJax provides guidance on creating accessible pages with the display engine: 
-  http://www.mathjax.org/resources/articles-and-presentations/accessible-pages-with-mathjax/
-
-.. _Best Practices for Describing Images:
-
-====================================================
-Best Practices for Describing Images
-====================================================
-
-Pictures, diagrams, maps, charts, and icons can present information very effectively. 
-However, some visually impaired students, including people who use screen reader software, need text alternatives to understand the information conveyed by these images. 
-The text alternative for an image depends on the image’s context and purpose, and may not be a straight description of the image’s visual characteristics.
-
-Use the following guidelines when you include images in your course:
-
-* Provide a short text description that conveys the purpose of the image, unless the image conveys a concept or is the only source for the information it presents, 
-  in which case a long text description is appropriate. Note that you don’t need to provide a long description if the information appears elsewhere on the page. 
-  For example, you don’t need to describe a chart if the same data appears as text in a data table.
-  
-  * For a representative image, such as a photograph of Ponte Vecchio, a short
-    description could be “Photo of Ponte Vecchio.” If the photograph’s purpose is to provide detailed information about the location, the long description should be more specific: “Photo of Ponte Vecchio showing its three stone arches and the Arno River.”
-
-  * For a chart, diagram, or illustration, the short description might be “Diagram of Ponte Vecchio.” The long description should include the details conveyed visually, such as dimensions and materials used.
-
-  * For a map, a short description might be “Map showing location of Ponte Vecchio.” If the map is intended to provide directions to the bridge, the long description should provide text directions.
-  
-  * For icons, the short description should be the equivalent to the information that the icon provides. For example, for a Course Syllabus link containing a PDF icon, the text equivalent for the icon would be “PDF,” which would be read as “Course Syllabus PDF.”
-
-  * For an image that serves primarily as a link to another web page, the short description should describe the link’s destination, not the image. For example, an image of a question mark that serves as a link to a Help page should be described as “help,” not “question mark.”
-
-  * Images that don’t provide information don’t need text descriptions. For example, a PDF icon that is followed by link text reading “Course Syllabus (PDF)” does not need a description. Another example is a banner graphic whose function is purely aesthetic.
-  
-* Include the short description in the alt attribute of the HTML image element, as follows (see :ref:`Add an Image to an HTML Component` for more information about adding images):
-
-  ``<img src="image.jpg" alt="Photo of Ponte Vecchio">``
-
-* Include an empty alt attribute for non-informative images. When image elements do not include an alt attribute, screen reader software may skip the image, announce the image filename, or, in the case of a linked image, announce the link URL. An empty alt attribute tells screen reader software to skip the image.
-
-  ``<img src="image.jpg" alt="">``
-  
-* Consider using a caption to display long descriptions so that the information is available to all users. In the following example, the image element includes the short description as the alt attribute and the paragraph element includes the long description.
-  
-  ``<img src="image.jpg" alt="Photo of Ponte Vecchio"><p>Photo of Ponte Vecchio showing its three stone arches and the Arno river</p>``
-    
-* Alternatively, provide long descriptions by creating an additional unit or downloadable file that contains the descriptive text and providing a link to the unit or file below the image.
-  
-  ``<img src="image.jpg" alt="Diagram of Ponte Vecchio"> <p><a href="description.html">Description of Ponte Vecchio Diagram</a></p>``
-
-**Resources**
-
-* A decision tree for choosing appropriate alternative text for images (Dey Alexander): 
-  http://www.4syllables.com.au/2010/12/text-alternatives-decision- tree/
-* General guidance on appropriate use of alternative text for images (WebAim): 
-  http://webaim.org/techniques/alttext/
-* HTML5: A more detailed description of techniques for providing useful alternative text for images: 
-  http://dev.w3.org/html5/alt-techniques/
-* The DIAGRAM Center, established by the US Department of Education (Office of Special Education Programs), provides guidance on ways to make it easier, faster, and more cost effective to create and use accessible images: 
-  http://www.diagramcenter.org/webinars.html
-
-.. _Best Practices for Accessible Media:
-
-====================================================
-Best Practices for Accessible Media
-====================================================
-
-Media-based course materials help convey concepts and bring course information to life. 
-We require all edX courses to use videos with interactive, screen-reader- accessible transcripts. 
-This built-in universal design mechanism helps enhance your course’s accessibility. 
-When you create your course, you need to factor in time and resources for creating these transcripts.
-
-++++++++++++++++++++++++++++++++++++++++++++  
-Audio transcription
-++++++++++++++++++++++++++++++++++++++++++++  
-
-Audio transcripts are essential for presenting audible content to students who can’t hear and are helpful to students who are not native English speakers. 
-Synchronized transcripts allow students who can’t hear to follow along with the video and navigate to a specific section of the video by clicking the transcript text. 
-Additionally, all students can use transcripts of media-based learning materials for study and review.
-
-A transcript starts with a text version of the video’s spoken content. 
-If you created your video using a script, you have a great start on creating the transcript. 
-Just review the recorded video and update the script as needed. 
-Otherwise, you’ll need to transcribe the video yourself or engage someone to do it. 
-There are many companies that will create timed video transcripts (i.e., transcripts that synchronize the text with the video using time codes) for a fee.
-
-The edX platform supports the use of transcripts in .srt format. 
-When you integrate a video file into the platform, you should also upload the .srt file of the timed transcript for such video. 
-See :ref:`Working with Video Components` for details on how to add timed transcripts.
-
-
-++++++++++++++++++++++++++++++++++++++++++++
-Video description
-++++++++++++++++++++++++++++++++++++++++++++
-
-When creating video segments, consider how to convey information to learners who can’t see. 
-For many topics, you can fully cover concepts in the spoken presentation. 
-If practical, you might also describe visual information, for example, by speaking as you are writing on a tablet.
-
-++++++++++++++++++++++++++++++++++++++++++++
-Downloadable transcripts
-++++++++++++++++++++++++++++++++++++++++++++
-
-For both audio and video transcripts, consider including a text file that students can download and review using tools such as word processing, screen reader, or literacy software. 
-The downloadable transcript should be text only, without time codes.
-
-**Resources**
-
-* Accessible Digital Media Guidelines provides detailed advice on creating online video and audio with accessibility in mind: 
-  http://ncam.wgbh.org/invent_build/web_multimedia/accessible-digital-media-guide
-
-
-.. _Best Practices for HTML Markup:
-
-====================================================
-Best Practices for HTML Markup
-====================================================
-  
-HTML is the best format for creating accessible content. It is well supported and adaptable across browsers and devices, 
-the information in the markup helps assistive technologies, such as screen reader software, provide information and functionality to people with vision impairments.
-
-To make it easier for our course teams to create content with good HTML markup, we are working to make all templates in edX Studio conform to the best practices set forth below. 
-In the interim, we recommend that you manually add the appropriate HTML tagging. 
-Depending on the type of component you are adding to your course in edX Studio, the raw HTML data will be available either automatically or by selecting the “Advanced Editor” or “HTML” views.
-
-Keep the following guidelines in mind when you create HTML content:
-
-* Use HTML to describe your content’s *meaning* rather than its *appearance*. A phrase marked as a level 1 heading (<h1>) clearly indicates the topic of the page, 
-  while a phrase marked as bold text (<bold> or <strong>) may be a heading or may just be text that the instructor wants to emphasize. 
-  A group of items marked up as a list are related in the code, without relying on visual cues such as bullets and indents. 
-  Coding meaning into content is particularly useful for students using screen readers, which, for example, can read through headings or announce the number of items in a list.
-
-* Use HTML heading levels in sequential order to represent the structure of the document. Well-structured headings help students navigate a page and find what they are looking for.
-
-* Use HTML list elements to group related items and make content easier to skim and read. HTML offers three kinds of lists:
-
-  #. Unordered lists, where each item is marked with a bullet.
-  #. Ordered lists, where each item is listed with a number.
-  #. Definition lists, where each item is represented using term and description pairs (like a dictionary).
-
-* Use table elements to mark up data sets—that is, information that works best in a grid format—with descriptive rows and columns. 
-  Mark up row and column headers using the <th> element so screen readers can effectively describe the content in the table.
-
-**Resources**
-
-* Creating Semantic Structure provides guidance on reflecting the semantic structure of a web page in the underlying markup (WebAIM): 
-  http://webaim.org/techniques/semanticstructure/
-  
-* Creating Accessible Tables provides specific guidance on creating data tables with the appropriate semantic structure so that screen readers can correctly present the information (WebAIM): 
-  http://webaim.org/techniques/tables/data
-
-.. _Conclusion:
-
-************************************************************
-Conclusion
-************************************************************
-
-At edX, the heart of our mission is to provide global access to higher-level learning with only a computer and the Internet. 
-We have designed a platform that enables course creators to reach thousands of learners, some of whom will lack the typical backgrounds and resources of resident students taking traditional courses on college campuses. 
-We hope that these guidelines prove useful to you as you work with your institution’s disability support services and information technology resources to comply with applicable accessibility laws. 
-As we are all on this learning venture together, we encourage you to share your thoughts with us at accessibility@edx.org.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/getting_started/accounts.rst b/docs/en_us/course_authors/source/getting_started/accounts.rst
deleted file mode 100644
index 385fb1867a..0000000000
--- a/docs/en_us/course_authors/source/getting_started/accounts.rst
+++ /dev/null
@@ -1,151 +0,0 @@
-.. _Getting Started with edX:
-
-#############################
-Getting Started with edX
-#############################
-
-The following sections provide an introduction to edX and instructions for getting started on edX websites:
-
-* :ref:`edX.org and edX Edge`
-* :ref:`Register Your Account`
-* :ref:`edX101_section`
-* :ref:`Reset Your Password`
-
-This information is intended for course staff. You may want to include the details about the registration process and password policies in your communications with your prospective students. 
-
-Also see :ref:`enroll_student` for information about enrolling students in a course, and for an example of the email students receive.
-
-.. _edX.org and edX Edge:
-
-*************************
-edX.org and edX Edge
-*************************
-
-When you want to explore edX courses, you can register on edX.org_, edX Edge_, or both. These sites are visually and functionally the same, but the content and purpose are different.
-
-* edX.org_ hosts massive open online courses (MOOCs) from edX institutional partners. To publish courses on edX.org, you must have an agreement with edX and specific approval from your university. Courses on edX.org are publicly listed in the edX course catalog and are open to students from around the world.
-
-* EdX Edge_ is edX's more private site. Courses on Edge are not published on edX.org. Any member of a partner course team can create and publish courses, including test courses, on Edge without receiving approval from edX or an affiliated university. However, Edge does not have a course catalog, and courses cannot be found through search engines such as Google. Only students whom you explicitly invite or who have the URL for your course can participate in your course on Edge.
-
-* EdX Edge_ also hosts small private online courses (SPOCs).
-
-.. note:: All course data and accounts on Edge_ and edX.org_ are separate. If you want to use both edX.org and Edge, you must go through the registration process on both sites.
-
-
-.. _Edge: http://edge.edx.org
-.. _edX.org: http://edx.org
-
-
-
-.. _Register Your Account:
-
-*************************
-Register Your Account
-*************************
-
-To get started, you register your account on edX.org_ and Edge_.  
-
-#. On the registration page, enter your account information.
-
-  * For edX.org, go to the `registration page <https://courses.edx.org/register>`_:
-
-    .. image:: ../Images/edx_registration.png
-     :alt: Image of the edX.org registration page
-
-
-  * For Edge, go to https://edge.edx.org and click **Register**:
-
-    .. image:: ../Images/edge_register.png
-     :alt: Image of the Edge registration page
-
-  Make sure to check both **I agree to the Terms of Service** and **I agree to the Honor Code**.  
-
-  .. note::  Students will see your **Public Username**, not your **Full Name**.
-
-    If you are at an edX consortium university, you should use your institutional e-mail address.
-
-    Your password can be any string.
-
-2. When you complete the form, click **Create my edX Account**.
-
-  After you submit the registration, you receive an activation email message. The email content is::
-
-    Thank you for signing up for edX! 
-    To activate your account, please copy and paste this address into your web 
-    browser's address bar:
-
-    https://courses.edx.org/activate/unique-registration-code
-  
-    If you didn't request this, you don't need to do anything; 
-    you won't receive any more email from us. 
-    Please do not reply to this e-mail; if you require assistance, 
-    check the help section of the edX web site.
-
-3. Click the link in the e-mail to complete the activation. When you see the following page, your account has been activated:
-
-  .. image:: ../Images/activation_screen.png
-   :alt: Image of the Activation page
-
-
-.. _edX101_section:
-
-******************************
-edX101 and the edX Demo Course
-******************************
-
-EdX has provided edX101_ and the `edX Demo course <https://www.edx.org/course/edx/edx-edxdemo101-edx-demo-1038>`_ to help familiarize you with taking and creating edX courses.
-
-* edX101_, available on Edge_, is an example of a course built with Studio. It is a self-paced walk through of planning, building, and running your own online course.
-
-* The `edX Demo course <https://www.edx.org/course/edx/edx-edxdemo101-edx-demo-1038>`_, available on edX.org_, allows new students to explore and learn how to take an edX course. We recommend that you become familiar with the student’s experience of an edX course before you begin building your first course.
-
-.. note:: You may want to include information about the edX Demo Course in your course materials, and recommend that new students take the edX Demo Course before proceeding with your course.
-
-.. _edx101: https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/about
-
-
-.. _Reset Your Password:
-
-*******************
-Reset Your Password
-*******************
-
-The process to reset your password on edX.org and Edge is the same.
-
-#. On edx.org or edge.edx.org, log in or click the site logo at top left to go
-   to your **Current Courses** dashboard.
-
-#. In the account information pane in the upper left corner, click **Reset Password**. 
-
-  .. image:: ../Images/dashboard-password-reset.png
-   :alt: Image with the Reset Password link highlighted
-
-  A dialog box opens confirming that a message has been sent to your email address.
- 
-  .. image:: ../Images/password-email-dialog.png
-   :alt: Image with the Reset Password link highlighted
-
-3. When you receive the following e-mail message, click the link in the message::
-
-     You're receiving this e-mail because you requested a 
-     password reset for your user account at edx.org.
-
-     Please go to the following page and choose a new password:
-
-     https://edx.org/password_reset_confirm/unique-code/
-
-     If you didn't request this change, you can disregard this email - 
-     we have not yet reset your password.
-
-     Thanks for using our site!
-
-     The edX Team
-
-4. When the following dialog box opens, enter your new password in both fields, and then click **Change My Password**:
-
-  .. image:: ../Images/reset_password.png
-   :alt: Image of the Reset Password dialog box
-
-  .. note:: Your password can be any string.
-
-After you click **Change My Password**, your password is reset for edX.org or edge.edX.org. You must use the new password when you log in.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/getting_started/browsers.rst b/docs/en_us/course_authors/source/getting_started/browsers.rst
deleted file mode 100644
index 7f2a1b17db..0000000000
--- a/docs/en_us/course_authors/source/getting_started/browsers.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../../shared/browsers.rst
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/getting_started/get_started.rst b/docs/en_us/course_authors/source/getting_started/get_started.rst
deleted file mode 100644
index 8f9c0ef228..0000000000
--- a/docs/en_us/course_authors/source/getting_started/get_started.rst
+++ /dev/null
@@ -1,133 +0,0 @@
-.. _Getting Started with Studio:
-
-###########################
-Getting Started with Studio
-###########################
-
-***************
-Overview
-***************
-
-This chapter describes the tools you use to build an edX course, and how to create your first course:
-
-* :ref:`What is Studio?`
-* :ref:`Use Studio on Edge`
-* :ref:`Create Your First Course`
-* :ref:`View Your Course on Edge`
-* :ref:`Register Your Course on edX.org`
-
-If you are using an instance of Open edX, some specifics in this chapter may not apply.
-
-.. _What is Studio?:        
-            
-***************
-What is Studio?
-***************
-
-Studio is the edX tool you use to build your courses. 
-
-You use Studio to create course content, problems, videos, and other resources for students.
-
-With Studio, you can also manage your schedule and course team, set grading policies, publish your course, and more.
-
-You use Studio directly through your browser. You do not need any additional software.
-
-
-.. _Use Studio on Edge:
-
-******************
-Use Studio on Edge
-******************
-
-You can use Studio_ on Edge to build your own courses.
-
-Go to: https://studio.edge.edx.org. Sign in with the account you created on Edge.
-
-You must then request access to create courses:  
-
-#. Click the **+** sign to expand the field labeled **Becoming a Course Creator in Studio**.
-
-#. Click **Request the Ability to Create Courses**.
-
-EdX then evaluates your request. When course creation permissions are granted, you receive an email message.
-
-.. _Studio: https://studio.edge.edx.org
-.. _Edge: http://edge.edx.org
-  
-.. _Create Your First Course:  
-  
-***************************
-Create Your First Course
-***************************
-
-When you receive notice that you can create courses, log in to Studio_.
-
-You see the following page, which is your **My Courses** dashboard:
-
-.. image:: ../Images/first_course.png
- :width: 600
- :alt: Image of the Studio home page where you create your first course
-
-#. Click **Create Your First Course**.
-#. Enter course information as needed and click **Create**.
-
-  .. image:: ../Images/new_course_info.png
-   :width: 600
-   :alt: Image of the Create New Course page
-
-  .. note::  Enter new course information carefully. This information becomes part of the URL for your course. To change the URL after the course is created, you must contact edX through the Help site (http://help.edge.edx.org). Additionally, because this information becomes part of your course URL, the total number of characters in the following three fields must be 65 or fewer.
-
-  * For **Course Name**, enter the title of your course. For example, the name may be “Sets, Maps and Symmetry Groups". Use title capitalization for the course title.
-
-  * For **Organization**, enter the name of your university. Do not include whitespace or special characters.
-
-  * For **Course Number**, enter both a subject abbreviation and a number. For example, for public health course number 207, enter **PH207**. For math course 101x, enter **Math101x**. Do not include whitespace or special characters in the course number.
-
-    *Note: If your course will be open to the world, be sure to include the "x". If it is exclusively an on-campus offering, do not include the "x".* 
-
-3. Click **Save.**
-
-Your new course opens to the **Course Outline** page. Because you haven't created any content yet, this page is empty.
-
-In your browser’s address bar, notice that the URL of your course includes the course organization, number, and course run.
-
-The rest of this documentation describes how you now build and run your course. But first, let's view your empty course on Edge.
-  
-.. _View Your Course on Edge:
-    
-************************
-View Your Course on Edge
-************************
-
-You can now view the course you just created, even though it doesn't have any content.
-
-In the Course Outline in Studio, click **View Live**. The course opens on Edge.
-
-You can also go directly to Edge_. Log in if prompted. You see the course you just created listed on your **My Courses** dashboard:
-
-.. image:: ../Images/new_course.png
- :width: 600
- :alt: Image of the Edge Dashboard
-
-You can view the course and see that there is no content yet.
-
-To build your course, keep reading this document.
-
-.. _Register Your Course on edx.org:
-
-************************************
-View Your Course on edX.org
-************************************
-
-If your organization has an agreement with edX and you have specific approval, you can create a course on edX. To see the content of your course as students will see it, you must register for your course. You can then view it on the LMS.
-
-#. Create your course and add content.
-
-#. On the **Course Outline** page, click the blue **View
-   Live** button in the upper-right corner of your screen.
-
-   Your course registration page opens in a new tab on the LMS.
-
-#. Click the blue **Register** button to register for your course. After you register for your course, it opens in the LMS.
-
-#. To continue working on your course, in your browser, switch back to the tab that shows Studio. You will still be on the **Course Outline** page.
diff --git a/docs/en_us/course_authors/source/getting_started/glossary.rst b/docs/en_us/course_authors/source/getting_started/glossary.rst
deleted file mode 100644
index e54ed72630..0000000000
--- a/docs/en_us/course_authors/source/getting_started/glossary.rst
+++ /dev/null
@@ -1,644 +0,0 @@
-.. _Glossary:
-
-############
-Glossary
-############
-
-.. _A:
-
-****
-A
-****
-
-.. _AB Test:
-
-**A/B Test**
-
-  See `Content Experiment`_.
-
-.. _About Page:
-
-**About Page**
-
-  The course page that provides potential students with a course summary, prerequisites, a course video and image, and important dates.
-
-  See :ref:`The Course Summary Page` for more information.
-
-.. _Advanced Editor_g:
- 
-**Advanced Editor**
-
-  An XML-only editor in a Problem component that allows you to can create and edit any type of problem. For more information, see :ref:`Advanced Editor`.
-
-
-
-
-.. _Assignment Type:
- 
-**Assignment Type**
-
-  The category of graded student work, such as homework, exams, and exercises.
-
-  For more information, see :ref:`Establish a Grading Policy`.
-
-.. _C:
-
-****
-C
-****
-
-
-.. _Certificate:
- 
-**Certificate**
-
-  A document issued to a registered student who successfully completes a course. Not all edX courses offer certificates, and not all students register as certificate candidates.
-
-
-
-.. _Checkbox Problem:
- 
-**Checkbox Problem**
-
-  A problem that prompts the student to select one or more options from a list of possible answers. For more information, see :ref:`Checkbox`.
-
-
-.. _Chemical Equation Response Problem:
- 
-**Chemical Equation Response Problem**
-
-  A problem that allows the student to enter chemical equations as answers. For more information, see :ref:`Chemical Equation`.
-
-
-.. _Circuit Schematic Builder Problem:
- 
-**Circuit Schematic Builder Problem**
-
-  A problem that allows the student to construct a schematic answer (such as an electronics circuit) on an interactive grid.
-
-  See :ref:`Circuit Schematic Builder` for more information.
-
-
-.. _Cohort:
- 
-**Cohort**
-
-  A group of students who participate in a class together. Students who are in
-  the same cohort group can communicate and share experiences in private
-  discussions.
-
-  Cohorts are an optional feature of courses on the edX platform. For
-  information about how you enable the cohort feature, set up cohort groups,
-  and assign students to them, see :ref:`Cohorts Overview`.
-
-.. _Component_g:
- 
-**Component**
-
-  The part of a unit that contains your actual course content. A unit can
-  contain one or more components. For more information, see :ref:`Developing
-  Course Components`.
-
-.. _Content Experiment:
-
-**Content Experiment**
-
-  You can define alternative course content to be delivered to different,
-  randomly assigned groups of students. Also known as A/B or split testing, you
-  use content experiments to compare the performance of students who have been
-  exposed to different versions of of the content. For more information, see
-  :ref:`Creating Content Experiments`.
-
-**Content-Specific Discussion Topic**
-
-  A category within the course discussion that appears at a defined point in
-  the course to encourage questions and conversations. To add a 
-  content-specific discussion topic to your course, you add a discussion 
-  component to a unit. Students cannot contribute to a content-specific 
-  discussion topic until the release date of the section that contains it.
-
-  For more information, see :ref:`Working with Discussion Components` and
-  :ref:`Organizing_discussions`.
-
-.. _Course Accordion:
- 
-**Course Accordion**
-
-  The left-hand navigation bar in the courseware that shows the sections and subsections for a course.  The word “accordion” is intended to evoke the folding and unfolding of an accordion, because when you click a section, the section expands to show subsections.
-
-
-.. _Course Catalog:
- 
-**Course Catalog**
-
-  The page that lists all courses offered in the edX learning management system.
-
-
-
-.. _Course Handouts:
- 
-**Course Handouts**
-
-  Course handouts are files you make available to students in the Course Info page.
-
-  See :ref:`Add Course Handouts` for more information.
-
-
-.. _Course Info Page:
- 
-**Course Info Page**
-
-  The page that opens first every time students access your course. You can post announcements on the Course Info page. The Course Handouts sidebar appears in the right pane of this page.
-
-
-.. _Run:
- 
-**Course Run**
-
-  The term in which your course takes place. You set the course run when you create your course. For more information, see :ref:`Create a New Course`.
-
-.. _Courseware:
- 
-
-**Courseware**
-
-  The page where students access the primary instructional materials for your course. Sections, subsections, units, and components are all accessed from the Courseware page.
-
-**Course-Wide Discussion Topic**
-
-  Optional categories that you create to guide how students find and share
-  information in the course discussion. Examples of course-wide discussion
-  topics include Announcements and Frequently Asked Questions. Students can
-  contribute to these topics as soon as your course starts.
-
-  For more information, see :ref:`Organizing_discussions`.
-
-.. _Custom Response Problem:
- 
-**Custom Response Problem**
-
-  A custom response problem evaluates text responses from students using an embedded Python script. These problems are also called "write-your-own-grader" problems. For more information, see :ref:`Write Your Own Grader`. 
-
-.. _D:
-
-****
-D
-****
-
-.. _Data Czar_g:
-
-**Data Czar**
-
-  A data czar is the single representative at a partner institution who is
-  responsible for receiving course data from edX, and transferring it securely
-  to researchers and other interested parties after it is received.
-
-  See the `edX Research
-  Guide<http://edx.readthedocs.org/projects/devdata/en/latest/>`.
-
-.. _Discussion:
- 
-**Discussion**
-
-  The set of topics defined to promote course-wide or unit-specific
-  conversation. Students use the discussion topics to communicate with each
-  other and the course staff in threaded exchanges.
-
-  A discussion is also a type of contribution that you can make to a topic to
-  start an open-ended dialogue. You can also contribute questions to the
-  discussion topics.
-
-  See :ref:`Discussions` for more information.
-
-
-.. _Discussion Component:
- 
-**Discussion Component**
-
-  Discussion topics that course staff add directly to units. For example, a
-  Video component can be followed by a Discussion component so that students
-  can discuss the video content without having to leave the page. When you add
-  a dicussion component to a unit, you create a content-specific discussion
-  topic.
-
-  See :ref:`Working with Discussion Components` for more information.
-
-.. _Dropdown Problem:
- 
-**Dropdown Problem**
-
-  A problem that asks students to choose from a collection of answer options, presented as a drop-down list. For more information, see :ref:`Dropdown`.
-
-
-.. _E:
-
-****
-E
-****
-
-.. _edX101_g:
- 
-**edX101**
-
-  edX’s online course about how to create online courses. The intended audience is faculty and university administrators. It is also the first course ever to have been developed entirely using edX Studio.
-
-.. _edX101: https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/about
-
-
-.. _edX Edge:
- 
-**edX Edge**
-
-  A less restricted site than edX.org. While only consortium members can create and post content on edX.org, any users with course creator permissions can create courses with Studio on studio.edge.edx.org, then view the courses on the learning management system at edge.edx.org.
-
-.. _Edge: http://edge.edx.org
-
-
-
-
-.. _edX Studio:
- 
-**edX Studio**
-
-  The edX tool you use to build your courses. 
-
-  See :ref:`What is Studio?` for more information.
-
-
-.. _Exercises:
- 
-**Exercises**
-
-  Practice or practical problems interspersed in edX course content to keep the learner engaged. Exercises are also an important measure of teaching effectiveness and learner comprehension.
-
-.. _F:
-
-***
-F
-***
-
-**Forum**
-
-  See `Discussion`_.
-
-.. _G:
-
-****
-G
-****
-
-.. _grade:
- 
-**Grade Range**
-
-  Thresholds that specify how numerical scores are associated with grades, and the score required to pass a course. 
-
-  See :ref:`Set the Grade Range` for more information.
-
-
-.. _Grading Rubric:
- 
-**Grading Rubric**
- 
-  List of the items that a student's response should cover in an open response assessment.
-
-  See :ref:`ORA Rubrics` for more information.
-
-
-.. _H:
-
-****
-H
-****
-
-.. _HTML Component:
- 
-**HTML Component**
-
-  The component where you add and format text for your course. An HTML component can contain text, lists, links and images. 
-
-  See :ref:`Working with HTML Components` for more information.
-
-
-
-.. _I:
-
-****
-I
-****
-
-
-.. _Image Mapped Input Problem:
- 
-**Image Mapped Input Problem**
-
-  A problem that presents an image and accepts clicks on the image as an answer.
-
-  See :ref:`Image Mapped Input` for more information.
-
-.. _Import:
- 
-**Import**
-
-  A tool in edX Studio that loads a new course into your existing course. When you use the Import tool, Studio replaces all of your existing course content with the content from the imported course.
-
-  See :ref:`Import a Course` for more information.
-
-
- 
-
-.. _L:
-
-****
-L
-****
-
-
-.. _LaTeX:
- 
-**LaTeX**
-
-  A document markup language and document preparation system for the TeX typesetting program. 
-
-  In edX Studio, you can :ref:`Import LaTeX Code`.
-
-  You can also create a :ref:`Problem Written in LaTeX`.
-
-
-
-.. _Learning Management System:
- 
-**Learning Management System (LMS)**
-
-  The platform that students use to view courses, and that course staff members
-  use to manage enrollment and staff privileges, moderate dicussions, and
-  access data while the course is running.
-
-
-
-.. _Live Mode:
- 
-**Live Mode**
-
-  A view that allows course staff to review all public units as students see them, regardless of the release dates of the section and subsection that contain the units.
-
-  See :ref:`View Your Live Course` for more information.
-
-
-.. _M:
-
-****
-M
-****
-
-.. _Math Expression Input Problem:
- 
-**Math Expression Input Problem**
-
-  A problem that requires students to enter a mathematical expression as text, such as e=m*c^2.
-
-  See :ref:`Math Response Formatting for Students` for more information.
-
-
-.. _MathJax:
- 
-**MathJax**
-
-  A LaTeX-like language you use to write equations. Studio uses MathJax to render text input such as x^2 and sqrt(x^2-4) as "beautiful math."
-
-  See :ref:`MathJax in Studio` for more information.
-
-
-
-
-.. _Multiple Choice Problem:
- 
-**Multiple Choice Problem**
-
-  A problem that asks students to select one answer from a list of options.
-
-  See :ref:`Multiple Choice` for more information.
-
-
-.. _N:
-
-****
-N
-****
-
-.. _Numerical Input Problem:
- 
-**Numerical Input Problem**
-
-  A problem that asks students to enter numbers or specific and relatively simple mathematical expressions.
-
-  See :ref:`Numerical Input` for more information.
-
-
-
-.. _P:
-
-****
-P
-****
-
-.. _Pages_g:
- 
-**Pages**
-
-  Pages organize course materials into categories that students select in the
-  learning management system. Pages provide access to the courseware and to
-  tools and uploaded files that supplement the course. Each page appears in
-  your course's navigation bar.
-
-  See :ref:`Adding Pages to a Course` for more information.
-
-.. _Preview Mode:
- 
-**Preview Mode**
-
-  A view that allows you to see all the units of your course as students see
-  them, regardless of the unit status and regardless of whether the release
-  dates have passed.
-
-  See :ref:`Preview Course Content` for more information.
-
-
-
-.. _Problem Component:
- 
-**Problem Component**
-
-  A component that allows you to add interactive, automatically graded exercises to your course content. You can create many different types of problems.
-
-  See :ref:`Working with Problem Components` for more information.
-
-
-
-.. _Progress Page:
- 
-**Progress Page**
-
-The page in the learning management system that shows students their scores on graded assignments in the course.
-
-
-
-.. _Public Unit:
- 
-.. **Public Unit**
-
-..  A unit whose **Visibility** option is set to Public so that the unit is
-..  visible to students, if the subsection that contains the unit has been
-..  released.
-
-..  See :ref:`Public and Private Units` for more information.
-
-.. _Q:
-
-*****
-Q
-*****
-
-**Question**
-
-  A question is a type of contribution that you can make to a course discussion
-  topic to surface an issue that the course staff or other students can
-  resolve. 
-
-  See :ref:`Discussions` for more information.
-  
-.. _R:
-
-****
-R
-****
-
-.. _Rubric:
- 
-**Rubric**
-
-  List of the items that a student's response should cover in an open response assessment.
-
-  See :ref:`ORA Rubrics` for more information.
-
-
-
-.. _S:
-
-****
-S
-****
-
-
-
-
-.. _Section_g:
- 
-**Section**
-
-  The topmost category in your course. A section can represent a time period in your course or another organizing principle.
-
-  See :ref:`Developing Course Sections` for more information.
-
-
-.. _Short Course Description:
- 
-**Short Course Description**
-
-  The description of your course that appears on the edX `Course List
-  <https://www.edx.org/course-list>`_ page.
-
-  See :ref:`Describe Your Course` for more information.
-
-
-.. _Simple Editor_g:
- 
-**Simple Editor**
-
-  The graphical user interface in a Problem component that contains formatting buttons and is available for some problem types. For more information, see :ref:`Problem Studio View`.
-
-.. _Split_Test:
-
-**Split Test**
-
-  See `Content Experiment`_.
-
-
-.. _Subsection:
- 
-**Subsection**
-
-  A division that represents a topic in your course, or another organizing principle. Subsections are found inside sections and contain units. Subsections can also be called "lessons."
-
-  See :ref:`Developing Course Subsections` for more information.
-
-
-.. _T:
-
-****
-T
-****
-
-.. _Text Input Problem:
- 
-**Text Input Problem**
-
-  A problem that asks the student to enter a line of text, which is then checked against a specified expected answer.
-
-  See :ref:`Text Input` for more information.
-
-
-.. _Transcript:
- 
-**Transcript**
-
-  A printed version of the content of a video. You can make video transcripts available to students.
-
-  See :ref:`Working with Video Components` for more information.
-
-
-.. _V:
-
-****
-V
-****
-
-.. _Video Component:
- 
-**Video Component**
-
-  A component that you can use to add recorded videos to your course. 
-
-  See :ref:`Working with Video Components` for more information.
-
-
-.. _W:
-
-****
-W
-****
-
-.. _Wiki:
- 
-**Wiki**
-
-  The page in each edX course that allows students as well as course staff to add, modify, or delete content. 
- 
-  Students can use the wiki to share links, notes, and other helpful information with each other. 
-
-
-.. _X:
-
-****
-X
-****
-
-.. _XBlock:
- 
-**XBlock**
-
-  EdX’s component architecture for writing courseware components.  
-
-  Third parties can create components as web applications that can run within the edX learning management system.
-
-
diff --git a/docs/en_us/course_authors/source/getting_started/index.rst b/docs/en_us/course_authors/source/getting_started/index.rst
deleted file mode 100644
index 90a6457d25..0000000000
--- a/docs/en_us/course_authors/source/getting_started/index.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. _Getting Started Index:
-
-################
-Getting Started
-################
-
-.. toctree::
-   :maxdepth: 3
-
-
-   browsers
-   accounts
-   get_started
-   accessibility
-   glossary
diff --git a/docs/en_us/course_authors/source/index.rst b/docs/en_us/course_authors/source/index.rst
deleted file mode 100755
index e9e4df8eff..0000000000
--- a/docs/en_us/course_authors/source/index.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-.. Getting_Started documentation master file, created by
-   sphinx-quickstart on Tue Apr 16 11:19:12 2013.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-
-Building and Running an edX Course
-========================================
-
-.. toctree::
-   :numbered:
-   :maxdepth: 2
-
-   read_me
-   preface
-   change_log
-   getting_started/index
-   building_course/index
-   developing_course/index
-   creating_content/index
-   exercises_tools/index
-   content_experiments/index
-   cohorts/index
-   releasing_course/index
-   running_course/index
-   students/index
diff --git a/docs/en_us/course_authors/source/latex/Makefile b/docs/en_us/course_authors/source/latex/Makefile
deleted file mode 100644
index 6b87ad8814..0000000000
--- a/docs/en_us/course_authors/source/latex/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# Makefile for Sphinx LaTeX output
-
-ALLDOCS = $(basename $(wildcard *.tex))
-ALLPDF = $(addsuffix .pdf,$(ALLDOCS))
-ALLDVI = $(addsuffix .dvi,$(ALLDOCS))
-
-# Prefix for archive names
-ARCHIVEPRREFIX =
-# Additional LaTeX options
-LATEXOPTS =
-
-all: $(ALLPDF)
-all-pdf: $(ALLPDF)
-all-dvi: $(ALLDVI)
-all-ps: all-dvi
-	for f in *.dvi; do dvips $$f; done
-
-all-pdf-ja:
-	for f in *.pdf *.png *.gif *.jpg *.jpeg; do extractbb $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	-for f in *.idx; do mendex -U -f -d "`basename $$f .idx`.dic" -s python.ist $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.dvi; do dvipdfmx $$f; done
-
-zip: all-$(FMT)
-	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
-	cp $(ALLPDF) $(ARCHIVEPREFIX)docs-$(FMT)
-	zip -q -r -9 $(ARCHIVEPREFIX)docs-$(FMT).zip $(ARCHIVEPREFIX)docs-$(FMT)
-	rm -r $(ARCHIVEPREFIX)docs-$(FMT)
-
-tar: all-$(FMT)
-	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
-	cp $(ALLPDF) $(ARCHIVEPREFIX)docs-$(FMT)
-	tar cf $(ARCHIVEPREFIX)docs-$(FMT).tar $(ARCHIVEPREFIX)docs-$(FMT)
-	rm -r $(ARCHIVEPREFIX)docs-$(FMT)
-
-bz2: tar
-	bzip2 -9 -k $(ARCHIVEPREFIX)docs-$(FMT).tar
-
-# The number of LaTeX runs is quite conservative, but I don't expect it
-# to get run often, so the little extra time won't hurt.
-%.dvi: %.tex
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-	-makeindex -s python.ist '$(basename $<).idx'
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-
-%.pdf: %.tex
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-	-makeindex -s python.ist '$(basename $<).idx'
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-
-clean:
-	rm -f *.dvi *.log *.ind *.aux *.toc *.syn *.idx *.out *.ilg *.pla
-
-.PHONY: all all-pdf all-dvi all-ps clean
-.PHONY: all-pdf-ja
-
diff --git a/docs/en_us/course_authors/source/preface.rst b/docs/en_us/course_authors/source/preface.rst
deleted file mode 100644
index 53895c8473..0000000000
--- a/docs/en_us/course_authors/source/preface.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../shared/preface.rst
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/read_me.rst b/docs/en_us/course_authors/source/read_me.rst
deleted file mode 100644
index b791b27e81..0000000000
--- a/docs/en_us/course_authors/source/read_me.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-*******
-Read Me
-*******
-
-The edX *Building and Running an edX Course* guide is created
-using RST_ files and Sphinx_. You, the user community, can help update and revise this documentation project on GitHub::
-
-  https://github.com/edx/edx-platform/docs/en_us/course_authors/source
-
-To suggest a revision, fork the project, make changes in your fork, and submit
-a pull request back to the original project: this is known as the `GitHub Flow`_.
-All pull requests need approval from edX. For more information, contact edX at docs@edx.org.
-
-.. _Sphinx: http://sphinx-doc.org/
-.. _LaTeX: http://www.latex-project.org/
-.. _`GitHub Flow`: https://github.com/blog/1557-github-flow-in-the-browser
-.. _RST: http://docutils.sourceforge.net/rst.html
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/releasing_course/beta_testing.rst b/docs/en_us/course_authors/source/releasing_course/beta_testing.rst
deleted file mode 100644
index 0ac4354845..0000000000
--- a/docs/en_us/course_authors/source/releasing_course/beta_testing.rst
+++ /dev/null
@@ -1,323 +0,0 @@
-.. _Beta_Testing:
-
-#############################
-Beta Testing a Course
-#############################
-
-When a course is being designed in Studio, the course team can choose **View
-Live** to assess their progress in designing the course, test their work, find
-gaps and errors, and mimic the student experience. To gather information about
-the overall experience of taking a course, you can also conduct a beta test of
-the course.
-
-Beta testers have early access to the course. Beta testers are not members of
-the course team or staff: they don't have information about "how it's supposed
-to work". They use their own computers and internet connections to view videos,
-follow links, and complete problems. They interact with the course exactly as
-students will, but see the course materials before other enrolled students do.
-
-* :ref:`Beta_Process`
-* :ref:`Qualities_Testers`
-* :ref:`What_Test`
-* :ref:`How_Testers_See_Course`
-* :ref:`Add_Testers`
-* :ref:`Add_Testers_Bulk`
-* :ref:`Issue_Reporting_During_Course`
-
-.. _Beta_Process:
-
-******************************************
-The Beta Testing Process
-******************************************
-
-During a beta test, you gather information about the experience of taking your
-course in an effort to improve its quality. The phases of the beta testing
-process, and some questions that you may find useful to consider as you prepare
-for each phase, follow.
-
-#. **Planning**: What are your objectives for the test? What is the schedule for
-   testing?
-
-#. **Recruitment**: How many testers do you need? How much time do you expect
-   testers to spend? When do you need them to complete their feedback?
-
-#. **Provide access to your course**: Can testers access your entire course
-   immediately, or are its sections and subsections available at different
-   times? How will that affect the schedule?
-
-#. **Collect feedback**: How do you want testers to provide feedback? Who checks
-   for feedback, and how often?
-
-#. **Evaluate feedback**: How is feedback evaluated? Who decides what changes to
-   make as a result, and on what schedule?
-
-#. **Conclusion**: How do you acknowledge the efforts of your testers? What do
-   you share with them about the results of their efforts?
-
-There is no one answer to any of these questions. They are included here as
-background on the role that beta testing can play in the preparation of your
-course.
-
-.. _Qualities_Testers:
-
-***************************************
-Qualities of Good Beta Testers
-***************************************
-
-A beta test is valuable in part because it is unscripted. Your beta testers are
-not following a predetermined series of steps, or using a particular computer
-environment, when they access your course. When you recruit beta testers,
-however, you may find these skills and characteristics to be helpful.
-
-* Curiosity.
-
-* Attention to detail for identifying problems and inconsistencies.
-
-* Solid communication skills for reporting problems to course staff. 
-
-Your beta testers should also have varying levels of knowledge about the course
-content:
-
-* To recognize when material is wrong or missing, at least one tester should
-  know the content well.
-
-* To identify material that is unclear, at least one tester should be less
-  familiar with the content.
-
-Depending on the objectives you set for your beta test, you may want to consider
-recruiting testers who use assistive technologies, who have different native
-languages, or who have varying levels of familiarity with computer software.
-
-=========================================
-Using Course Staff as Beta Testers 
-=========================================
-
-Course staff can provide valuable feedback about your course. However, they are
-typically stakeholders in the success of your course and have a significant
-amount of knowledge about it. As a result, they can be too close to the course
-to interact with it in the same way as students will. They can also be either
-reluctant to provide feedback, or overly zealous.
-
-If you do want a staff member to be a beta tester, a different, second email
-address must be used for this additional role. The privileges of the course
-staff role override those of a beta tester, so a second registration on the
-site, activation, and enrollment in the course are necessary using this second
-email address. The staff member must log in using the second email address (with
-the beta tester role) in order to experience the course as a student.
-
-.. _What_Test:
-
-*********************************
-What to Test
-*********************************
-
-Beta testers should interact with everything in the course. 
-
-* Click all links.
-
-* Watch all videos.
-
-* Download video transcripts and other files.
-
-* Complete all problems. 
-
-As they work, beta testers log issues and questions for the course team.
-
-.. note:: Beta testers can make discussion posts and wiki contributions. You may want to ask your testers not to make posts or contributions about unreleased courseware, and alert your discussion administration team to watch for posts from the beta testers.
-
-.. _How_Testers_See_Course:
-
-******************************************
-How Beta Testers See Course Content
-******************************************
-
-To beta test a course, you: 
-
-* Define a number of days before section and subsection release days for testing
-  to begin.
-
-* Identify beta testers.
-
-Designated beta testers see course content before students can. Beta testers
-access courseware:
-
-+-------------------------------------------+------+------+
-|                                           | Yes  |  No  |
-+===========================================+======+======+
-| Before the Course Enrollment Date         |  X   |      |
-+-------------------------------------------+------+------+
-| Before the Course Start Date              |  X   |      |
-+-------------------------------------------+------+------+
-| Before the section Release Day            |  X   |      |
-+-------------------------------------------+------+------+
-| Before the subsection Release Day         |  X   |      |
-+-------------------------------------------+------+------+
-| Before the unit is Public                 |      |   X  |
-+-------------------------------------------+------+------+
-| Before a draft replaces a live unit       |      |   X  |
-+-------------------------------------------+------+------+
-
-The course team can continue to add content in Studio after the beta test
-begins. When new content is ready for testing, be sure to :ref:`publish the unit<Publish a Unit>`.
-
-================================
-Define When the Beta Test Starts
-================================
-
-To define the start of the beta test, you use Studio to specify a number of days
-before the release day that is defined for each section and subsection in your
-course.
-
-#. In Studio, from the **Settings** menu select **Advanced Settings**.
-
-#. In the field for the **Days Early for Beta Users** policy key, enter the
-   number of days before each section and subsection release day for beta
-   testers to have access.
-
-#. Click **Save Changes**.
-
-===========
-Example
-===========
-
-.. Is this example helpful? how can we assess whether it is frightening/confusing to course team, or helpful?
-
-Beta tester access to courseware for a course with **Days Early for Beta Users**
-= 20 and 2 sections:
-
-+-------------------------------------------+------------------------------------------------+
-| Course Enrollment Date = 31 August        | 31 August; earlier if enrolled by course staff |
-+===========================================+================================================+
-| Course Start Date = 15 September          | 26 August                                      |
-+-------------------------------------------+------------------------------------------------+
-| section 1 Release Day = 15 September      | 26 August                                      |
-+-------------------------------------------+------------------------------------------------+
-| section 2 Release Day = 22 September      | 2 September                                    |
-+-------------------------------------------+------------------------------------------------+
-| subsection 1 Release Day = 22 September   | 2 September                                    |
-+-------------------------------------------+------------------------------------------------+
-| subsection 2 Release Day = 24 September   | 4 September                                    |
-+-------------------------------------------+------------------------------------------------+
-| subsection 2, unit 1 Visibility = Public  | 4 September                                    |
-+-------------------------------------------+------------------------------------------------+
-| subsection 2, unit 2 Visibility = Public; | 4 September for Public version;                |
-| draft in progress                         | No access to draft                             |
-+-------------------------------------------+------------------------------------------------+
-| subsection 2, unit 3 Visibility = Private | No access                                      |
-+-------------------------------------------+------------------------------------------------+
-
-In this example, the beta testers cannot access all of the courseware when the
-beta test starts on 26 August: they can access section 1 but not section 2. You
-may want to provide a schedule of section availability to your testers so that
-they can plan their time appropriately. Future release dates do not display to
-the beta testers in the courseware.
-
-.. _Add_Testers:
-
-*********************************
-Add Beta Testers 
-*********************************
-
-Before you can add beta testers:
-
-* You need the email address or username of each beta tester. 
-
-* Each beta tester must register and activate a user account for that email
-  address/username.
-
-When you add beta testers, note the following. 
-
-* If the beta test starts before the course **Enrollment Start Date**, testers
-  cannot enroll themselves in your course. However, you can enroll the beta
-  testers prior to the **Enrollment Start Date**.
-
-* If you add the beta testers after the defined start of the beta test, and
-  they are enrolled in the course, they see your course on their **Current
-  Courses** dashboards when they log in.
-
-* If you add beta testers before the test starts, or if they are not enrolled,
-  they do not see your course on their dashboards. You can enroll the beta
-  testers in the course yourself, and you may want to send an email message to
-  remind them when the test begins.
-
-.. _Add_Testers_Bulk:
-
-================================
-Add Multiple Beta Testers
-================================
-
-If you have a number of beta testers that you want to add, you can use the
-"batch add" option to add them all at once, rather than individually. With this
-feature, you have options to enroll the beta testers in the course (before or
-after the **Enrollment Start Date**) and send an email message to notify the
-beta testers that they have been added.
-
-To add multiple beta testers:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, and then click **Membership**. 
-
-#. In the **Batch Beta Tester Addition** section of the page, enter one or more
-   addresses or usernames separated by commas or line feeds (the Enter key). You
-   can also copy data from a CSV file of email addresses and paste it here.
- 
-#. To enroll the beta testers in your course, leave **Auto Enroll** selected. If
-   the beta test starts before the course **Enrollment Start Date**, testers
-   cannot enroll themselves in your course.
-
-#. To send an email message to the beta testers, leave **Notify users by email**
-   selected. An example of the message that is sent to a beta tester who is not
-   enrolled (or auto enrolled) in the course follows.
-
-.. image:: ../Images/Beta_tester_email.png
-  :alt: "You have been invited to be a beta tester for <course name> at <URL>. Visit <link> to join the course and begin the beta test."
-
-6. Click **Add beta testers**.
-
-To remove the Beta Tester role from one or more users, enter their email
-addresses in the **Batch Add Beta Testers** field and then click **Remove beta
-testers**. 
-
-.. note:: The **Auto Enroll** option has no effect when you click **Remove beta testers**. The user's role as a beta tester is removed; course enrollment is not affected.
-
-================================
-Add Beta Testers Individually
-================================
-
-To add a single beta tester:
-
-#. View the live version of your course.
-
-#. Click **Instructor** then **Membership**.
-
-#. In the **Administration List Management** section, use the drop-down list to
-   select **Beta Testers**.
-
-#. Under the list of users who currently have that role, enter an email address
-   or username and click **Add Beta Tester**. 
-
-   If the beta test starts before the **Enrollment Start Date** of your course,
-   you can also enroll the beta tester. See :ref:`Enrollment`.
-
-To remove the Beta Tester role from users individually, find the user in the
-list of beta testers, and then click **Revoke access** to the right of that
-user's email address.
-
-.. _Issue_Reporting_During_Course:
-
-*********************************
-Issue Reporting During a Course
-*********************************
-
-Despite the efforts of the course team and the beta testers, additional
-problems, questions, and issues can occur while a course is running.
-
-* Often, students report issues by asking questions in a discussion. Your
-  discussion administration team can watch for posts that indicate problems.
-
-* To let students know the best way to report problems, you can post information
-  on the **Course Info** page or post it in a discussion.
-
-.. per Mark 19 Feb 14: eventually we want to provide more guidance for students:  course issues > use discussions, platform issues > submit issue to edx.
-
diff --git a/docs/en_us/course_authors/source/releasing_course/course_launching.rst b/docs/en_us/course_authors/source/releasing_course/course_launching.rst
deleted file mode 100644
index 07773982a1..0000000000
--- a/docs/en_us/course_authors/source/releasing_course/course_launching.rst
+++ /dev/null
@@ -1,664 +0,0 @@
-.. _Launch:
-
-##############################
-Course Launching Activities 
-##############################
-
-To launch a course, you prepare the course itself, the staff, and the
-students. This chapter includes a :ref:`Course Launch Checklist` to use as a
-model for your schedule of activities.
-
-To help you communicate to the course staff or to all course participants
-before the course launches and while it is running, you can send email messages
-from the Instructor Dashboard. See :ref:`Bulk Email`. This chapter also
-includes a set of :ref:`example messages to students<Example Messages to
-Students>` that you can use as guidelines when you write your own email
-messages.
-
-.. _Course Launch Checklist:
-
-****************************
-Course Launch Checklist
-****************************
-
-As the start date for your course approaches, a checklist or timeline of
-activities can help you make sure that your course, and your students, are
-ready to begin. Suggestions for activities to complete before your course
-starts follow.
-
-**Verify Course Settings**
-
-* Check the course start date and time in Studio. See :ref:`Set Important
-  Dates for Your Course`.
-* Review the grading policy, and set a grace period for homework assignment
-  due dates. See :ref:`Establish a Grading Policy`.
-* Confirm that any optional features that you want your course to include, such
-  as implementing student cohorts, are enabled and configured. See
-  :ref:`Cohorts Overview`.
-
-**Review First Week Content**
-
-* Verify that all units are present and published. See :ref:`Developing Course
-  Units`.
-* Check all assignments for completeness and verify their due dates. See
-  :ref:`Working with Problem Components`.
-* Verify that videos, transcripts, and download links are in place and
-  working.
-* Review feedback from the course team and beta testers to be sure that the
-  content has been thoroughly reviewed and tested.
-
-**Welcome Students**
-
-* Two months before the course start date, prepare and send a welcome email
-  message to currently enrolled students. See :ref:`Prelaunch Reminder` and :ref:`Send_Bulk_Email`.
-* Compose a welcome message and add it to the **Course Info** page. See
-  :ref:`Add a Course Update`.
-* Verify that a syllabus and other references are available on the **Course
-  Handouts** page. See :ref:`Add Course Handouts`.
-* One month before the course start date, prepare and send a welcome email
-  message to currently enrolled students.
-* One week before the course start date, prepare and send a welcome email
-  message to currently enrolled students.
-* Add an "Introduce Yourself" post to a discussion topic. For a MOOC, you may
-  want to manage the size of the thread by distributing student responses
-  across multiple threads. For example, you can start different threads for
-  introductions based on geographical location, such as "Introduce Yourself:
-  Europe", "Introduce Yourself: North America", etc. See
-  :ref:`Running_discussions`.
-* On the course start date, prepare and send a launch email message to
-  currently enrolled students. See :ref:`Launch Day Welcome`. 
-
-**Prepare Staff**
-
-* Define communication methods for all course contributors, including staff,
-  instructors, and the discussion team. For example, set up a course-specific
-  email address.
-* Verify that all course contributors know how to record their work, report
-  issues, and collaborate on tasks.
-* Verify that the instructors and course staff selected for your course
-  have the correct role assignments in the LMS. See :ref:`Course_Staffing`.
-* Verify that discussion admins, discussion moderators, and community TAs have
-  registered and activated their user accounts, enrolled in the course, and
-  been assigned their roles on the Instructor Dashboard. See
-  :ref:`Assigning_discussion_roles`.
-* Define methods for managing discussions and guidance for discussion
-  moderators, and distribute to the discussion team. See
-  :ref:`Moderating_discussions` and :ref:`Guidance for Discussion Moderators`.
-
-.. _Bulk Email:
-
-*************************
-Bulk Email 
-*************************
-
-With the bulk email feature, you can send email messages to course participants
-directly from the Instructor Dashboard. Messages can use HTML styling, and can
-include links to videos, social media pages for the course, and other material.
-All course contributors who are assigned the course staff or instructor role
-can use this feature to communicate with course participants before, during,
-and after the course run. 
-
-For templates that you can use when preparing your own messages, see
-:ref:`Example Messages to Students`.
-
-.. note:: The bulk email feature is currently in limited release, and is 
- enabled for new courses only. A gradual rollout of this feature is planned for
- 2014.
-
-===========================
-Message Addressing
-===========================
-
-When you send an email message from the Instructor Dashboard, you choose its
-recipients by selecting one of these predefined groups:
-
-* **Myself**, to test out a message before sending it to a larger group.
-* **Staff and Instructors**, to contact other members of the administrative
-  team.
-* **All (students, staff and instructors)**, to communicate with currently
-  enrolled students and the administrative team. 
-
-  Email messages are not sent to enrolled students in these circumstances:
-
-  * Students can opt not to receive email messages through the **Email
-    Settings** link, which is present for each course on the **Current
-    Courses** dashboard. Email messages are not sent to these students.
-
-  * Email is not sent to students who have not replied to an account activation
-    email message.
-
-Before you use the bulk email feature, consider that messages **cannot be
-cancelled** after they are sent. If you plan to send a message to all course
-participants, be sure to review each draft carefully, and send the message to
-yourself first for thorough testing.
-
-.. _Send_Bulk_Email:
-
-======================================================
-Send Email Messages to Course Participants
-======================================================
-
-To send an email message to course participants:
-
-#. View the live version of your course.
-
-#. Click **Instructor** then click **Email**.
-
-#. Select who you want to send the message to from the **Send to** dropdown
-   list. You can select:
-
-  * **Myself**
-  * **Staff and Instructors**
-  * **All (students, staff and instructors)**
-
-4. Enter a **Subject** for the message. A subject is required.
-
-#. Enter the text for the message. Message text is required. 
-   
-   Messages can use HTML styling, including text formatting and links. The
-   email message editor offers the same formatting options as the HTML
-   component editor in Studio. See :ref:`Working with HTML Components`.
-
-#. Click **Send Email**. You can perform other tasks on the Instructor
-   Dashboard or navigate to other pages while you wait for your message to be
-   sent.
-
-After you send a message, a bulk email task is queued for processing.
-Multiple courses use the same queue to complete these tasks, so it can take
-some time for your message to be sent to all of its recipients. If your course
-is a MOOC, consider limiting the number of messages that you send to all
-course participants to no more than one per week.
-
-.. _Email_queuing:
-
-======================================================
-Message Workflow States
-======================================================
-
-When you click **Send Email** for a message, the server begins to process a
-bulk email task. The server assigns a series of different workflow states to
-the task.
-  
-.. image:: ../Images/Bulk_email_states.png
-       :alt: Flowchart of the possible states of a bulk email task 
-
-The workflow states for a bulk email task are:
-
-* Queuing: The bulk email task is created and being queued for background
-  processing.
-* Pending: The task is queued and is waiting to run.
-* Started: Background processing is in progress to create emailing subtasks.
-* Progress: The emailing subtasks are in progress. 
-* Success: All emailing subtasks are complete. Note that the bulk email task
-  can be in this state even if some or all of its emailing subtasks failed.
-* Failure: An error occurred and task processing did not complete successfully.
-
-While the bulk email task is in progress, you can find out how far it has
-gotten in the workflow by checking the **Pending Instructor Tasks** section on
-the **Email** page.
-
-.. image:: ../Images/Bulk_email_pending.png
-       :alt: Information about an email message, including who submitted it 
-             and when, in tabular format
-
-When the bulk email task is complete, you can find its final state by checking
-the Email Task History report. See :ref:`Email Task History Report`.
-
-.. _Review Sent Messages:
-
-********************************
-Review Sent Messages
-********************************
-
-You can review a list of all of the messages that have been sent for the
-course. For any listed message, you can review the subject, the username of the
-person who sent it, the date and time sent, its selected recipients, and the
-message text.
-
-#. View the live version of your course.
-
-#. Click **Instructor** then click **Email**. 
-
-#. In the **Email Task History** section of the page, click **Sent Email
-   History**. The list of sent messages displays.
-
-   .. image:: ../Images/Bulk_email_list.png
-    :alt: A tabular list of sent messages, with columns for subject, sent by,  
-          time sent, and number sent
-
-4. To review additional information for a message, click its subject. The
-   message opens in a dialog box.
- 
-   .. image:: ../Images/Bulk_email_sent.png
-    :alt: A dialog box with the subject, sent by, date and time sent, sent to, 
-          and message for an email message, and an option to Copy Email 
-          to Editor
-
-5. Optionally, use the message as the basis for a new message: click **Copy
-   Email to Editor**. The dialog box closes and you can edit the text, links,
-   and formatting that were duplicated into the **Subject** and **Message**
-   fields.
-
-   When you create a message by copying a previously-sent message, be sure to
-   review and test it thoroughly before you send it to all course participants.
-
-.. _Email Task History Report:
-
-********************************
-Email Task History Report
-********************************
-
-The Email Task History report can help you keep track of who sent messages,
-when, and to how many people. For each message sent, the report includes the
-username of the requester, the date and time it was submitted, the duration and
-state of the entire task, the task status, and the task progress.
-
-You can use this history to investigate questions relating to bulk email
-messages that have been sent, such as:
-
-* How frequently students are sent course-related email messages.
-* Whether a message was sent successfully.
-* The change in the number of people who were sent course-related messages over
-  time.
-
-To produce the Email Task History report:
-
-#. View the live version of your course.
-
-#. Click **Instructor** then click **Email**. 
-
-#. In the **Email Task History** section of the page, click **Show Email Task
-   History**. A report like the following example displays on the Instructor
-   Dashboard.
-
-.. image:: ../Images/Bulk_email_history.png
-       :width: 800
-       :alt: A tabular report with a row for each message sent and columns for requester, date and time submitted, duration, state, task status, and task progress.
-
-======================================
-Review Email Task History
-======================================
-
-For tasks with a **State** of Success, the **Task Progress** column shows an
-informational message. These messages can have a format such as "Message
-successfully emailed for 13457 recipients (skipping 29) (out of 13486)". To
-interpret this message, note that:
-
-* The first number ("recipients") indicates the number of messages sent to the
-  selected recipients.
-
-* The second number ("skipping") indicates the number of enrolled and activated
-  users who were not sent the message. This count is of students who have opted
-  not to receive course email messages.
-
-* The final number ("out of") indicates the number of users in the set of
-  recipients you selected who were enrolled in the course (and had activated
-  their user accounts) when you sent the email message. 
-
-  Note that the **Total number of enrollees** shown on the **Course Info** page
-  includes all currently enrolled students, regardless of account activation
-  status, and as a result can be different than this number.
-
-If the "recipients" and "out of" numbers are the same, the message reads
-"Message successfully emailed for 13457 recipients" instead.
-
-Other **Task Progress** messages for tasks with a **State** of Success indicate
-that some or all of the emailing subtasks did not successfully send email:
-
-* "Message emailed for {number succeeded} of {number attempted} recipients" 
-* "Message failed to be emailed for any of {number attempted} recipients"
-* "Unable to find any recipients to be emailed"
-  
-No **Task Progress** messages display for tasks that have a **State** of
-Failure.
-
-.. _Example Messages to Students:
-
-*********************************
-Example Messages to Students
-*********************************
-
-You can use these example messages, prepared for delivery before typical course
-milestones, as models for your own course communications.
-
-* :ref:`Prelaunch Reminder`
-* :ref:`Launch Day Welcome`
-* :ref:`Midcourse Encouragement`
-* :ref:`Midcourse Events`
-* :ref:`Technical Issue`
-* :ref:`Course Farewell and Certificates`
-* :ref:`New Course Run Announcement`
-
-These messages are styled as email messages, but you could also post this
-information in a course discussion topic or on the **Course Info** page.
-
-.. important:: Revise these message templates carefully to include facts for your own course, meet the needs of your students, and reflect your own objectives and personality. Search for the "{" and "}" characters to locate prompts and replace them with course-specific values.
-
-.. _Prelaunch Reminder: 
-
-=======================
-Pre-launch Reminder
-=======================
-
-Pre-launch reminders raise awareness of the course start date, publicize the
-course, and generate excitement. In addition to the course start date and time,
-the example that follows also lets students know that:
-
-* UTC is used in edX courses. Alternatively, you could include information
-  about your course or the edX platform that will contribute to your students'
-  success.
-
-* The course has a companion social media site. Alternatively, you might
-  include information about planned meetups or other community-building
-  opportunities.
-
-You may want to send out more than one message before the course launches: use
-this template as a starting point for crafting the different messages you want
-to deliver. Replace values enclosed by {braces} with information that applies
-to your course.
-
-:: 
-
-  Subject: {course number} Starts Soon!
-
-  Hello {course name} student,
-
-  We are excited that you are joining us for {course number} {course name},
-  offered by {organization name} through edX. Class begins on {day}, {date} at
-  {time} UTC (which is {time} {local time zone}). Note that edX courses use
-  Coordinated Universal Time (UTC) for due dates and release times.
-
-  In case you haven't already found it, {course number} has its own official
-  Facebook page {add link}. You can find videos and photos posted there before
-  the course even begins.
-
-  If this is your first edX course, consider registering for edx101 {add link},
-  the edX Demo course. This course gives you an opportunity to explore the edX
-  platform and learn how to answer problems and track your progress, before
-  {course number} begins.
-
-  Your {course number} course staff
-
-.. _Launch Day Welcome:
-
-=======================
-Launch Day Welcome
-=======================
-
-On your course start date, you can send an email message that both welcomes
-students and gives them specific actions to accomplish. This example directs
-students to two of the course pages to encourage exploration and discovery, and
-personally introduces the course team leader. Search for the values enclosed by
-{braces} in this template and replace them with information for your course.
-
-:: 
-
-  Subject: {course number} Starts Today!
-
-  Hello everyone!
-
-  At this time, edX course {course number} is available from your Dashboard
-  {add link}, and the staff would like to officially welcome you to the course!
-  You'll find materials for the first week on the Courseware page,
-  including both video lectures and problem sets.
-
-  Please take some time to go to the Course Info page to read the handouts
-  and get familiar with course policies and philosophy.
-
-  I will be your course lead and I hope you will all have a great time learning
-  {subject}! It may be challenging, it may be frustrating, but it will be
-  rewarding and you will learn a ton.
-
-  On behalf of the staff, welcome, good luck, and have fun!
-
-  {name} and the {course number} staff
-
-.. _Midcourse Encouragement:
-
-==========================
-Mid-Course Encouragement
-==========================
-
-While your course is running, you can send messages to promote community,
-remind students of upcoming due dates, and address any recurring issues.
-
-This example gives students guidance on how to keep up with the course schedule
-and encourages contributions to the discussions. You may want to send out more
-than one message while the course is running. You can use this template as a
-starting point for your own messages; search for the values enclosed by
-{braces} and replace them with information for your course.
-
-:: 
-
-  Subject: {course name} Announcements
-
-  Dear students,
-
-  We hope that you are learning a lot in {course number}! Remember that problem
-  set {number} is due on {date} at {time} UTC. You can always check the
-  schedule {add link} on the Course Info page to plan ahead.
-
-  The contributions to the course discussions have been amazing. You'll also
-  see on the Course Info page that we have made several of you community
-  TAs to thank you for your thoughtful contributions. Keep those conversations
-  going!
-
-  We have a few additional announcements.
-
-  * Week {number} on {subject} is now available on the Courseware page.
-
-  * Problem set {number} is also available. It is due on {date} at {time} UTC. 
-
-  * Remember that the due dates for problem sets and exams are in UTC (the GMT
-    time zone). See the current UTC time here {add link}. Please convert the
-    times given to your own time zone!
-
-  Wishing you continued success in the course,
-
-  {name} and the {course number} staff
-
-.. _Midcourse Events:
-
-=======================
-Mid-Course Event
-=======================
-
-Before an exam or other significant course event, messages can provide
-practical information about the exam, communicate expectations regarding
-conduct, and also encourage students to continue working toward course
-completion. This example lets students know:
-
-* How long they have to complete the exam, and when they can see answers to
-  questions.
-
-* How to communicate any errors or other issues found during the exam to the
-  course staff.
-
-* Whether the course discussions will be open or closed during the exam. (In
-  the example that follows, the discussions will remain **open**.)
-
-* What constitutes an honor code violation.
-
-* What technical limitations, if any, are imposed by external tools such as
-  graders.
-
-Be sure to search for the values enclosed by {braces} and replace them with
-information for your course.
-
-:: 
-
-  Subject: {course number} Exam Info
-
-  Hello {course name} student,
-
-  Great job working through week {number}! As you know, the {course number}
-  exam is next week. If you missed a problem set, you can still earn a
-  certificate. Each problem set is worth only {number}% of the overall grade,
-  but this exam is worth {number}%.
-
-  Please read this important information about the exam before you begin taking
-  it.
-
-  * The exam starts on {date} at {time} UTC and must be finished by {date} at
-    {time} UTC. Plan your schedule accordingly.
-
-  * Be sure that you know what time the UTC deadline is in your time zone. See
-    the current UTC time {add link}. No extensions will be given.
-
-  * The exam is not timed. You can start, stop, and come back to it until the
-    deadline.
-
-  * Each exam question allows only one answer submission. If you accidentally
-    click "Check", that problem cannot be reset for you.
-
-  * The exam covers everything (video lectures, reading, and problem sets) from
-    weeks {number}-{number}. If you missed any of these materials, you will
-    want to review them before you take the exam.
-
-  * You can use the textbook and the Internet to clarify your knowledge of exam
-    topics, as long as you are not deliberately looking up answers to exam
-    questions.
-
-  * Course discussions will remain open during the exam, but anyone who posts
-    an answer to an exam question will be violating the honor code and risk
-    being removed from the class, forfeiting the certificate.
-
-  * If you need to alert the staff to an issue with the exam while the exam is
-    open, add a post to the General discussion topic and include [EXAM] in
-    the subject line.
-
-  * Check the Course Info page periodically. It is the fastest way the
-    staff has to communicate any delays, corrections, or changes.
-
-  Good luck!
-
-  {name} and the {course number} staff
-
-.. _Technical Issue:
-
-=========================================
-Technical Issue
-=========================================
-
-In the event of an unanticipated system failure, a message can both alert
-students to the problem and reassure them that the issue is either resolved or
-being addressed. The message can also provide information about any changes
-made to the course as a result.
-
-Technical issues can arise during a course for many different reasons, so this
-example is likely to need revision to apply to an issue that you encounter.
-Keep in mind that to reassure the students who are affected by the problem, the
-message should have a positive tone, and calmly and briefly identify the
-problem, the status of its solution, and any after effects.
-
-::
-
-  Dear students,
-
-  We've encountered a technical problem with {video, assignment, etc. name}.
-  {We are working to resolve it now. / This issue has been fixed.}
-
-  As a result of this issue, we have {extended the deadline for / rescored}
-  this assignment so that it will not affect your grade.
-
-  Thanks for your patience, and we look forward to continuing the course with
-  you.
-
-  {name} and the {course number} staff
-
-.. _Course Farewell and Certificates:
-
-==============================================
-Course Farewell and Certificates
-==============================================
-
-In the last few days before your course ends, a message can direct students to
-a course survey, answer questions about certificates, and provide information
-about future access to course materials. Be sure to replace values enclosed by
-{braces} with information for your course.
-
-:: 
-
-  Subject: {course number} Final Remarks
-
-  Dear students,
-
-  Thank you for making {course number} so much fun these last few months! We
-  had a great time getting to know you through the course discussions. We
-  appreciate the effort that you put into this course, and we hope that you
-  enjoyed learning {subject} through edX. With or without a certificate, you
-  should be proud of your accomplishments.
-
-  * Please take a few minutes to answer the exit survey, now available under
-    Courseware. We will use your responses to improve the course in the future.
-
-  * If you qualify for a certificate (overall score {number}% or higher), the
-    edX dashboard will include a link to your certificate in the near future.
-    While you may see the link in a few days, it can take up to two weeks edX
-    to generate all of the course certificates.
-
-  * As a registered student, you will have access to the lecture videos even
-    after the course ends. The problem sets and exams will be removed from the
-    course when it is archived.
-
-  * The {course number} discussions close on {date} at {time} UTC. You will not
-    be able to add to the discussions after that time, but you will be able to
-    continue viewing all of the conversations that took place during the
-    course.
-
-  We hope that you share what you learned in {course number} with your
-  colleagues, friends, and family.
-
-  Good luck on the final exam and beyond!
-
-  {name} and the {course number} staff
-
-.. _New Course Run Announcement:
-
-===============================
-New Course Run Announcement
-===============================
-
-When you prepare a course for a new run, you can use the bulk email feature in
-its previous run (or runs) to inform an engaged and knowledgeable audience:
-your former students. Announcing a new run to students of an earlier run gives
-you the opportunity to highlight key aspects of the course, such as the quality
-and variety of its discussions, or the global interest and relevance of the
-subject, as demonstrated by past enrollment. You can also reveal new features
-or content that have been added to the new course run. By emphasizing the
-value of the course, you get people thinking and talking about their
-experiences, build excitement, and encourage re-enrollment.
-
-This message template offers students who did not complete the course, or who
-did not previously choose the verified certificate track, the opportunity to do
-so. It also invites students to share the course with colleagues and and
-friends. 
-
-When preparing a message from this template, search for values enclosed by
-{braces} and replace them with information that applies to your course.
-
-::
-
-  Subject: Announcing a new run of {course name}
-
-  Hello {course number} leaners,
-
-  The next run of {course number} {course name} begins on {date}! We are glad
-  to share this news with you, the students who made the earlier run{s} of
-  {course number} so succesful.
-
-  {Success story from the previous run.} 
-
-  {New content or features for the upcoming run.}
-
-  Perhaps you want to share the {course name} experience with a friend or
-  colleague, earn an ID-verified certificate of achievement, or work through
-  course content that you weren't able to complete before. When {course number}
-  is offered in {time frame}, we welcome you to join the community of learners
-  again.
-
-  To learn more and to register, visit the {course name} page {add link}.
-
-  We hope to see you in the course,
-
-  The {course number} Staff
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/releasing_course/d.rst b/docs/en_us/course_authors/source/releasing_course/d.rst
deleted file mode 100644
index f34ae7d7cc..0000000000
--- a/docs/en_us/course_authors/source/releasing_course/d.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-======================
-Time Zones
-======================
-
-    **Overview**
-    Released course materials become visible to all students at once, and assignments with a due date will be due for all students at once, at the time specified by the setting. However, a number of places on edX and Studio present a time setting without specifying a time zone. Unless specified otherwise, most dates and times in Studio and edX are in UTC, not in your local time zone! When you specify date and time settings that do not have a time zone label, you need to convert values to UTC.  You should also ensure that students and instructors know how to interpret time settings for your course.
-
-    **Details**
-    Time is stored in a specific time zone. However, this time zone may not be visible in the interface. Unlabeled time values are specified, stored, and viewed in UTC.
-
-    EdX and Studio handle time zones as follows.
-
-    •	All times, labeled and unlabeled, are saved to the server in UTC (a.k.a. UTC or Z).
-    •	Unlabeled times are displayed both in Studio and on edX/Edge in UTC.
-    •	Times labeled with a particular time zone in Studio are specified in that time zone, and are converted to UTC. (This is rare.)
-
-    For settings in Studio that are labeled with a time zone, such as the course start and end dates, enter the setting in the time zone specified (usually your local time zone).
-
-    For time settings that are not labeled with a time zone, such as release dates and due dates for course content, convert from your local time zone, and set the dates and time settings in UTC. You can use an online time zone converter to convert from your local time zone.  
-
-    *Note When you use an online converter, enter both the day and the time to account for daylight saving time.*
-
-    Example US Eastern Standard Time is "UTC-5", so a New York winter due date of 5:00pm (17:00) should be entered as 10:00pm (or 22:00) in Studio. US Daylight Saving Time, however, is UTC-4, so a New York summer due date of 5:00pm would be entered as 9:00pm in Studio.
-
-    Most of these time settings are also not labeled in the Student view on edX/Edge. When you set due dates for an assignment, make sure to tell students how to interpret the due date. You can choose one of the following options.
-
-    •	Notify students in advance that all times, unless otherwise labeled, are displayed in UTC, and point them to a time zone converter to convert to their local time zone.
-    •	Allow students to assume that all due dates are specified in their local time zone, and specify an unadvertised grace period to invisibly extend all the due dates in your course. For example, some courses set a grace period of "1 day, 6 hours, and 1 minute" to accommodate differences in time zones and any potential system issues.
-
-    *Note Setting a grace period is generally not recommended. It can lead to problems not closing "when they should", and may be misleading to your students.*
-
-    If you have further questions about specifying times and time zones, or are experiencing inconsistencies in due date or release date behavior, please contact us from the edX Studio Help page.
-
-    **References**
-
-    http://help.edge.edx.org/discussions/questions/61-time-zones
-
-    http://help.edge.edx.org/discussions/questions/23-grace-periods
diff --git a/docs/en_us/course_authors/source/releasing_course/index.rst b/docs/en_us/course_authors/source/releasing_course/index.rst
deleted file mode 100644
index a86b61dfc4..0000000000
--- a/docs/en_us/course_authors/source/releasing_course/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-.. _Releasing Your Course Index:
-
-##########################
-Releasing Your Course
-##########################
-
-.. toctree::
-   :maxdepth: 2
-   
-   beta_testing
-   course_launching
-   staff_debug_info
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/releasing_course/staff_debug_info.rst b/docs/en_us/course_authors/source/releasing_course/staff_debug_info.rst
deleted file mode 100644
index 2978049154..0000000000
--- a/docs/en_us/course_authors/source/releasing_course/staff_debug_info.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-.. _Staff Debug Info:
-
-############################
-Staff Debug Info
-############################
-
-The edX system keeps track of students' progress through a course -- recording
-when the student watches videos, responds to problems, and so on. If you are
-a staff member on a course, some of that data is visible to you for debugging purposes. Under every problem is a **Staff Debug Info** button: clicking this button opens a popup with metadata about the problem.
-
-None of this information should be necessary for day-to-day usage of edX,
-but for the sake of clarity, some of these fields are documented here:
-
-``is_released``
-  Indicates whether the problem is visible to students.
-``location``
-  An internal unique identifier that corresponds to this problem. If you
-  are having trouble with a problem, and need assistance from the edX support
-  team, including this value will make it easier for them to track down the
-  issue you're having with the problem.
-``markdown``
-  The text of the problem, in Markdown format. This is often written using
-  Studio.
-``display_name``
-  The name of the problem, as shown to the student.
-``max_attempts``
-  The maximum number of times that a student can attempt to answer the problem
-  correctly.
-``attempts``
-  The number of times that the currently logged in student has attempted to
-  answer the problem correctly, so far. Every time this student attempts to answer
-  this question, this number will go up, until it reaches ``max_attempts``.
-
-
diff --git a/docs/en_us/course_authors/source/running_course/checking_student_progress.rst b/docs/en_us/course_authors/source/running_course/checking_student_progress.rst
deleted file mode 100644
index b1a44a4d62..0000000000
--- a/docs/en_us/course_authors/source/running_course/checking_student_progress.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-.. _Checking Student Progress and Issuing Certificates:
-
-###################################################
-Assign Final Grades and Issue Certificates
-###################################################
-.. This chapter will be renamed and expanded to include course wrap-up activities and best practices.
-
-As you prepare for the end of your course, you can send students a :ref:`course
-farewell<Course Farewell and Certificates>` email message.
-
-To assign a final grade to each student enrolled in a course, you generate
-grades after the **Course End Date** and **Time** have passed. See
-:ref:`Access_grades`.
- 
-The final grades of a student in the course and the grading configuration you
-set in Studio are used to determine whether the student has earned a Certificate
-of Mastery for the course.
-
-The process of issuing certificates is completed at edX: work with your edX
-program manager to schedule a date to issue certificates and complete this
-process.
- 
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/running_course/course_answers.rst b/docs/en_us/course_authors/source/running_course/course_answers.rst
deleted file mode 100644
index 3055522481..0000000000
--- a/docs/en_us/course_authors/source/running_course/course_answers.rst
+++ /dev/null
@@ -1,321 +0,0 @@
-.. _Review_Answers:
-
-############################
-Answer Data
-############################
-
-To review student answers to the problems in your course, you can review the
-answer submitted by a selected student for a specific problem, download a
-course-wide report of answer data, or review a histogram of student answers for
-a selected problem.
-
-* :ref:`Student_Answer_Submission`
-
-* :ref:`Student_Answer_Distribution`
-
-* :ref:`score_histogram`
-
-.. _Student_Answer_Submission:
-
-************************************************************
-Check a Student's Answer Submission and Submission History
-************************************************************
-
-For a single student and problem, you can review the exact response submitted,
-the number of attempts made, and the date and time of the submission. You
-identify the student by supplying a username.
-
-To review a response submitted by a student:
-
-#. View the live version of your course.
-
-#. Click **Courseware** and navigate to the unit that contains the problem
-   you want to review.
-
-#. Display the problem and then click **Submission History** below the problem.
-
-#. Enter the username for the student whose work you want to review, then click
-   **View History** at the end of the page.
-
-  Information about the response or responses provided by the student displays.
-
-To close the Submission History Viewer, click on the browser page outside of the
-viewer.
-   
-.. _Student_Answer_Distribution:
-
-****************************************
-Student Answer Distribution
-****************************************
-
-For certain types of problems in your course, you can download a CSV file with
-data about the distribution of student answers. Student answer distribution data
-is included in the file for problems of these types:
-
-* Checkboxes (``<choiceresponse>``)
-* Dropdown (``<optionresponse>``)
-* Multiple choice (``<multiplechoiceresponse>``)
-* Numerical input (``<numericalresponse>``)
-* Text input (``<stringresponse>``)
-* Math expression input (``<formularesponse>``)
-
-The file includes a row for each problem-answer combination selected by your
-students. For example, for a problem that has a total of five possible answers
-the file includes up to five rows, one for each answer selected by at least one
-student. For problems with **Randomization** enabled in Studio (sometimes
-called rerandomization), there is one row for each problem-variant-answer
-combination selected by your students. See :ref:`Problem Settings`.
-
-The CSV file contains the following columns:
-
-.. list-table::
-   :widths: 20 60
-   :header-rows: 1
-
-   * - Column
-     - Description
-   * - ModuleID
-     - The internal identifier for the Problem component.
-   * - PartID
-     - For a Problem component that contains multiple problems, the internal
-       identifier for each individual problem. For a Problem component that
-       contains a single problem, the internal identifier of that problem.
-   * - Correct Answer
-     - 0 if this **AnswerValue** is incorrect, or 1 if this **AnswerValue** is
-       correct.
-   * - Count
-     - The number of times that students entered or selected this answer as
-       their most recent submission for the problem or problem variant. For
-       problems with the number of **Attempts** set to a value greater than 1,
-       this means that each student contributes a maximum of 1 to this count,
-       even if the same answer is provided in multiple attempts.
-   * - ValueID
-     - The internal identifier of the answer choice for checkboxes and multiple
-       choice problems. Blank for dropdown, numerical input, text input, and
-       math expression input problems.
-   * - AnswerValue
-     - The text label of the answer choice for checkboxes, dropdown, and
-       multiple choice problems. The value entered by the student for numerical
-       input, text input, and math expression input problems.
-   * - Variant
-     - For problems that use the **Randomization** setting in Studio, contains
-       the unique identifier for a variant of the problem. Blank for problems
-       that do not use the **Randomization** setting, or that use the **Never**
-       option for this setting.
-   * - Problem Display Name
-     - The **Display Name** defined for the problem.
-   * - Question
-     - The label for accessibility that appears above the answer choices or the
-       text entry field for the problem. In Studio's Simple Editor, this text is
-       surrounded by two pairs of angle brackets (>>Question<<). Blank for
-       questions that do not have an accessibility label defined.
-
-Entries are sorted by the value in each column, starting with the ModuleID on
-the left and continuing through the columns to the right.
-
-.. _Download_Answer_Distributions:
-
-===================================================
-Download the Student Answer Distribution Report
-===================================================
-
-An automated process runs periodically on the edX servers to update the CSV file
-of student answer data. A link to the most recently updated version of the CSV
-file is available on the Instructor Dashboard.
-
-To download the most recent file of student answer data:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Data Download**.
-
-#. At the bottom of the page, click the ``{course_id}_answer_distribution.csv``
-   file name. You may have to scroll down to find this file.
-
-==========================================================================
-Frequently Asked Questions about the Student Answer Distribution Report
-==========================================================================
-
-Answers to questions about the student answer distribution report follow.   
-
-**My course doesn't have a student answer distribution report. How can I
-generate it?**
-
-Student answer distribution reports are generated automatically, and refreshed
-several times each day. The ``{course_id}_answer_distribution.csv`` file
-displays after all of the ``{course_id}_grade_report_{date}.csv`` files. Be sure
-to scroll to the end of the list of available reports.
-
-**Why are some problems missing from this report? The ones that are missing do
-have the problem types listed under** :ref:`Review_Answers`.
-
-This report includes only problems that at least one student has answered since
-early March 2014. For those problems, this report only includes activity that
-occurred after October 2013.
-
-**Why don't I see an AnswerValue for some of my problems?**
-
-For checkboxes and multiple choice problems, the answer choices actually
-selected by a student after early March 2014 display as described in the
-previous answer. Answer choices selected by at least one student after October
-2013, but not selected since early March 2014, are included on the report but do
-not include an **AnswerValue**. The **ValueID** does display the internal
-identifiers, such as choice_1 and choice_2, for those answers.
-
-**Why don't I see a Question for some of my problems?**
-
-The value in the **Question** column is the accessibility label for the problem.
-For more information about how to set up labels for problems, see :ref:`Create
-Exercises`.
-
-Also, for problems that use the **Randomization** setting in Studio, if a
-particular answer has not been selected since early March 2014, the **Question**
-is blank for that answer.
-
-**My students are saying that they answered a question, but it isn't showing up
-in the report. How can that be?**
-
-Only questions that have a **Maximum Attempts** setting of 1 or higher are
-included on the report.
-
-**I made a correction to a problem after it was released. How can I tell which
-students tried to answer it before I made the change?**
-
-Problem **Count** values reflect the entire problem history. If you change a
-problem after it is released, it may not be possible for you to determine which
-answers were given before and after you made the change.
-
-**Why is the same answer showing up in two different rows when I view the report
-in a spreadsheet?**
-
-Some spreadsheet applications can alter the data in the CSV report for display
-purposes. For example, for different student answers of "0.5" and ".5" Excel
-correctly includes the two different lines from the CSV, but displays the
-**AnswerValue** on both of them as "0.5". If you notice answers that appear to
-be the same on separate lines with separate counts, you can review the actual,
-unaltered data by opening the CSV file in a text editor.
-
-**Why are there strange characters in the report when I view it in a
-spreadsheet?**
-
-The CSV file is UTF-8 encoded, but not all spreadsheet applications interpret
-and render UTF-8 encoded characters correctly. For example, a student answer
-distribution report with answer values in French displays differently in
-Microsoft Excel for Mac than in OpenOffice Calc.
-
-  Answer Values in Microsoft Excel for Mac:
-
-   .. image:: ../Images/student_answer_excel.png
-     :alt: A spreadsheet that replaces accented French characters with underscores
-
-  Answer Values in OpenOffice Calc:
-
-   .. image:: ../Images/student_answer_calc.png
-     :alt: A spreadsheet that displays accented French characters correctly
-
-If you notice characters that do not display as expected in a spreadsheet, try a
-different spreadsheet application such as LibreOffice or Apache OpenOffice to
-open the CSV file.
-
-==========================================================================
-Interpret the Student Answer Distribution Report
-==========================================================================
-
-You can use the Student Answer Distribution report to review student responses
-to assignments, which can then help you evaluate the structure and completeness
-of your courseware and problem components.
-
-As an example, you define a text input question in Studio to have a single
-correct answer, "Warfarin". When you produce the Student Answer Distribution
-report, you verify that this answer was in fact marked correct: there is a 1 in
-the **Correct Answer** column for this **AnswerValue**.
-
-.. image:: ../Images/SAD_Answer_Review.png
-    :alt: In Excel, 5 rows show 5 answer values, 4 of which show comprehension of the question, but only 1 answer is marked as correct
-
-However, as you view the report you notice other student answers that you did
-not set up to be marked as correct in Studio, but that you might (or might not)
-also consider to be correct, such as "Warfarin or Coumadin". The **Correct
-Answer** column shows that the other answers were marked incorrect (0), but for
-future iterations of your course you may want to revise the question or update
-the problem to evaluate additional variations of the answer as correct.
-
-Many spreadsheet applications offer data visualization options, such as charts
-or graphs. Charts can help make your students' common misconceptions  easier to
-identify.
-
-.. image:: ../Images/SAD_Column_Chart.png
-    :alt: In Excel, AnswerValue and Count columns next to each other, values for 4 rows selected, and a column chart of the count for the 4 answers
-
-In this example, the Student Answer Distribution report is open in Microsoft
-Excel. To create a chart that shows how many of your students chose various
-answers to a multiple choice question, you move the **AnswerValue** and
-**Count** columns next to each other. After you click and drag to select the
-report cells that contain the data you want to chart, you click the Charts
-toolbar and then click the type of chart you want.
-
-.. note:: Refer to the help for the spreadsheet application that you use for information on using these options. You may have to make changes to your spreadsheet, such as reordering columns. Save a copy of the file you originally downloaded as a backup before you begin. 
-
-You can adjust your course content based on common student mistakes. While most
-students in this example selected the correct answer, the number of incorrect
-answer(s) can guide future changes to the courseware.
-
-.. _score_histogram:
-
-**************************************************
-View a Histogram of Scores for a Single Problem
-**************************************************
-
-You can view a chart of the score distribution for a specified problem. 
-
-.. note:: To view the score distribution for a problem, you need its unique identifier. You can display a histogram for problems that have the  ``/problem/`` prefix in the unique identifier. See :ref:`find_URL`.
-
-To display the distribution of scores for a problem:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Analytics**. 
-
-#. In the Score Distribution section, select a problem by using its unique
-   identifier.
-
-   The **Analytics** page updates to display a histogram of scores for that
-   problem.
-
-   .. image:: ../Images/score_histogram.png
-     :alt: Graph of the number of students who received different scores for a
-         selected problem
-
-..  **Question**: (sent to Olga 31 Jan 14) this is a tough UI to use: how do they correlate the codes in this drop-down with actual constructed problems? the copy-and-paste UI on the Student Admin page actually works a little better imo. LMS-2522
-
-===================================================
-Interpret a Score Histogram
-===================================================
-
-The histogram of scores for a selected problem provides the following
-information.
-
-   .. image:: ../Images/score_histogram_callouts.png
-     :alt: Histogram with indicators for the number of students scored value and
-         the x-axis numbers that indicate plotted scores
-
-* The x-axis indicates the number of points that students can receive for the
-  problem, unweighted. Although decimal values are marked on the x-axis, each
-  score is a whole number. The whole number value at the left of a plotted bar
-  is the score that applies to it.
-
-* The y-axis indicates the number of students who have answered and checked the
-  problem.
-
-* Above the graph, a number of **students scored** displays. This number
-  indicates the total number of database records that exist for the problem: it
-  includes not only students who have answered and checked the problem to
-  receive a score, but also students who have opened the problem but not yet
-  completed it.
-
-* An automated process runs approximately weekly on the edX servers to update
-  score histograms. This process runs less frequently than the process that
-  updates the student answer distribution report: at certain times during a
-  course the number of students shown in a score histogram can be quite
-  different than the **Count** for the same problem in a student answer
-  distribution report.
diff --git a/docs/en_us/course_authors/source/running_course/course_data.rst b/docs/en_us/course_authors/source/running_course/course_data.rst
deleted file mode 100644
index 10e31a3af5..0000000000
--- a/docs/en_us/course_authors/source/running_course/course_data.rst
+++ /dev/null
@@ -1,85 +0,0 @@
-.. _Course Data:
-
-############################
-Course Data
-############################
-
-After you create a course, you can access information about it from the
-Instructor Dashboard. You can find:
-
-* Identifying information for the course.
-
-* Whether the course has started or ended.
-
-* The defined grade cutoff for passing or failing.
-
-Additional data about the course and its students is available from other pages
-in the Instructor Dashboard, and from edX Insights. You also access Insights
-from the Instructor Dashboard: click the link in the banner at the top of each
-page. For more information, see `Using edX Insights`_.
-
-*************************************************
-Review Course Data
-*************************************************
-
-To view course data:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Course Info** if necessary. 
-
-   The **Basic Course Information** section of the page that opens lists
-   information about the course.
-
-    .. image:: ../Images/Instructor_Dash_Course_Info.png
-     :alt: The basic course information section of the Instructor Dashboard 
-
-*************************************************
-Sources in Studio of the Basic Course Information
-*************************************************
-
-The course data that displays on the Instructor Dashboard is defined in
-Studio, or derived from data that you define in Studio.
-
-* **Organization**: Specified in Studio when you create the course. Becomes
-  part of the course URL, and cannot be changed.
-
-* **Course Number**: Specified in Studio when you create the course. Becomes
-  part of the course URL, and cannot be changed.
-
-* **Course Name**: Specified in Studio when you create the course. Becomes
-  part of the course URL, and cannot be changed. In Studio, this field is
-  labeled **Course Run**.
-
-* **Course Display Name**: Specified in Studio when you create the course. In
-  Studio, this field is labeled **Course Name**. 
-
-  This name can be changed in Studio (not recommended if your course is live):
-  From the **Settings** menu select **Advanced Settings**. The value for the
-  **Course Display Name** policy key defines the course name that appears in the
-  LMS only.
-
-  The illustration that follows shows the information collected by Studio for
-  a new course side-by-side with the same information in the **Basic Course
-  Information** section of the Instructor Dashboard.
-
-.. image:: ../Images/Course_Info_Comparison.png
-   :alt: The Course Name in Studio and the Course Display Name in the LMS are boxed; the Course Run in Studio and the Course Name in the LMS are circled
-   :width: 800
-
-* **Has the course started**: Derived from the **Course Start Date** and the
-  current date. This date can be changed in Studio (not recommended if your
-  course is live): select **Settings** > **Schedule & Details**.
-
-* **Has the course ended**: Derived from the **Course End Date** and the
-  current date. This date can be changed in Studio (not recommended if your
-  course is live): select **Settings** > **Schedule & Details**.
-
-* **Grade Cutoffs**: Specified in Studio when you define the cutoff for a
-  failing grade. Students who earn exactly the cutoff value pass the course.
-  Grading can be changed in Studio (not recommended if your course is live):
-  select **Settings** > **Grading**.
-
-
-
-.. _Using edX Insights: http://edx-insights.readthedocs.org/en/latest/
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/running_course/course_enrollment.rst b/docs/en_us/course_authors/source/running_course/course_enrollment.rst
deleted file mode 100644
index 97a5637dc9..0000000000
--- a/docs/en_us/course_authors/source/running_course/course_enrollment.rst
+++ /dev/null
@@ -1,184 +0,0 @@
-.. _Enrollment:
-
-##########################
-Enrollment
-##########################
-
-Course authors and instructors can enroll students in a course, see how many
-people are enrolled, and, when necessary, unenroll students on the Instructor
-Dashboard.
-
-Students can enroll themselves in a course during its defined enrollment
-period. For a ``www.edx.org`` course, enrollment is publicly available to
-anyone who registers an edX account. For other courses, such as those on
-``edge.edx.org``, enrollment is limited to students who know the course URL
-and students you explicitly enroll.
-
-* :ref:`registration_enrollment`
-
-* :ref:`enroll_student`
-
-* :ref:`view_enrollment_count`
-
-* :ref:`unenroll_student`
-
-Data about course enrollment is also available from edX Insights. You access
-Insights from the Instructor Dashboard for your live course: after you click
-**Instructor**, click the link in the banner at the top of each page. For more
-information, see `Using edX Insights`_.
-
-.. _registration_enrollment:
-
-*********************************
-Registration and Enrollment
-*********************************
-
-Before a student can enroll in a course, he or she must:
-
-#. Register a user account, which includes supplying a valid email address, on
-   ``www.edx.org``, ``edge.edx.org``, or your implementation of the edX
-   platform. Each platform requires a separate user account.
-
-#. Activate the registered account by following the emailed instructions.
-
-As long as the course **Enrollment End Date** has not passed, students who
-have registered and activated user accounts can enroll themselves in
-``www.edx.org`` courses, or can enroll in other courses if they know the URL.
-For a more detailed description of this process from a student's point of
-view, see :ref:`Sample Student Login Guide`.
-
-Course authors and instructors, however, can enroll students in a course either
-before or after the students register their user accounts.
-
-To work on a course, all course staff members must also have registered and
-activated user accounts and be enrolled in the course.
-
-.. _enroll_student:
-
-*********************************
-Enroll Students in a Course
-*********************************
-
-You enroll students, and other course staff members, in your course by
-supplying their email addresses. After the **Enrollment End Date** for a
-course students can no longer enroll themselves; however, you can still
-explicitly enroll students.
-
-When you enroll people in a course you have these options:
-
-* **Auto Enroll**. When you choose this option, the people who you enroll do
-  not need to complete an explicit course enrollment step. Of the list of email
-  addresses that you supply, those that correspond to a registered user account
-  are immediately enrolled in the course, and your course displays on the
-  **Current Courses** dashboard for those users on log in. Email addresses on
-  the list that do not match a registered user account are enrolled as soon as
-  that account is registered and activated.
-
-  If you do not select **Auto Enroll**, the people who you enroll must also actively locate your course and enroll themselves in it. These students see the course on their dashboards after they have done so.
-
-* **Notify students by email**. When you choose this option, an email message is
-  automatically sent to each of the email addresses that you supply. The message
-  includes the name of the course and, for students who are not already
-  registered, a reminder to use that same email address to register.
-
-  An example of the email message that a student received when this option was
-  selected during enrollment follows. In this example, the student already had a
-  registered and activated edx.org account, and both **Auto Enroll** and
-  **Notify students by email** were selected.
-
-  .. image:: ../Images/Course_Enrollment_Email.png
-        :alt: Email message inviting a student to enroll in an edx.org course
-
-To enroll students or staff members:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Membership**. 
-
-#. In the **Batch Enrollment** section of the page, enter the username or email
-   address of the student, or enter multiple names or addresses separated by
-   commas or new lines.
-
-  You can copy and paste data from a CSV file of email addresses. However,
-  note that this feature is better suited to courses with smaller enrollments,
-  rather than courses with massive enrollments.
-
-4. To streamline the course enrollment process, leave **Auto Enroll** selected.
-
-#. To send students an email message, leave **Notify students by email**
-   selected.
-
-#. Click **Enroll**.
-
-.. _view_enrollment_count:
-
-***************************
-View an Enrollment Count
-***************************
-
-After you create a course, you can access the total number of people who are
-enrolled in it. When you view an enrollment count, note that:
-
-* In addition to students, the enrollment count includes the course author,
-  course team members, instructors, and course staff. (To work with a
-  course in Studio or the LMS, you must be enrolled in that course.)
-
-* Students can unenroll from courses, and course authors and instructors can
-  unenroll students when necessary.
-
-  **Note**: The enrollment count displays the number of currently enrolled
-  students and course team staff. It is not a historical count of everyone who
-  has ever enrolled in the course.
-
-The total number of current enrollees is shown as the sum of the number of
-people who selected each of the certification tracks (verified, audit, or
-honor) that are available for your course.
-
-To view the enrollment count for a course:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Course Info** if necessary. 
-
-  The **Enrollment Information** section of the page that opens shows the
-  number of people who are currently enrolled in your course and in each of the
-  certification tracks.
-
-You can also view or download a list of the people who are enrolled in the
-course. See :ref:`Student Data`.
-
-.. _unenroll_student:
-
-*********************************
-Unenroll Students from a Course
-*********************************
-
-You can remove students from a course by unenrolling them. To prevent students
-from re-enrolling, course enrollment must also be closed. You use Studio to
-set the **Enrollment End Date** for the course to a date in the past. See
-:ref:`Set Important Dates for Your Course`.
-
-**Note**: Unenrollment does not delete data for a student. An unenrolled
-student's state remains in the database and is reinstated if the student does
-re-enroll.
-
-To unenroll students, you supply the email addresses of enrolled students. 
-
-#. View the live version of your course.
-
-#. Click **Membership**. 
-
-#. In the **Batch Enrollment** section of the page, enter a username or an email
-   address, or multiple names or addresses separated by commas or new lines.
-
-#. To send students an email message, leave **Notify students by email**
-   selected.
-
-.. note:: The **Auto Enroll** option has no effect when you click **Unenroll**.
-
-5. Click **Unenroll**. The course is no longer listed on the students'
-   **Current Courses** dashboards, and the students can no longer contribute to
-   discussions or the wiki or access the courseware.
-
-
-.. _Using edX Insights: http://edx-insights.readthedocs.org/en/latest/
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/running_course/course_grades.rst b/docs/en_us/course_authors/source/running_course/course_grades.rst
deleted file mode 100644
index c8b360d9dc..0000000000
--- a/docs/en_us/course_authors/source/running_course/course_grades.rst
+++ /dev/null
@@ -1,591 +0,0 @@
-.. _Grades:
-
-############################
-Student Grades and Grading
-############################
-
-You can review information about how grading is configured for your course, and
-access student grades, at any time after you create the course. You can also
-make adjustments to student grading for a problem, for a single student or all
-students. For information about the grading data that you can access and the
-changes you can make, see the following topics:
-
-* :ref:`Review_grades`
-
-* :ref:`Access_grades`
-
-* :ref:`gradebook`
-
-* :ref:`check_student_progress`
-
-* :ref:`Adjust_grades`
-
-To review student answers to the problems in your course, you can check the
-answer submitted by a specified student for a selected problem, download
-course-wide answer data, or review a graph of all answer data for a selected
-problem. See :ref:`Review_Answers`.
-
-For information about how you establish a grading policy and work with the
-Problem components in your course, see :ref:`Establish a Grading Policy` or
-:ref:`Working with Problem Components`.
-
-.. _Review_grades:
-
-********************************************************
-Review How Grading Is Configured for Your Course
-********************************************************
-
-You can review the assignment types that are graded and their respective
-weights on the Instructor Dashboard.
-
-You establish a grading policy for your course when you create it in Studio.
-While the course is running, you can view an XML representation of the
-assignment types in your course and how they are weighted to determine
-students' grades.
-
-..  DOC-290: research this statement before including anything like it: Below the list of graded assignment types and their weights, each *public* subsection and unit that contains an assignment is listed.
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Data Download** > **Grading
-   Configuration**.
-
-   A list of the assignment types in your course displays. In this example,
-   Homework is weighted as 0.3 (30%) of the grade.
-
-   .. image:: ../Images/Grading_Configuration.png
-     :alt: XML of course assignment types and weights for grading
-
-   In Studio, you define this information by selecting **Settings** >
-   **Grading**. For more information, see :ref:`Configure the Assignment
-   Types`.
-
-   .. image:: ../Images/Grading_Configuration_Studio.png
-     :alt: Studio example of homework assignment type and grading weight
-
-.. important:: Any changes that you make to the course grading policy, to 
- graded subsections, or to graded components after the course begins will
- affect the student experience in the course and analysis of its data.
- Unavoidable changes should be announced to students, on the **Course Info**
- page for example, and carefully tracked for researchers.
-
-.. _Access_grades:
-
-********************************************************
-Generate Grades for Enrolled Students (All Courses)
-********************************************************
-
-For any course, you can generate grades and then download a file with the
-results for each enrolled student. 
-
-When you initiate calculations to grade student work, a process starts on the
-edX servers. The complexity of your grading configuration and the number of
-students enrolled in your course affect how long this process takes. You can
-download a report of the calculated grades in a CSV (comma-separated values)
-file when the grading process is complete.
-
-For courses with fewer than 200 students enrolled, you also have the option to
-review student grades on the Instructor Dashboard. See :ref:`gradebook`.
-
-To generate the grade report for the students who are currently enrolled in
-your course:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Data Download**.
-
-#. To start the grading process, click **Generate Grade Report**.
-
-  A status message indicates that the grading process is in progress. This
-  process can take some time to complete, but you can navigate away from this
-  page and do other work while it runs.
-
-4. To track the progress of the grading process, reload the page in your
-   browser and scroll down to the **Pending Instructor Tasks** section.
-
-==========================================
-Download Grades for Enrolled Students
-==========================================
-
-After you request a grade report for your students, the result is a time-
-stamped CSV file that includes columns to identify each student: id, email, and
-username. It also includes a column for every assignment that is included in
-your grading configuration: each homework, lab, midterm, final, and any other
-assignment type you added to your course.
-
-.. important:: Because this file contains confidential, personally 
- identifiable data which may be subject to the Family Educational Rights and
- Privacy Act (FERPA), be sure to follow your institution's data stewardship
- policies when you open or save this file.
-
-To download a file of student grades:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Data Download**.
-
-#. To open or save a grade report file, click the
-   ``{course_id}_grade_report_{date}.csv`` file name at the bottom of the page.
-
-.. note:: To prevent the accidental distribution of student data, you can only 
- download these files by clicking the links on this page. Do not copy these
- links for reuse elsewhere, as they expire within 5 minutes. The links on this
- page also expire if the page is open for more than 5 minutes: if necessary,
- refresh the page to generate new links.
-
-.. _Interpret the Grade Report:
-
-=====================================
-Interpret the Grade Report
-=====================================
-
-Grade reports provide a snapshot of cumulative course scores, by assignment, of
-every currently enrolled student.
-
-You can open ``{course_id}_grade_report_{date}.csv`` files in a spreadsheet
-application to sort, graph, and compare data.
-
-.. image:: ../Images/Grade_Report.png
-  :alt: A course grade report, opened in Excel, showing the grades acheived by 
-        students on several homework assignments and the midterm
-
-The CSV file contains one row of data for each student, and columns that
-provide the following information.
-
-* Student identifiers, including an internal **id**, **email** address, and
-  **username**.
-
-* The overall **grade**, with the total score a student has currently attained
-  in the course. This value is expressed as a decimal: a student with a grade
-  of 0.65 has earned 65% of the credit in the course, and a student with a
-  grade of 1 has earned 100%.
-
-* Each **{assignment type} {number}** defined in your grading configuration,
-  with the score a student attained for that specific assignment. For example,
-  column HW 03 shows the scores for the third homework assignment.
-
-* An **{assignment type} Avg** with each student's current average score for
-  that assignment type: for example, HW Avg.
-
-.. note:: The grade reports do not include information about individual 
- questions within the assignments, or include student answer distributions.
-
-.. _gradebook:
-
-********************************************************
-Review Grades for Enrolled Students (Small Courses)
-********************************************************
-
-For courses with enrollments of up to 200 students, you can review a gradebook
-on the Instructor Dashboard. 
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Student Admin**. For courses with fewer
-   than 200 students enrolled, this tab includes a **Student Gradebook**
-   section.
-
-#. Click **View Gradebook**. Grades are calculated and the gradebook displays.
-
-   .. image:: ../Images/Student_Gradebook.png
-     :alt: Course gradebook with rows for students and columns for assignment
-         types
-
-The gradebook includes the following features.
-
-* You can click the student username in each row to review that student's
-  **Course Progress** page. See :ref:`check_student_progress`.
-
-* There is a column for each **{assignment type} {number}** defined in your
-  grading configuration, with the scores your student attained for that
-  specific assignment.
-
-  The gradebook does not have a scroll bar, but it is draggable: to see columns
-  that are hidden at one side of the grade book, click the gradebook and then
-  drag left or right to reveal those columns.
-
-* For assignment types that include more than one assignment, an **{assignment
-  type} Avg** column displays each student's current average score for that
-  assignment type.
-
-* The **Total** column presents the total score a student has currently
-  attained in the course. This value is expressed as a whole number: a student
-  with a grade of 65 has earned 65% of the credit in the course, and a student
-  with a grade of 100 has earned 100%.
-
-* To filter the data that displays you can use the **Search students** option.
-  This option is case-sensitive and limits the rows shown in the gradebook to
-  usernames that match your entry.
-
-.. _check_student_progress:
-
-****************************************
-Check the Progress of a Single Student
-****************************************
-
-To check a single student's progress, you can locate the specific row on the
-grade report or review the student's **Progress** page. The **Progress** page
-includes a chart that plots the score the student has earned for every graded
-assignment and the total grade as of the current date. Below the chart, each
-assignment and the score attained are listed.
-
-To review a student's **Progress** page, you supply an email address or
-username. You can check the progress for students who are either enrolled in,
-or who have unenrolled from, the course.
-
-Students can view a similar chart and assignment list (of their own progress
-only) when they are logged in to the course. See :ref:`A Students View`.
-
-To view the **Progress** page for a student:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Student Admin**.
-
-#. In the Student-Specific Grade Inspection section, enter the student's email
-   address or username.
-
-#. Click **Student Progress Page**.
-
-   The **Progress** page for the student displays a chart with the grade for
-   each homework, lab, midterm, final, and any other assignment types in your
-   course, and the total grade earned for the course to date.
-
-   .. image:: ../Images/Student_Progress.png
-    :alt: Progress page chart for a student: includes a column graph with the 
-          score acheived for each assignment 
-
-   To learn more about a particular assignment, move the cursor onto the value
-   in the chart. A brief description displays.
-
-   .. image:: ../Images/Student_Progress_mouseover.png
-    :alt: Progress page with a tooltip for the X that was graphed for the last
-          homework assignment, which indicates that the lowest homework score
-          is dropped
-
-   Below the chart, subsections are listed on the left and the units that
-   contain assignments are listed on the right. The student's individual
-   problem scores display.
-
-   .. image:: ../Images/Student_Progress_list.png
-    :alt: Bottom portion of a Progress page for the same student with the 
-          score acheived for each problem in the first course subsection 
-
-=============================================
-Interpret the Student Progress Page
-=============================================
-
-The chart of a student's scores on the **Progress** page and the rows of data
-on the grade report present assignment scores in a similar order. However, the
-total, cumulative score earned for the course is placed in a different position
-on the **Progress** page.
-
-In this example grade report, the indicated student has a current grade of 0.43
-(43%).
-
-.. image:: ../Images/Grade_Report_example.png
- :alt: A course grade report with a single student's information indicated by 
-       a rectangle
-
-* On each of the first four homework assignments the student scored 1 (100%),
-  but currently has a 0 (0%) on each of the remaining three assignments.
-
-  Notice, however, that the student's current average score for homework
-  assignments is listed as 0.666666667 (67%): in this course, the homework
-  assignment with the lowest score is dropped, so this average is over six
-  assignments rather than all seven.
-
-* The student has a score of 0.75 (75%) on the midterm, and a score of 0 (0%)
-  on the final.
-
-On the student's **Progress** page, you see the same information graphically
-represented; however, the student's "total" of 43% is on the far right.
-
-.. image:: ../Images/Student_Progress.png
- :alt: Progress page for a student also included on the grade report: includes 
-       a column graph with the grade acheived for each assignment 
-
-The chart on the **Progress** page includes y-axis labels for the grade ranges
-defined for the course. In this example, Pass is set to 60%, so at the end of
-the course students with a grade of 0.60 or higher can receive certificates.
-
-.. note:: Student scores on the **Progress** page are a snapshot of the 
- current state of the problem score database. They can, at times, be out of
- sync with actual problem scores. For example, asynchronicities can occur if
- the weight of a live problem was changed during an assignment, and not all
- students have resubmitted their answers for that problem.
-
-.. _A Students View:
-
-=============================================
-A Student's View of Course Progress
-=============================================
-
-Students can check their progress by clicking **Progress** in the course
-navigation bar. The student's progress through the graded part of the course
-displays at the top of this page, above the subsection scores. Progress is
-visualized as a chart with entries for all the assignments, total percentage
-earned in the course so far, and percent needed for each grade cutoff. Here is
-an example of a student's progress through edX101.
- 
-.. image:: ../Images/StudentView_GradeCutoffs.png
- :alt: Image of a student's Course Progress page with the grade cutoffs legend
-       highlighted
- 
-The student can see from this page that edX101 was graded as a Pass/Fail course
-with a cutoff of 34% and that the grading rubric contained one assignment type,
-called Learning Sequence, consisting of 11 assignments total. Furthermore, this
-particular student has only submitted correct responses to two assignments, and
-that her current total percent grade in the course is 6%. By hovering over each
-progress bar, the student can get further statistics of how much each
-assignment was counted as.
- 
-Further down on the **Progress** page is a list of all the subsections in the
-course, with the scores recorded for the student for all problems in the
-course. Here is the **Progress** page for the student in the example above:
- 
-.. image:: ../Images/StudentView_Problems.png
-   :width: 800
-   :alt: Image of a student's Course Progress page with problems highlighted
- 
-Note that point scores from graded sections are called "Problem Scores",
-while point scores from ungraded sections are called "Practice Scores".
-
-.. _Adjust_grades:
-
-***********************************
-Adjust Grades
-***********************************
-
-If you modify a problem or its settings after students have attempted to answer
-it, student grades can be affected. For information about making changes to
-problems in Studio, see :ref:`Modifying a Released Problem`.
-
-To recalculate the grades of affected students when a correction or other
-change is unavoidable, you can make the following adjustments.
-
-* Rescore the submitted answer to reevaluate student work on the problem. You
-  can rescore a problem for a single student or for all of the students
-  enrolled in the course. See :ref:`rescore`.
-
-* Reset the number of times a student has attempted to answer the problem to
-  zero so that the student can try again. You can reset the number of attempts
-  for a single student or for all of the students enrolled in the course. See
-  :ref:`reset_attempts`.
-
-* Delete a student's database history, or "state", completely for the problem.
-  You can only delete student state for one student at a time. For example, you
-  realize that a problem needs to be rewritten after only a few of your
-  students have answered it. To resolve this situation, you rewrite the problem
-  and then delete student state for the affected students only so that they can
-  try again. See :ref:`delete_state`.
-
-To make adjustments to student grades, you need the unique location identifier
-of the modified problem. See :ref:`find_URL`.
-
-.. _find_URL:
-
-==================================================
-Find the Unique Location Identifier for a Problem
-==================================================
-
-When you create each of the problems for a course, edX assigns a unique
-location to it. To make grading adjustments for a problem, or to view data
-about it, you need to specify the problem location.
-
-To find the unique location identifier for a problem:
-
-#. View the live version of your course.
-
-#. Click **Courseware** and navigate to the unit that contains the problem.
-
-#. Display the problem and then click **Staff Debug Info**.
-
-   Information about the problem displays, including its **location**. 
-
-   .. image:: ../Images/Problem_URL.png
-    :alt: The Staff Debug view of a problem with the location identifier 
-          indicated
-
-4. To copy the location of the problem, select the entire location, right
-   click, and choose **Copy**.
-
-To close the Staff Debug viewer, click on the browser page outside of the
-viewer.
-
-.. _rescore:
-
-===================================================
-Rescore Student Submissions for a Problem
-===================================================
-
-Each problem that you define for your course includes a correct answer, and may
-also include a tolerance or acceptable alternatives. If you decide to make a
-change to these values, you can rescore any responses that were already
-submitted. For a specified problem, you can rescore the work submitted by a
-single student, or rescore the submissions made by every enrolled student.
-
-.. note:: You can only rescore problems that have a correct answer entered in 
- edX Studio. This procedure cannot be used to rescore problems that are scored
- by an external grader.
-
-Rescore a Submission for an Individual Student
------------------------------------------------
-
-To rescore a problem for a single student, you need that student's username or
-email address.
-
-#. View the live version of your course.
-
-#. Click **Courseware** and navigate to the component that contains the problem
-   you want to rescore.
-
-#. Display the problem, then click **Staff Debug Info**. The Staff Debug viewer
-   opens.
-
-#. In the **Username** field, enter the student's email address or username,
-   then click **Rescore Student Submission**. A message indicates a successful
-   adjustment.
-
-#. To close the Staff Debug viewer, click on the browser page outside of the
-   viewer.
-
-Rescore Submissions for All Students
-------------------------------------
-
-To specify the problem you want to rescore, you need its location identifier.
-See :ref:`find_URL`. To rescore a problem:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Student Admin**. 
-
-#. In the **Course-Specific Grade Adjustment** section of the page, enter the
-   unique problem location, and then click **Rescore ALL students' problem
-   submissions**.
-
-#. When you see a dialog box that notifies you that the rescore process is in
-   progress, click **OK**.
-
-   This process can take some time to complete for all enrolled students. The
-   process runs in the background, so you can navigate away from this page and
-   do other work while it runs.
-
-6. To view the results of the rescore process, click either **Show Background
-   Task History for Student** or **Show Background Task History for Problem**.
-
-   A table displays the status of the rescore process for each student or problem.
-
-.. note:: You can use a similar procedure to rescore the submission for a 
- problem by a single student. You work in the **Student-Specific Grade
- Adjustment** section of the page to enter both the student’s email address or
- username and the unique problem identifier, and then click **Rescore Student
- Submission**.
-
-.. _reset_attempts:
-
-===================================================
-Reset Student Attempts for a Problem
-===================================================
-
-When you create a problem, you can limit the number of times that a student can
-try to answer that problem correctly. If unexpected issues occur for a problem,
-you can reset the value for one particular student's attempts back to zero so
-that the student can begin work over again. If the unexpected behavior affects
-all of the students in your course, you can reset the number of attempts for
-all students to zero.
-
-Reset Attempts for an Individual Student
----------------------------------------------
-
-To reset the number of attempts for a single student, you need that student's
-username or email address.
-
-#. View the live version of your course.
-
-#. Click **Courseware** and navigate to the component that contains the problem
-   you want to reset.
-
-#. Display the problem, then click **Staff Debug Info**. The Staff Debug viewer
-   opens.
-
-#. In the **Username** field, enter the student's email address or username,
-   then click **Reset Student Attempts**. A message indicates a successful
-   adjustment.
-
-#. To close the Staff Debug viewer, click on the browser page outside of the
-   viewer.
-
-Reset Attempts for All Students
-------------------------------------
-
-To reset the number of attempts that all enrolled students have for a problem,
-you need the unique identifier of the problem. See :ref:`find_URL`. To reset
-attempts for all students:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Student Admin**. 
-
-#. To reset the number of attempts for all enrolled students, you work in the
-   **Course-Specific Grade Adjustment** section of the page. Enter the unique
-   problem location, then click **Reset ALL students' attempts**.
-
-#. A dialog opens to indicate that the reset process is in progress. Click
-   **OK**.
-
-   This process can take some time to complete. The process runs in the
-   background, so you can navigate away from this page and do other work while
-   it runs.
-
-5. To view the results of the reset process, click either **Show Background
-   Task History for Student** or **Show Background Task History for Problem**.
-
-   A table displays the status of the reset process for each student or
-   problem.
-
-.. note:: You can use a similar procedure to reset problem attempts for a 
- single student. You work in the **Student-Specific Grade Adjustment** section
- of the page to enter both the student’s email address or username and the
- unique problem identifier, and then click **Reset Student Attempts**.
-
-.. _delete_state:
-
-=============================================
-Delete Student State for a Problem
-=============================================
-
-To delete a student's entire history for a problem from the database, you need
-that student's username or email address. 
-
-.. important:: Student state is deleted permanently by this process. This 
- action cannot be undone.
-
-You can use either the Staff Debug viewer or the Instructor Dashboard to delete
-student state.
-
-To use the Staff Debug viewer:
-
-#. View the live version of your course.
-
-#. Click **Courseware** and navigate to the component that contains the
-   problem.
-
-#. Display the problem, then click **Staff Debug Info**. The Staff Debug viewer
-   opens.
-
-#. In the **Username** field, enter the student's email address or username,
-   then click **Delete Student State**. A message indicates a successful
-   adjustment.
-
-#. To close the Staff Debug viewer, click on the browser page outside of the
-   viewer.
-
-To use the Instructor Dashboard, you need the unique identifier of the problem.
-See :ref:`find_URL`.
-
-#. Click **Instructor**, then click **Student Admin**. 
-
-#. In the **Student-Specific Grade Adjustment** section of the page, enter both
-   the student’s email address or username and the unique problem identifier,
-   and then click **Delete Student State for Problem**.
diff --git a/docs/en_us/course_authors/source/running_course/course_staffing.rst b/docs/en_us/course_authors/source/running_course/course_staffing.rst
deleted file mode 100644
index 8eb60b5c61..0000000000
--- a/docs/en_us/course_authors/source/running_course/course_staffing.rst
+++ /dev/null
@@ -1,88 +0,0 @@
-.. _Course_Staffing:
-
-##########################
-Staffing
-##########################
-
-You can designate a team of people to help you run your course. Two roles are
-available to give your administrative team members access to different options
-for working with students, grades, and other members of the staff.
-
-* Course Staff
-
-* Instructors
-
-You can assign these privileged roles when you work in either the LMS or in
-Studio, and the users who have these roles can work on your course in both the
-LMS and Studio. For more information on setting up a team in Studio, see
-:ref:`Add Course Team Members`.
-
-.. note:: The LMS "Course Staff" role is the same as the Studio "Staff" role, and the LMS "Instructors" role is the same as the Studio "Admin" role.
-
-You can also designate teams of people to beta test your course and to
-moderate and manage its discussions by assigning other LMS roles. The beta
-testers and discussion administrators must be enrolled in your course, but
-they do not need to have the Course Staff or Instructors role or a Studio
-role. For more information, see :ref:`Beta_Testing` and
-:ref:`Assigning_discussion_roles`.
-
-****************************
-Administrative Team Roles
-****************************
-
-To provide access to features on the LMS Instructor Dashboard you assign the
-Course Staff role or the Instructors role.
-
-**Course Staff** can: 
-
-* View the course before the Course Start Date. 
-
-* Enroll and unenroll students.
-
-* Access student grades.
-
-* Reset student attempts to answer a question correctly.
-
-* See course HTML errors.
-
-* Send email messages to course participants.
-
-**Instructors** have access to all of the same options for running the course as the course staff. They can also:
-
-* Add and remove Course Staff.
-
-* Add and remove other Instructors.
-
-* Add and remove Beta Testers.
-
-* Add and remove Discussion Admins, Discussion Moderators, and Discussion
-  Community TAs.
-
-.. 12 Feb 14 Sarina: This all sounds right but there are other tasks (rescoring, etc) not mentioned. Probably worth nailing down what tasks can and cannot be done by a course staff.
-
-**********************
-Assign Staff Roles 
-**********************
-
-Before you can assign the Course Staff or Instructors role to a team member:
-
-* You need the email address or username of each team member. 
-
-* Each team member must register a user account for that email
-  address/username, activate the account, and enroll in your course.
-
-To assign a staff role:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Membership**.
-
-#. In the **Administration List Management** section, use the drop-down list to
-   select **Course Staff** or **Instructors**.
-
-#. Under the list of users who currently have that role, enter an email
-   address or username and click **Add** for the role type.
-
-To remove an assigned role, view the list of users and then click **Revoke
-access**.
-
diff --git a/docs/en_us/course_authors/source/running_course/course_student.rst b/docs/en_us/course_authors/source/running_course/course_student.rst
deleted file mode 100644
index b6a6437085..0000000000
--- a/docs/en_us/course_authors/source/running_course/course_student.rst
+++ /dev/null
@@ -1,242 +0,0 @@
-.. _Student Data:
-
-############################
-Student Data
-############################
-
-You can access data about the students who are enrolled in your course at any
-time after you create the course.
-
-For information about student data, see the following topics:
-
-* :ref:`PII`
-
-* :ref:`Access_student_data`
-
-* :ref:`Access_anonymized`
-  
-* :ref:`Track Student Activity`
-
-You can also view charts of certain student demographics for graded problems.
-See :ref:`Grades`.
-
-.. _PII:
-
-***************************************************************
-Guidance for Working with Personal Information
-***************************************************************
-
-The information that edX collects from site registrants includes personal
-information that can be used to identify, contact, and locate individuals. This
-information is available to course authors for the students who are enrolled in
-their courses.
-
-Course staff should follow the policies established by their organizations
-and comply with the legal requirements of their locales to prevent public
-distribution or misuse of this information.
-
-.. **Question**: I just made this statement up. What guidance can/should we give, for immediate publication and in the future? (sent to Tena and Jennifer Adams 31 Jan 14)
-
-.. _Access_student_data:
-
-****************************
-Access Student Data
-****************************
-
-You can download data about the students who are currently enrolled in your
-course in a CSV (comma-separated values) file. For courses that have fewer than
-200 students enrolled, you can also view data for enrolled students on the
-Instructor Dashboard.
-
-======================
-Student-Reported Data
-======================
-
-When students register with edX, they select a public username and supply
-information about themselves. Most of this information is optional, so not all
-of the students who are enrolled in your course provide it.
-
- .. image:: ../Images/Registration_page.png
-   :alt: Fields that collect student information during registration
-
-Students then register for as many individual courses as they choose, which
-enrolls them in each selected course.
-
-You can access this self-reported information for all of the students who are
-enrolled in your course:
-
-* username
-* name
-* email
-* year_of_birth
-* gender
-* level_of_education
-* mailing_address
-* goals
-
-The student data that is available to course staff always reflects the set of
-live, current enrollments. Students can register for your course throughout the
-defined enrollment period, and they can unregister from a course at any time,
-which unenrolls them. Students can also change their email addresses and full
-names at any time. As a result, you may want to download student data
-periodically to gain insights into how the student population changes over
-time.
-
-.. note:: In the future, edX may also request that students select a language 
- and location. This data is not collected at this time.
-
-.. _View and download student data:
-
-==========================================
-Download or View Student Data
-==========================================
-
-You can download a report of the self-reported student data to learn about
-population demographics at a specific point in time, compare demographics at
-different points in time, and plot trends in the population over time. For
-courses that include student cohorts, this report also includes the cohort
-group that is assigned to each student.
-
-When you choose to download student data, a process starts on the edX servers.
-The number of students enrolled in your course, and whether your course has the
-cohort feature enabled, affect how long this process takes. You can download a
-report of student profile information in a CSV (comma-separated values) file
-after the process is complete.
-
-For courses with fewer than 200 students enrolled, you also have the option to
-view student data on the Instructor Dashboard.
-
-.. note:: In addition to the data for enrolled students, data for the course 
- staff is included in the file or display.
-
-To download student data:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Data Download**.
-
-#. To download data about enrolled students in a CSV file, click **Download
-   profile information as a CSV**.
-
-  A status message indicates that report generation is in progress. This
-  process can take some time to complete, but you can navigate away from this
-  page and do other work while it runs.
-
-  To track the progress of the report process, reload the page in your browser
-  and scroll down to the **Pending Instructor Tasks** section.
-
-4. To open or save a student data report, click the
-   ``{course_id}_enrolled_profiles_{date}.csv`` file name at the bottom of the
-   page.
-
-  All student-supplied data is included in this file without truncation.
-
-To view student data:
-
-.. note:: This option is available only for courses with an enrollment of less 
- than 200.
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Data Download**.
-
-#. To display data about enrolled students, click **List enrolled students'
-   profile information**. 
-
-   A table of the student data displays, with one row for each enrolled
-   student. Longer values, such as student goals, are truncated.
-
- .. image:: ../Images/StudentData_Table.png
-  :alt: Table with columns for the collected data points and rows for each 
-        student on the Instructor Dashboard
-
-For courses that have the cohorts feature enabled, this report also includes a
-Cohort column with each student's assigned cohort group.
-
-.. note:: The columns for language and location are included in this report 
- for backward compatibility only. This data is no longer collected during
- student registration.
-
-==========================================
-View Demographic Distributions
-==========================================
-
-You can view a course-wide summary of certain demographic distributions for
-your currently enrolled students. The total count for each value reported for
-gender and educational attainment displays on the Instructor Dashboard. Because
-this data is optional, the totals for each of these self-reported values are
-likely to be lower than your course enrollment total. You can also view a chart
-with the ages of all currently enrolled students.
-
-To display demographic data for your students:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Analytics**. 
-
-   * The Year of Birth section displays a chart of enrolled students plotted by
-     year of birth.
-
-   * The Gender Distribution and Level of Education sections show tables with
-     counts of responses made by enrolled students.
-
-   .. image:: ../Images/Distribution_Education.png
-    :alt: Table with columns for different possible values for level of education completed and total count reported for each value
-
-   .. image:: ../Images/Distribution_Gender.png
-    :alt: Table with columns for different possible values for gender and total count reported for each value
-
-   "No Data" is the sum of the students for whom no value exists for the
-   demographic.
-
-  Data for individual students is not shown, and you cannot download data
-  directly from this page. See :ref:`View and download student data`.
-
-.. _Access_anonymized:
-
-********************************
-Access Anonymized Student IDs
-********************************
-
-Some of the tools that are available for use with the edX platform, including
-external graders and surveys, work with anonymized student data. If it becomes
-necessary for you to deanonymize previously anonymized data, you can download a
-CSV file to use for that purpose.
-
-To download a file of assigned user IDs and anonymized user IDs:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Data Download**.
-
-#. Click **Get Student Anonymized IDs CSV**.
-
-You are prompted to open or save the {course-id}-anon-id.csv file for your
-course. This file contains the user ID that is assigned to each student at
-registration and its corresponding edX-wide anonymized user ID and course
-specific anonymized user ID. Values are included for every student who ever
-enrolled for your course.
-
-To research and deanonymize student data, you can use this file together with
-the enrolled_profile.csv file of student data or the
-{course_id}_grade_report_{date}.csv file of grades.
-
-.. _Track Student Activity:
-
-******************************
-Track Student Activity
-******************************
-
-To monitor student activity during your course, you can review the number of
-students who, each week, interacted with your course. To be considered active,
-students must visit pages, play videos, add to discussions, submit answers to
-problems, or complete other course activities. The active student count is
-updated weekly.
-
-To display the number of active students:
-
-#. View the live version of your course.
-
-#. Click **Instructor**, then click **Analytics**. The count of active students
-   appears at the top of the page.
-
diff --git a/docs/en_us/course_authors/source/running_course/discussion_guidance_moderators.rst b/docs/en_us/course_authors/source/running_course/discussion_guidance_moderators.rst
deleted file mode 100644
index ec0c8d7212..0000000000
--- a/docs/en_us/course_authors/source/running_course/discussion_guidance_moderators.rst
+++ /dev/null
@@ -1,120 +0,0 @@
-.. _Guidance for Discussion Moderators:
-
-######################################
-Guidance for Discussion Moderators
-######################################
-
-Discussion forums are hugely important tools in running a successful MOOC; they allow for substantive community development, in addition to being excellent sources of feedback and ideas for future iterations of the course. 
-
-Moderators are the key to effectively managing these online communities. Moderators keep the discussions productive and relay important information (errata, student confusion or interest with particular topics, etc.) to the rest of the course staff. Discussions can be moderated by any of a number of members of the course team, but dedicating enough time to moderation is the best way to cultivate a successful discussion culture.
-
-Please feel free to use some or all of the information in this chapter to guide the contributions of your discussion moderators.
-
-**********************
-Responsibilities
-**********************
-
-* Answer basic questions posed by students, and direct students with questions to the right resources: syllabi, course documents, course updates, useful lecture segments, example problems, etc. 
-
-* Relay reports of errata, common misconceptions and questions, highly disruptive participants, bugs, and amusing or interesting posts to the most appropriate course staff. 
-
-* Enforce the Honor Code by editing or deleting problem answers, or requests for answers, promptly. 
-
-* Edit out offensive content from the discussion, and remind the originators of discussion etiquette and expectations. 
-
-* Communicate problems and successes to your fellow moderators. 
-
-* Identify students whose presence in the discussions has a strongly positive impact. These students can be promoted to community TA role and publicly acknowledged. 
-
-* Add helpful items to the FAQ or Course Info page. 
-
-***************************************
-Qualities of good discussion moderators
-***************************************
-
-* Good or great content knowledge: stellar students from previous years often make good moderators. 
-
-* Solid communication skills: the ability to organize positive, consistent, and effective communication with students, other moderators, and course staff. 
-
-* Time: keeping up-to-date with the discussions for a large MOOC requires at least 5 hours per week for reading posts, replying to or editing posts, and communicating with the other moderators and course staff. 
-
-* Enthusiasm: this is the best predictor of moderator excellence! 
-
-******************************************
-Best practices for discussion moderation
-******************************************
-
-* Always maintain a positive attitude. Keeping a positive attitude is crucial to encouraging participation in the discussion community. 
-
-* Encourage discussion between students. Actively thank students who answer the questions of others. 
-
-* Use the course’s FAQ and Course Info pages as resources. Provide links to these pages in your responses when appropriate. Suggest that information be added to these resources when necessary to respond to a common question or fix confusion. 
-
-* Always make it obvious that you have read the student’s question. When posting a response, make sure that you are on topic. Respond in the context of the thread.
-
-* Develop a discussion persona. Try to answer your questions in your own slightly unique way. 
-
-*******************************************
-Guidelines for specific types of posts
-*******************************************
-
-Certain types of posts require more attention from the moderators than others, or may need to be handled in a particular way.
-
-============================
-Time sensitive problems 
-============================
-
-* Try to be present on discussion threads when assignment due dates are approaching or new content is being released. The discussions tend to be extra busy at these times. 
-
-* Please alert the course staff about problems that need to be dealt with quickly, such as problems with a graded assignment. Setting up a course email address that is checked frequently is a good way to manage these alerts. 
-
-============================
-Content Questions 
-============================
-
-* Assist with content questions sensitively, but be careful not to post
-  spoilers. Do not ask students to post their solutions!
-
-* A good guiding question can be better than an answer.
-
-============================
-Redundant posts 
-============================
-
-* When possible, help discourage redundancy by responding to such posts with links to an earlier or higher quality thread that asks the same question. 
-
-* When responding to a post, search for similar posts and respond to the most pertinent thread. Redirect the other posts to the thread with your response and then close the redundant threads. 
-
-========================================================
-Off topic, inappropriate, or offensive posts 
-========================================================
-
-* Don’t simply delete them; instead, edit and explain why they were edited. Inappropriate posts include spoilers, solutions, and information on how to pirate educational materials. 
-
-* Check links that students post. If offensive sites and materials are found, they need to be edited quickly. 
-
-============================
-Bugs or errors 
-============================
-
-* Check if there is in fact an error. 
-
- - If not, suggest to the students that they check their work. 
-
- - If so, contact course staff, and notify the thread that the error has been reported.
-
-* Use language that does not assign blame or discourage users from the platform. 
-
- You might say: “Thanks for letting us know about that issue. We are working with edX to get it fixed as quickly as possible.” 
-
-============================
-Feature requests 
-============================
-
-* Keep an organized collection of feature requests cultivated by the course team. That list can subsequently be shared with an edX product manager, who will log those requests internally. 
-
-* Reply to the post to let the person know that their request was heard, without promising that the feature will be implemented. 
-
- You might say: “Thanks for your suggestion. I’ve logged it for review by edX staff, who will prioritize feature requests on the development roadmap.” 
-
-* Search the discussions for other similar requests, and respond to and close those as well.
diff --git a/docs/en_us/course_authors/source/running_course/discussions.rst b/docs/en_us/course_authors/source/running_course/discussions.rst
deleted file mode 100644
index 2eabb1a1a8..0000000000
--- a/docs/en_us/course_authors/source/running_course/discussions.rst
+++ /dev/null
@@ -1,618 +0,0 @@
-.. _Discussions:
-
-##################################
-Managing Course Discussions
-##################################
-
-Discussions, or discussion forums, foster interaction among your students and
-between students and course staff. You can set up different topics to guide
-these interactions when you create your course, and then run and moderate
-discussions throughout the course to encourage participation and develop course
-community.
-
-Discussions are also excellent sources of feedback and ideas for the future.
-
-For options you can use to run and moderate discussions, see the following
-sections:
-
-* :ref:`Overview_discussions`
-
-* :ref:`Organizing_discussions`
-
-* :ref:`Assigning_discussion_roles`
-
-* :ref:`Running_discussions`
-
-* :ref:`Moderating_discussions`
-
-* :ref:`Close_discussions`
-  
-For information about how enabling the cohort feature for a course affects
-options for moderating course discussions, see :ref:`Moderating Discussions for
-Cohorts`.
-
-.. _Overview_discussions:
-
-********************************
-Overview
-********************************
-
-Students and staff use course discussions to share ideas, exchange views,
-consider different viewpoints, and ask questions. In a discussion, there are
-three hierarchical levels of interaction.
-
-* A *post* is the first level of interaction. A post opens a new subject. Posts
-  are often posed as questions, either to start a conversation or to surface an
-  issue that requires some action. When you add a post, you categorize it as a **Question** or as a **Discussion**.  
-
-* A *response* is the second level of interaction. A response is a reply made
-  directly to a post to provide a solution or continue the conversation.
-
-* A *comment* is the third level of interaction. A comment is often a
-  clarification or side note made to a specific response, rather than to the
-  post as a whole.
- 
-The dialogue created by a post, its responses, and the comments on those
-responses is sometimes called a thread.
-
-All course staff members and enrolled students can add posts, responses, and
-comments, and view all of the posts, responses, and comments made by other
-course participants. Members of the course community, both staff and students,
-can be given permission to moderate or administer course discussions through a
-set of discussion administration roles. Discussion threads are saved as part of
-the course history.
-
-.. note:: 
-  The :ref:`Discussions for Students and Staff` chapter describes features that
-  are available to all discussion participants, and may be useful to students
-  who are new to online discussion forums. You can share the chapter with your
-  students by, for example, adding a "Never Used a Discussion Forum Before?"
-  post that includes the information you think will be most useful to them.
-
-.. _Organizing_discussions:
-
-*************************************************
-Set Up Discussion Topics for Your Course
-*************************************************
-
-Discussions in an edX course include both the specific topics that you add to
-course units as discussion components, and broader forums on course-wide areas
-of interest, such as "Feedback", "Troubleshooting", or "Technical Help". You
-add both types of topics in Studio.
-
-============================================
-Add Units With a Discussion Component
-============================================
-
-Typically, all units are added during the design and creation of your course in
-Studio. To add a discussion topic to a unit, you add a discussion component.
-Follow the instructions in :ref:`Working with Discussion Components`. The
-result is a content-specific discussion topic.
-
-This type of discussion topic is subject to the release date of the section
-that contains it. Students cannot contribute to these discussion topics until
-that date.
-
-.. note:: In courses that include the cohort feature, all of the 
- content-specific discussion topics are divided by cohort. Student posts to
- these topics can only be read, and responded to, by members of the same cohort
- group. See :ref:`Cohorts Overview`.
-
-.. _Create CourseWide Discussion Topics:
-
-=====================================
-Create Course-Wide Discussion Topics
-=====================================
-
-All courses include a page named **Discussion**. When you create a course, a
-discussion topic named "General" is available for you to include by default.
-You can add more course-wide discussion topics to guide how students share and
-find information during your course. Such course-wide topics might include
-Feedback, Troubleshooting, or Technical Help. Discussions in these topics can
-begin as soon as your course is available.
-
-To create a course-wide discussion topic:
-
-#. Open your course in Studio. 
-
-#. Select **Settings**, then **Advanced Settings**.
-
-#. Scroll down to the **Discussion Topic Mapping** policy key. By default, its
-   value is:
-
- .. image:: ../Images/Discussion_Add_initial.png
-  :alt: Policy value of {"General": {"id": "i4x-edX-Open-edx_demo_course"}}
-
-4. Copy the three lines provided for the General topic and paste
-   them above the closing brace character (``}``):
-
- .. image:: ../Images/Discussion_Add_paste.png
-  :alt: Policy value of {"General": {"id": "i4x-edX-Open-edx_demo_course"} 
-        "General": {"id": "i4x-edX-Open-edx_demo_course"}}
-
-5. Replace the second "General" with the quoted name of your new topic.
-
-#. Change the value for the second "id" to a unique identifier. For example,
-   append a reference to the name of the topic.
-
-#. Add a comma after the first closing brace (``},``).
-
- .. image:: ../Images/Discussion_Add_name.png
-  :alt: Policy value of {"General": {"id": "i4x-edX-Open-edx_demo_course"}, 
-        "Course Q&A": {"id": "i4x-edX-Open-edx_demo_course_faq"}}
-
-8. Click **Save Changes**. Studio resequences and reformats your entry. Scroll
-   back to the **Discussion Topic Mapping** field to verify that your entry was
-   saved as you expect. Entries that do not contain all of the required
-   punctuation characters revert to the previous value when you save, and no
-   warning is presented.
-
-When students click the **Discussion** page for your course, the drop-down
-Discussion list now includes the topic you added.
-
- .. image:: ../Images/NewCategory_Discussion.png
-  :alt: Image of a new topic named Course Q&A in the list of discussions
-
-.. note:: In courses that include the cohort feature, the course-wide 
- discussion topics that you add are unified. All of the posts can be read, and
- responded to, by every student, regardless of their assignement to a cohort
- group. You have the option to configure these topics to be divided by cohort.
- See :ref:`Identifying Private CourseWide Discussion Topics`.
-
-.. _Assigning_discussion_roles:
-
-*************************************************
-Assign Discussion Administration Roles 
-*************************************************
-
-You can designate a team of people to help you run course discussions.
-
-.. note:: 
-  The course team that you set up in Studio (or the course staff and
-  instructors you add on the Instructor Dashboard) are not automatically
-  granted discussion administration roles. Discussion administration roles must
-  be explicitly granted to members of the course team for them to moderate or
-  administer course discussions. The course author, team members with Admin
-  access (Studio), and Instructors (Instructor Dashboard) can grant discussion
-  administration roles
-
-Different options for working with discussions are available through
-these roles:
-
-* *Discussion moderators* can edit and delete messages at any level, review
-  messages flagged for misuse, close and reopen posts, pin posts, and endorse
-  responses. Posts made by moderators are marked as "By: Staff" in the list of
-  posts. Responses and comments made by moderators have a colored "Staff"
-  identifier. This role is often given to course team members who already have
-  the Course Staff role.
-
-.. removed this clause from 1st sentence per JAAkana and MHoeber: , and, if the
-.. course is cohorted, see posts from all cohorts
-
-* *Discussion community TAs* have the same options for working with discussions
-  as moderators. Posts made by community TAs are marked as "By: Community TA"
-  in the list of posts on the **Discussion** page. Responses and comments made
-  by community TAs have a colored "Community TA" identifier. This role is often
-  given to students.
-
-.. I put this comment in to make the formatting of this bulleted list consistent when output using the sphinx template
-
-* *Discussion admins* have the same options for working with discussions as
-  moderators, and their posts, responses, and comments have the same "Staff"
-  identifiers. This role can be reserved for assignment to course team members
-  who have the Instructor role only: the discussion admins can then both
-  moderate discussions and give other users these discussion management roles
-  whenever necessary.
-
-Before you can assign roles to your discussion team, you need their email
-addresses or usernames.
-
-* To get this information for a course team member, on the Instructor Dashboard
-  click **Membership** and then select **Course Staff** or **Instructor** from
-  the drop-down list.
-
-* To get this information for an enrolled student, on the Instructor Dashboard
-  click **Data Download**, then **Download profile information as a CSV**.
-
-====================================
-Assign Roles
-====================================
-
-To assign a discussion administration role, you must be the course author or an
-Instructor (that is, you are identified in Studio as a team member with Admin
-access).
-
-#. View the live version of the course.
-
-#. Click **Instructor**, then click **Membership**.
-
-#. In the Administration List Management section, use the drop-down list to
-   select Discussion Admins, Discussion Moderators, or Discussion Community
-   TAs.
-
-#. Under the list of users who currently have that role, enter an email address
-   or username and click **Add** for the role type.
-
-#. To remove an assigned role, view the list of users and then click **Revoke
-   access**.
-
-.. _Running_discussions:
-
-*********************
-Run a Discussion
-*********************
-
-On an ongoing basis, the members of your discussion team run the course
-discussion by making contributions, endorsing responses, marking answers as
-correct, and guiding student messages into pertinent threads. Techniques that
-you can use throughout your course to make discussions successful follow.
-
-==========================================
-Use Conventions in Discussion Subjects
-==========================================
-
-To identify certain types of messages and make them easier to find, you can
-define a set of standard tags to include in the subject of a post or in the
-body of a response or comment. Examples follow.
-
-* Use "[OFFICIAL]" at the start of announcements about changes to the course.
-
-* Provide information about corrected errors with a subject that begins
-  "[ERRATA]".
-
-* Direct students to use "[STAFF]" in the subject of each post that needs the
-  attention of a course staff member.
-
-Both your discussion team and your students can use tags like these to search
-the discussions more effectively.
-
-When a post is created its type must be selected: either "question" or
-"discussion". Members of the discussion team should be thoughtful when
-selecting the type for their posts, and encourage students to do the same. See
-:ref:`Find Question Posts and Discussion Posts`.
-
-.. future: changing the type of a post, maybe resequence or separate  conventions from post types
-
-========================
-Seed Discussion Topics
-========================
-
-To help students learn how to get the most out of course discussions, and find
-the best discussion topic to use for their questions and conversations, you can
-seed discussion topics by adding posts before your course starts. Some examples
-follow.
-
-* In the General topic (which is included in every course by default), add an
-  [INTRO] post to initiate a thread for student and staff introductions.
-
-* For each topic that you create, add the first post to it to describe
-  the way you intend it to be used. In addition to providing guidance, these
-  initial messages can also act as models for students to follow when they
-  create their own posts.
-
-* If you include discussion components along with problem components in a unit,
-  you can add a post that encourages students to use the topic to ask for help
-  with the problems, but reminds them not to post the answers.
-
-======================================
-Minimize Thread Proliferation
-======================================
-
-To encourage longer, threaded discussions rather than many similar, separate
-posts, the discussion team can use these techniques. However, be aware that
-long threads (with more than 200 responses and comments) can be difficult to
-read, and can therefore result in an unsatisfactory experience in the
-discussion.
-
-* Pin a post. Pinning a post makes it appear at the top of the list of posts on
-  the **Discussion** page. As a result, it is more likely that students will
-  see and respond to pinned posts. You can write your own post and then pin it,
-  or pin a post by any author. Select the "More" icon and then **Pin**.
-
-    .. image:: ../Images/Pin_Discussion.png
-     :alt: Image of the pin icon for discussion posts
-
-* Endorse a response. Endorsing a response indicates that it provides value to
-  the discussion. Click the "check mark" (or tick mark) icon for the response.
-
-    .. image:: ../Images/Endorse_Discussion.png
-     :alt: Image of the Endorse button for discussion posts
-
-* Mark a question as answered. You use the same procedure to mark a response as
-  the correct answer to a question as you do to endorse contributions to a
-  discussion: click the "check mark" (or tick mark) icon for correct answers.
-
-* Close a post. You can respond to a redundant post by (optionally) pasting in
-  a link to the post that you prefer students to contribute to, and prevent
-  further interaction by closing the post. Select the "More" icon and then
-  **Close** to close it.
-
-* Provide post/response/comment guidelines. You can post information from the
-  :ref:`overview<Overview_discussions>` in this chapter, or the :ref:`anatomy
-  of edX discussions<Anatomy of edX Course Discussions>` in the next chapter,
-  in a course-wide discussion topic (such as General) to provide guidance about
-  when to start a new thread by adding a post, responding to an existing post,
-  or commenting on a response.
-
-.. _Moderating_discussions:
-
-***********************
-Moderate Discussions
-***********************
-
-The members of a course discussion team monitor discussions and keep them
-productive. They can also collect information, such as areas of particular
-confusion or interest, and relay it to the course staff.
-
-Developing and sustaining a positive discussion culture requires that
-sufficient moderator time is dedicated to reviewing and responding to
-discussions. Keeping up-to-date with a large MOOC forum requires a commitment
-of 5 or more hours per week, and involves reading threads, replying to and
-editing posts, and communicating with the rest of the discussion team and
-course staff.
-
-For information on setting up moderators for your course, see
-:ref:`Assigning_discussion_roles`.
-
-========================================
-Provide Guidelines for Students
-========================================
-
-You can develop a set of best practices for discussion participation and make
-them available to students as a course handout file or on a defined page in
-your course. These guidelines can define your expectations and optionally
-introduce features of edX discussions.
-
-You can also share the :ref:`Discussions for Students and Staff` chapter with
-your students. It describes features that are available to all discussion
-participants, and may be useful to students who are new to online discussion
-forums.
-
-.. For a template that you can use to develop your own guidelines, see
-.. :ref:`Discussion Forum Guidelines`.
-
-========================================
-Develop a Positive Discussion Culture
-========================================
-
-Discussion monitors can cultivate qualities in their own discussion
-interactions to make their influence positive and their time productive.
-
-* Encourage quality contributions: thank students whose posts have a positive
-  impact and who answer questions.
-
-* Check links, images, and videos in addition to the text of each message. Edit
-  offensive or inappropriate posts quickly, and explain why.
-
-* Review posts with a large number of votes and recognize "star posters"
-  publicly and regularly.
-
-* Stay on topic yourself: before responding to a post, be sure to read it
-  completely.
-
-* Maintain a positive attitude. Acknowledge problems and errors without
-  assigning blame.
-
-* Provide timely responses. More time needs to be scheduled for answering
-  discussion questions when deadlines for homework, quizzes, and other
-  milestones approach.
-
-* Discourage redundancy: before responding to a post, search for similar posts.
-  Make your response to the most pertinent or active post and then copy its URL
-  and use it to respond to the redundant threads.
-
-* Publicize issues raised in the discussions: add questions and their answers
-  to an FAQ topic, or announce them on the Course Info page.
-
-For a template that you can use to develop guidelines for your course
-moderators, see :ref:`Guidance for Discussion Moderators`.
-
-.. _Find Question Posts and Discussion Posts:
-
-==========================================
-Find Questions and Discussions
-==========================================
-
-When students create posts, they specify the type of post to indicate whether
-they are asking for concrete information (a question) or starting an open-ended
-conversation (a discussion). 
-
-On the **Discussion** page, a question mark image identifies posts that ask
-questions, and a conversation bubble image identifies posts that start
-discussions. When an answer is provided and marked as correct for a question, a
-check or tick mark image replaces the question mark image. See :ref:`Answer
-Questions`.
-
-In addition to these visual cues, filters can help you find questions and
-discussions that need review. Above the list of posts on the **Discussion**
-page, the **Show all** filter is selected by default. You can also select:
-
-* **Unread**, to list only the discussions and questions that you have not yet
-  viewed.
-
-* **Unanswered**, to list only questions that do not yet have any responses
-  marked as answers.
-
-==================
-Edit Messages
-==================
-
-Discussion moderators, community TAs, and admins can edit the content of posts,
-responses, and comments. Messages that include spoilers or solutions, or that
-contain inappropriate or off-topic material, should be edited quickly to remove
-text, images, or links.
-
-#. Log in to the site and then select the course on your **Current Courses**
-   dashboard.
-
-#. Open the **Discussion** page and then open the post with the content that
-   requires editing. You can select a single topic from the drop-down list of
-   discussion topics, apply a filter, or search to locate the post.
-
-#. For the post or for the response or comment that you want to edit, click the
-   "More" icon and then **Edit**.
-
-#. Remove the problematic portion of the message, or replace it with standard
-   text such as "[REMOVED BY MODERATOR]".
-
-#. Communicate the reason for your change. For example, "Posting a solution
-   violates the honor code."
-
-==================
-Delete Messages 
-==================
-
-Discussion moderators, community TAs, and discussion admins can delete the
-content of posts, responses, and comments. Posts that include spam or abusive
-language may need to be deleted, rather than edited.
-
-#. Log in to the site and then select the course on your **Current Courses**
-   dashboard.
-
-#. Open the **Discussion** page and then open the post with the content that
-   requires deletion. You can select a single topic from the drop-down list of
-   discussion topics, apply a filter, or search to locate the post.
-
-#. For the post or for the response or comment that you want to delete, click
-   the "More" icon and then **Delete**.
-
-#. Click **OK** to confirm the deletion.
-
-.. how to communicate with the poster?
-
-.. important:: If a message is threatening or indicates serious harmful 
- intent, contact campus security at your institution. Report the incident
- before taking any other action.
-
-==================================
-Respond to Reports of Misuse
-==================================
-
-Students have the option to report contributions that they find inappropriate.
-Moderators, community TAs, and admins can check for messages that have been
-flagged in this way and edit or delete them as needed.
-
-#. View the live version of your course and click **Discussion** at the top of
-   the page.
-
-#. In the list of posts on the left side of the page, use the filter drop-down
-   list (set to **Show all** by default) to select **Flagged**.
-
-#. Review listed posts. A post is listed if it or any of its responses or
-   comments has been reported. The reported contribution includes a
-   **Reported** identifier.
-
-#. Edit or delete the post, response, or comment. Alternatively, remove the
-   flag: click the "More" icon and then **Unreport**.
-
-===============
-Block Users
-===============
-
-For a student who continues to misuse the course discussions, you can unenroll
-the student from the course. See :ref:`unenroll_student`. If the enrollment
-period for the course is over, the student cannot re-enroll.
-
-.. _Close_discussions:
-
-******************************
-Close Discussions
-******************************
-
-You can close the discussions for your course so that students cannot add
-messages. Course discussions can be closed temporarily, such as during an exam
-period, or permanently, such as when a course ends.
-
-When you close the discussions for a course, all of the discussion topics in
-course units and all of the course-wide topics are affected.
-
-* Existing discussion contributions remain available for review.
-  
-* Students cannot add posts, respond to posts, or comment on responses.
-  However, students can continue to vote on existing threads, follow threads,
-  or report messages for misuse.
-
-* Course Staff, Instructors, Discussion Admins, Discussion Moderators,
-  and Discussion Community TAs are not affected when you close the discussions
-  for a course. Users with these roles can continue to add to discussions. 
-
-.. note:: To assure that your students understand why they cannot add to 
-  discussions, you can add the dates that discussions are closed to the
-  **Course Info** page and post them to a General discussion.
-
-=====================================
-Start-End Date Format Specification
-=====================================
-
-To close course discussions, you supply a start date and time and an end date
-and time in Studio. You enter the values in this format:
-
-``["YYYY-MM-DDTHH:MM", "YYYY-MM-DDTHH:MM"]``
-
-where:
-
-* The dates and times that you enter are in the Universal Coordinated (UTC)
-  time zone, not in your local time zone.
-
-* You enter an actual letter **T** between the numeric date and time values. 
-
-* The first date and time indicate when you want course discussions to close.
-
-* The second date and time indicate when you want course discussions to reopen.
-
-* If you do not want the discussions to reopen, enter a date that is far in the
-  future.
-
-* Quotation marks enclose each date-time value.
-
-* A comma and a space separate the start date-time from the end date-time.
-
-* Square brackets enclose the start-end value pair.
-
-* You can supply more than one complete start and end value pair. A comma and a
-  space separate each pair.
-
-For example, to close course discussions temporarily for a final exam period in
-July, and then permanently on 9 August 2014, you enter:
-
-``["2014-07-22T08:00", "2014-07-25T18:00"], ["2014-08-09T00:00", "2099-08-09T00:00"]``
-
-You enter these values between an additional pair of square brackets which are
-supplied for you in Studio.
-
-============================================
-Define When Discussions Are Closed
-============================================
-
-To define when discussions are closed to new contributions and when they
-reopen:
-
-#. Open your course in Studio. 
-
-#. Select **Settings**, then **Advanced Settings**.
-
-#. Scroll down to the **Discussion Blackout Dates** policy key. 
-
-#. In the field for the value, place your cursor between the supplied square
-   brackets. Use the required date format specification to enter the start and
-   end dates for each time period during which you want discussions to be
-   closed.
-
-   When you enter the dates and times from the example above, the value field
-   looks like this:
-
-   .. image:: ../Images/Discussion_blackout_unformatted.png
-     :alt: Policy value of [["2014-07-22T08:00", "2014-07-25T18:00"],
-         ["2014-08-09T00:00", "2099-08-09T00:00"]]
-
-5. Click **Save Changes**.
-
-   Studio reformats your entry to add line feeds and indentation, like this:
-
-   .. image:: ../Images/Discussion_blackout_formatted.png
-     :alt: Same policy value but with a line feed after each bracket and comma,
-         and an indent before each date
-
-For examples of email messages that you can send to let students know when the
-course discussions are closed (or open), see :ref:`Example Messages to
-Students`.
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/running_course/discussions_students.rst b/docs/en_us/course_authors/source/running_course/discussions_students.rst
deleted file mode 100644
index 9357a13f90..0000000000
--- a/docs/en_us/course_authors/source/running_course/discussions_students.rst
+++ /dev/null
@@ -1,474 +0,0 @@
-.. _Discussions for Students and Staff:
-
-###############################################
-Participating in Course Discussions
-###############################################
-
-Course discussions give you the opportunity to start conversations with other
-students, ask questions of the course team, and participate in the course
-community. If you have not previously participated in an online discussion
-forum, see the introductory :ref:`"anatomy"<Anatomy of edX Course Discussions>`
-section.
-
-This chapter also describes features of edX discussions that can make your
-participation more effective. These include ways to:
-
-* :ref:`Find Posts`
-
-* :ref:`Add a Post`
-
-* :ref:`Keep Up with New Activity`
-
-* :ref:`React to Contributions`
-
-.. _Anatomy of edX Course Discussions:
-
-**********************************
-Anatomy of edX Course Discussions 
-**********************************
-
-====================================
-Posts, Responses, and Comments
-====================================
-
-::
-
-  Post: "Please introduce yourself."
-    - Reponse: "My name is Lee and I teach secondary school maths in Canberra,
-      Australia."
-    - Reponse: "Hello everyone, I am Sumei from Hong Kong, China."
-      - Comment: "Hi Sumei, I am taking this course in Hong Kong too. Maybe we
-        should make a study group!"
-      - Comment: "I'd like to join the Hong Kong study group too, I think it
-        will help me keep up with the homework."
-    - Response: "Hi from Johannesburg! I am taking the course to prepare for my
-      matric exams."
-
-This example shows the different ways that you can contribute to a discussion.
-The *post* initiates the conversation, *responses* are replies to the post, and
-*comments* expand on specific responses. Before you add a post, response, or
-comment, take a moment to consider which of these options best suits the
-contribution that you want to make. This helps keep course discussions
-organized and easy to follow.
-
-====================================
-Discussion Topics
-====================================
-
-Most edX courses include opportunities to discuss specific video lectures,
-reading assignments, homework problems, or other course content. Each of these
-content-specific discussion opportunities is called a *topic*. When these
-discussion topics are included in a course, they typically appear below the
-content they apply to.
-
-.. image:: /Images/Discussion_content_specific.png
- :alt: A discussion topic that appears below a video in the course, identified 
-       by a "Show Discussion" link
-
-Most courses also include one or more topics for course-wide discussions, such
-as "Frequently Asked Questions" and "Troubleshooting". You access these topics
-on the **Discussion** page of the course: click the **All Discussions**
-drop-down.
-
-.. image:: /Images/Discussion_course_wide.png
- :alt: Discussion topics are listed on the Discussion page when you click the 
-       drop-down list at the left side of the page
-
-When you visit the **Discussion** page, you can read and add to any of the
-discussion topics. 
-
-* Course-wide topics do not have other topics indented below them.
-
-* Content-specific topics are indented under an identifying category name. 
-
-Notice that you can access content-specific topics both on the **Discussion**
-page and also while you are navigating through course content on the
-**Courseware** page. However, you can only access the course-wide topics on the
-**Discussion** page.
-
-Before you add a post, look through the topics. When you add your post to the
-most appropriate topic, others with the same interest can find, read, and
-respond to it more easily.
-
-====================================
-Types of Discussion Posts
-====================================
-
-When you make a contribution to a course discussion topic, it can typically be
-categorized as either a question or a discussion.
-
-* A *question* post raises an issue so that the course staff and community can
-  provide answers.
-
-* A *discussion* post starts a conversation by sharing thoughts and
-  reflections, and inviting community participation.
-
-When you add a post to a discussion topic, you specify whether it is a question
-or a discussion. When you visit the **Discussion** page for your course, a
-question mark image identifies posts that ask questions and a conversation
-bubble image identifies posts that start discussions.
-
-.. image:: ../Images/Post_types_in_list.png
- :alt: The list of posts with images identifying questions and discussions 
-
-If you have any difficulty deciding which type of post you want to add, think
-about whether you want to get concrete information (a question) or start an
-open-ended conversation (a discussion).
-
-.. _Find Posts:
-
-******************************
-Find Posts
-******************************
-
-Finding out whether someone else has already asked the same question or
-initiated a conversation about the same subject that interests you, and then
-reading and contributing to that exchange instead of starting a new one, helps
-make the time that everyone spends with the course discussion more productive.
-You can search for something specific, or you can browse through the posts in a
-single discussion topic.
-
-=======================
-Search the Discussions
-=======================
-
-To search for text, click **Discussion** and enter a phrase, a word, or part of
-a word in the **Search all posts** field above the list of posts. When you
-press Enter, the search tries to find:
-
-* A match or close match to your text in any post, response, or comment. The
-  display updates to show a list of the posts that have a match at any level of
-  interaction.
-
-* A similar value in any post, response, or comment (if no exact matches are
-  found). A "No results found for {text}. Showing results for {similar}"
-  message displays above the posts that have similar text at any interaction
-  level.
-
-* Any usernames that are an exact match to your text. A "Show posts by
-  {username}" option displays above any posts that have an exact text match at
-  any interaction level. Click the username in the message to read that user's
-  posts, responses, and comments.
-
-==============================================
-Review Posts About a Single Topic
-==============================================
-
-To review posts about a particular part of the course or type of issue, click
-**Discussion** at the top of the page and then select a topic from the drop-
-down list. (**All Discussions** is selected by default.) Only posts about the
-topic you select appear in the list of posts.
-
-.. image:: ../Images/Discussion_filters.png
- :alt: The list of posts with callouts to identify the top filter to select 
-       one topic and the filter below it to select by state 
-
-=======================================
-Review Only Unread or Unanswered Posts
-=======================================
-
-To limit the posts shown on the **Discussion** page, you can select one of the filter options. Above the list of posts, the **Show all** filter
-is selected by default. 
-
-* To list only the discussions and questions that you have not yet viewed,
-  select **Unread**.
-
-* To list only question posts that do not yet have any responses marked as
-  answers, select **Unanswered**.
-
-.. _Add a Post:
-
-************************************
-Add a Post, Response, or Comment
-************************************
-
-================================
-Add a Post
-================================
-
-To make sure that other students and the course team can find and respond to
-your post, try to select the correct type for your post: either question or
-discussion.
-
-Add a Post to a Content-Specific Discussion Topic
-**************************************************
-
-#. Click **Courseware**.
-
-#. Open the part of the course that includes the discussion topic that you want
-   to add to.
-
-#. To read what others have already contributed to the conversation, click
-   **Show Discussion**.
-
-   You can scroll through the posts that have already been added: the title and
-   the first sentence or two of each post appear. To read an entire post, view
-   the responses to it, and see any comments, click **Expand discussion**.
-  
-4. To add a post, click **New Post**.
-
-.. image:: /Images/Discussion_content_specific_post.png
-  :alt: Adding a post about specific course content
-
-5. Select the type of post: click **Question** or **Discussion**.
-
-#. Enter a short, descriptive identifier for your post in the **Title** field.
-   The title is the part of your post that others see when they are browsing on
-   the **Discussion** page or scrolling through one of the content-specific
-   topics.
-
-#. Enter the complete text. Options for formatting the text and for adding
-   links or images are available: click the buttons above the text field.
-
-Add a Post to a Course-Wide Discussion Topic
-**************************************************
-
-You can also use this procedure to add a post to any of the content-specific
-discussion topics.
-
-#. Click the **Discussion** page.
-
-#. Click **New Post**.
-
-#. Select the type of post: click **Question** or **Discussion**.
-
-#. Select the most appropriate discussion topic for your post.
-
-  .. image:: /Images/Discussion_course_wide_post.png
-    :alt: Selecting the topic for a new post on the Discussion page 
-
-5. Supply a short, descriptive **Title**. The title is the part of your post
-   that others see when they are browsing on the **Discussion** page or
-   scrolling through one of the content-specific topics.
-
-#. Enter the complete text. Options for formatting the text and for adding
-   links or images are available: click the buttons above the text field.
-
-===========================
-Add a Response or Comment
-===========================
-
-To participate in an ongoing discussion, you reply to the initial post by
-adding a response, or expand on a particular response by adding a comment.
-
-The same options for formatting the text and for adding links or images are
-available for responses and comments as for posts.
-
-Add a Response or Comment to a Content-Specific Discussion Topic
-****************************************************************
-
-#. Click **Courseware**.
-
-#. Open the part of the course with the discussion topic where you want to make
-   your contribution.
-
-#. Click **Show Discussion**.
-
-#. Scroll to the post where you want to add your thoughts.
-
-#. Click **Expand discussion**.
-   
-  .. image:: /Images/Discussion_expand.png
-    :alt: The **Expand discussion** link under a post
-
-6. Add a response or comment.
-
- - To add a response to the post, click **Add A Response**. When your response
-   is complete, click **Submit**.
-
- - To add a comment to a response, click in the **Add a comment** field below
-   the response. When your comment is complete, click **Submit**.
-
-Add a Response or Comment to a Course-Wide Discussion Topic
-************************************************************
-
-You can also use this procedure to add a response or comment to any of the
-content-specific discussion topics.
-
-#. Click the **Discussion** page.
-
-#. Find the post that you want to contribute to. To help you decide where to
-   add your thoughts, review the current responses and their comments.
-
-#. Add a response or comment.
-
- - To add a response to the post, click **Add A Response**. When your response
-   is complete, click **Submit**.
-
-  .. image:: /Images/Discussion_add_response.png
-    :alt: The **Add A Response** button located between a post and its 
-          responses 
-
- - To add a comment to a response, click in the **Add a comment** field below
-   the response. When your comment is complete, click **Submit**.   
-
-.. _Keep Up with New Activity:
-
-****************************************
-Keep Up with New Activity
-****************************************
-
-==============================
-Read New or Updated Posts
-==============================
-
-The list of posts on the **Discussion** page provides visual cues to help you
-identify posts that are new, or that have responses or comments that you have
-not read yet, and to distinguish them from exchanges that you have already read
-completely.
-
-* Posts that you have not read yet have a blue callout image.
-
-* Posts that you have read, but with responses or comments that you have not
-  read yet, have a white callout image.
- 
-* Exchanges that you have read completely have a gray callout image and
-  background.
-
- .. image:: ../Images/Discussion_colorcoding.png
-  :alt: The list of posts with posts showing differently colored backgrounds 
-        and callout images
-
-The total number of contributions in the exchange (the post and its responses
-and comments) appears in each callout image. To see the number of contributions
-that you haven't read yet, move your cursor over the callout image.
-
-.. image:: ../Images/Discussion_mouseover.png
- :alt: A post with 4 contributions total and a popup that shows only two are 
-       unread 
-
-The color-coded callout images appear when you sort the list of posts **by
-recent activity** or **by most activity**. If you sort the list of posts by
-most votes instead, the number of votes that the post has received appears in
-place of the callouts. See :ref:`Vote for Posts or Responses`.
-
-==============================
-Receive Daily Digests
-==============================
-
-You have the option to receive an email message each day that summarizes
-discussion activity for the posts you are following. To receive this daily
-digest, click **Discussion** and then select the **Receive updates** checkbox.
-
-
-.. _React to Contributions:
-
-************************************
-Provide Feedback on Contributions
-************************************
-
-As you read the contributions that other students and staff make to discussion
-topics, you can provide feedback without writing a complete response or
-comment. You can:
-
-* :ref:`Vote for posts and responses<Vote for Posts or Responses>` to provide
-  positive feedback.
-
-* :ref:`Follow posts<Follow Posts>` so that you can check back in on
-  interesting conversations and questions easily.
-
-* :ref:`Answer questions, and mark your questions as answered<Answer
-  Questions>`.
-
-* :ref:`Report a contribution<Report Discussion Misuse>` that is inappropriate
-  to the course staff.
-
-To select a feedback option, you use the icons at the top right of each post,
-response, or comment. When you move your cursor over these icons a label
-appears.
-
-.. image:: ../Images/Discussion_options_mouseover.png
- :alt: The icons at top right of a post, shown before the cursor is 
-      placed over each one and with the Vote, Follow, and More labels
-
-When you click the "More" icon, a menu of the options that currently apply
-appears.
-
-.. image:: ../Images/Discussion_More_menu.png
- :alt: The More icon expanded to show a menu with one option and a menu with 
-       three options
-
-.. _Vote for Posts or Responses:
-
-==============================
-Vote for Posts or Responses
-==============================
-
-If you like a post or one of its responses, you can vote for it: view the
-post or response and click the "Vote" icon at top right.
-
-.. image:: ../Images/Discussion_vote.png
- :alt: A post with the Vote icon circled
-
-You can sort the list of posts so that the posts with the most votes appear at
-the top: click the drop-down list of sorting options and select **by most
-votes**.
-
-.. image:: ../Images/Discussion_sortvotes.png
- :alt: The list of posts with the "by most votes" sorting option and the 
-       number of votes for the post circled
-
-The number of votes that each post has received displays in the list of posts.
-(Votes for responses are not included in the number.)
-
-.. _Follow Posts:
-
-==============================
-Follow Posts
-==============================
-
-If you find a post particularly interesting and want to return to it in the
-future, you can follow it: view that post and click the "Follow" icon.
-
-.. image:: ../Images/Discussion_follow.png
- :alt: A post with the Follow icon circled
-
-Each post that you follow appears with a "Following" indicator in the list of
-posts.
-
-To list only the posts that you are following, regardless of the discussion
-topic they apply to, click the drop-down Discussion list and select
-**Posts I'm Following**.
-
-.. image:: ../Images/Discussion_filterfollowing.png
- :alt: The list of posts with the "Posts I'm Following" filter selected. Every
-       post in the list shows the following indicator.
-
-.. _Answer Questions:
-
-============================================================
-Answer Questions and Mark Questions as Answered 
-============================================================
-
-Anyone in a course can answer questions. Just add a response to the question
-post with your answer.
-
-The person who posted the question (and staff members) can mark responses as
-correct: click the "Mark as Answer" icon that appears at upper right of
-the response.
-
-.. image:: ../Images/Discussion_answer_question.png
- :alt: A question and a response, with the Mark as Answer icon circled
-
-After at least one response is marked as the answer, a check or tick mark image
-replaces the question mark image for the post in the list on the **Discussion**
-page.
-
-.. image:: ../Images/Discussion_answers_in_list.png
- :alt: The list of posts with images identifying unanswered and answered
-     questions and discussions
-
-.. _Report Discussion Misuse:
-
-==============================
-Report Discussion Misuse
-==============================
-
-You can flag any post, response, or comment for a discussion moderator to
-review: view the contribution, click the "More" icon, and then click
-**Report**.
-
-.. image:: ../Images/Discussion_reportmisuse.png
- :alt: A post and a response with the "Report" link circled
-
-.. Future: DOC-121 As a course author, I need a template of discussion guidelines to give to students
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/running_course/index.rst b/docs/en_us/course_authors/source/running_course/index.rst
deleted file mode 100644
index fa0805517a..0000000000
--- a/docs/en_us/course_authors/source/running_course/index.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-.. _Running Your Course Index:
-
-##########################
-Running Your Course
-##########################
-
-.. toctree::
-   :maxdepth: 2
-   
-   course_staffing
-   course_enrollment
-   discussions
-   discussions_students
-   discussion_guidance_moderators
-   course_data
-   course_student
-   course_answers
-   course_grades
-   checking_student_progress
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/students/index.rst b/docs/en_us/course_authors/source/students/index.rst
deleted file mode 100644
index 4925dce791..0000000000
--- a/docs/en_us/course_authors/source/students/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-.. _Information for Your Students Index:
-
-##############################
-Information for Your Students
-##############################
-
-.. toctree::
-   :maxdepth: 2
-   
-   login_guide
-   math_students
-   ora_students
diff --git a/docs/en_us/course_authors/source/students/login_guide.rst b/docs/en_us/course_authors/source/students/login_guide.rst
deleted file mode 100644
index 3273119c7b..0000000000
--- a/docs/en_us/course_authors/source/students/login_guide.rst
+++ /dev/null
@@ -1,76 +0,0 @@
-.. _Sample Student Login Guide:
-
-======================================
-Sample Student Login Guide 
-======================================
-
-Create a login guide for your individual course.
-
-**STUDENT LOGIN GUIDE FOR [COURSE NUMBER]**
-
-
-How to Set Up Your edX Account and Register for Your Class
-
-Welcome to [COURSE NAME] on edX!
-This guide will walk you through setting up your student account with edX, registering for [COURSE NAME], and accessing the course materials.
-
-**Step 1: Open the course registration page**
-
-*Example*
-
-.. code-block:: html
-
-
-    https://edge.edx.org/courses/[YOUR_CLASS_PATH]/about [REPLACE WITH URL TO YOUR REGISTRATION PAGE ON EDGE]
-
-    https://edge.edx.org/courses/edX/PHOTO101/Digital_SLR_Photography_101/about
-
-
-The above URL should bring you to the course registration page: [REPLACE WITH SCREENSHOT OF YOUR REGISTRATION PAGE]
-
-*Example*
-
-.. image:: ../Images/image302.png
- :width: 600 
- :alt: Image of a course registration page
-
-
-
-**Step 2: Request to register for the course**
-Click on the blue Register for [NUMBER OF YOUR CLASS] button:
-[REPLACE WITH PART OF YOUR SCREENSHOT ABOVE]
-
-.. image:: ../Images/image303.png
- :width: 600 
- :alt: Image of the registration button
-
-A pop-up user authentication window will appear. It will ask you to log in or sign up for edX. (If you already have an account with edX, use it to log in. You should now be registered for the course. Skip to Step 5. Otherwise, go on with Step 3.)
-
-.. image:: ../Images/Image305.png
- :width: 600 
- :alt: Image of the registration page
-
-
-**Step 3: Create your account with edX**
-
-Fill out the form in the pop-up window: (Some tips:  Use an email address you check regularly. Also, the username you choose will also be your screen name in the course. This means the only name we will know you by is the username (not a first and last name). Please include your last name as part of your username so we can tell who you are on the forums.)
-
-
-**Step 4: Activate your edX account**
-
-Check your email. This is where your course activation link has been sent. You must click on this to finalize your access to the course.
-
-Congratulations! You should now have an edX account and be registered for [ENTER YOUR COURSE NUMBER].
-
-Proceed with Step 5 to access the class materials.
-
-
-**Step 5: Log in to edX and go the course website**
-
-Log in to your account on edX at https://edge.edx.org/
-by using the username and password you just created.
-You will be taken to the main landing page of your edX edge account, which should now include a listing for [ENTER YOUR COURSE NUMBER]: [REPLACE WITH SCREENSHOT OF YOUR COURSE]
-
-You can now click **View Courseware** to enter the main course website. 
-
-If you are experiencing problems with registration or with accessing the class website, please contact [SUPPORT CONTACT NAME] at [CLASS SUPPORT EMAIL].
diff --git a/docs/en_us/course_authors/source/students/math_students.rst b/docs/en_us/course_authors/source/students/math_students.rst
deleted file mode 100644
index cfa7a6ad47..0000000000
--- a/docs/en_us/course_authors/source/students/math_students.rst
+++ /dev/null
@@ -1,144 +0,0 @@
-.. _Math Response Formatting for Students:
-
-#####################################
-Math Response Formatting for Students
-#####################################
-
-In numerical input problems, the student's response may be more complicated than a
-simple number. Expressions like ``sqrt(3)`` and even ``1+e^(sin(pi/2)+2*i)``
-are valid, and evaluate to 1.73 and -0.13 + 2.47i, respectively.
-
-The parser renders text that students enter into "beautiful math" that appears below the problem's response field:
-
-.. image:: /Images/Math1.png
- :alt: Image of a numerical input probem rendered by the parser
-.. image:: /Images/Math2.png
- :alt: Image of a numerical input probem rendered by the parser
-.. image:: /Images/Math3.png
- :alt: Image of a numerical input probem rendered by the parser
-.. image:: /Images/Math4.png
- :alt: Image of a numerical input probem rendered by the parser
-.. image:: /Images/Math5.png
- :alt: Image of a numerical input probem rendered by the parser
-
-Students can enter any of the following into the response field.
-
-*******
-Numbers
-*******
-
-- Integers: '2520'
-- Fractions: 2/3
-- Normal floats: '3.14'
-- With no integer part: '.98'
-- Scientific notation: '1.2e-2' (=0.012)
-- More scientific notation: '-4.4e+5' = '-4.4e5' (=-440,000)
-- SI suffixes: '2.25k' (=2,250). The full list:
-
-  ====== ========== ===============
-  Suffix Stands for Example
-  ====== ========== ===============
-  %      percent    0.01 = 1e-2
-  k      kilo       1000 = 1e3
-  M      mega       1e6
-  G      giga       1e9
-  T      tera       1e12
-  c      centi      0.01 = 1e-2
-  m      milli      0.001 = 1e-3
-  u      micro      1e-6
-  n      nano       1e-9
-  p      pico       1e-12
-  ====== ========== ===============
-
-The largest possible number handled currently is exactly the largest float
-possible (in the Python language). This number is 1.7977e+308. Any expression
-containing larger values will not evaluate correctly, so it's best to avoid
-this situation.
-
-*********************
-Default Constants
-*********************
-
-Simple and commonly used mathematical/scientific constants are included by
-default. These include:
-
-- ``i`` and ``j`` as ``sqrt(-1)``
-- ``e`` as Euler's number (2.718...)
-- ``g``: gravity (9.80 m/s^2)
-- ``pi``
-- ``k``: the Boltzmann constant (~1.38e-23 in Joules/Kelvin)
-- ``c``: the speed of light in m/s (2.998e8)
-- ``T``: the positive difference between 0K and 0°C (273.15)
-- ``q``: the fundamental charge (~1.602e-19 Coloumbs)
-
-**************
-Greek Letters
-**************
-
-The parser automatically converts the following Greek letter names into the corresponding Greek characters:
-
-.. list-table::
-   :widths: 20 20 20 20
-   :header-rows: 0
-
-   * - alpha
-     - beta
-     - gamma
-     - delta
-   * - epsilon
-     - varepsilon
-     - zeta
-     - eta
-   * - theta
-     - vartheta
-     - iota
-     - kappa
-   * - lambda
-     - mu
-     - nu
-     - xi
-   * - pi
-     - rho
-     - sigma
-     - tau
-   * - upsilon
-     - phi
-     - varphi
-     - chi
-   * - psi
-     - omega
-     - 
-     - 
-
-.. note:: ``epsilon`` is the lunate version, whereas ``varepsilon`` looks like a backward 3.
-
-
-****************************
-Operators and Functions
-****************************
-
-* Use standard arithmetic operation symbols.
-* Indicate multiplication explicitly by using an asterisk (*).
-* Use a caret (^) to raise to a power.
-* Use an underscore (_) to indicate a subscript.
-* Use parentheses to specify the order of operations.
-
-The normal operators apply (with normal order of operations):
-``+ - * / ^``. Also provided is a special "parallel resistors" operator given
-by ``||``. For example, an input of ``1 || 2`` would represent the resistance
-of a pair of parallel resistors (of resistance 1 and 2 ohms), evaluating to 2/3
-(ohms).
-
-Currently, factorials written in the form '3!' are invalid, but
-there is a workaround. Students can specify ``fact(3)`` or ``factorial(3)`` to
-access the factorial function.
-
-The default included functions are the following:
-
-- Trig functions: sin, cos, tan, sec, csc, cot
-- Their inverses: arcsin, arccos, arctan, arcsec, arccsc, arccot
-- Other common functions: sqrt, log10, log2, ln, exp, abs
-- Factorial: ``fact(3)`` or ``factorial(3)`` are valid. However, you must take
-  care to only input integers. For example, ``fact(1.5)`` would fail.
-- Hyperbolic trig functions and their inverses: sinh, cosh, tanh, sech, csch,
-  coth, arcsinh, arccosh, arctanh, arcsech, arccsch, arccoth
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/students/ora_students.rst b/docs/en_us/course_authors/source/students/ora_students.rst
deleted file mode 100644
index 4f31fa23ec..0000000000
--- a/docs/en_us/course_authors/source/students/ora_students.rst
+++ /dev/null
@@ -1,408 +0,0 @@
-.. _ORA for Students:
-
-Open Response Assessments for Students
-======================================
-
-.. _ORA Introduction:
-
-Introduction to Open Response Assessments
------------------------------------------
-
-.. note::
-
-    Modify this section according to your course. For example, you
-    can delete sentences such as "For more information, see :ref:`ORA Peer Assessment`"
-    and "For more information, see :ref:`ORA AI Assessment`" if your ORA problem doesn't
-    contain peer assessments or AI assessments and you want to delete these sections from
-    this document.
-
-
-Open response assessments allow you to submit a short written answer,
-an essay, or a file such as an image or computer code file.
-
-When you come to an open response assessment problem, you see the name of the
-problem, the assessment types, the text of the question, the field where you'll
-enter your response, and the **Save** and **Submit** buttons.
-
-.. image:: ../Images/ExampleORA.png
-
-If an open response assessment asks you to submit a file, you'll also see a button
-that you'll click to upload your file.
-
-.. image:: ../Images/ExampleORA_File.png
-
-The *assessment types* can include *self assessment*, *peer assessment*, and *artificial intelligence (AI) assessment*. The
-assessment types run in the order in which they appear in the problem.
-
-- In a self assessment, you assess your response according a rubric that the
-  instructor has created. For more information, see :ref:`ORA Self Assessment`.
-
-- In a peer assessment, you grade
-  responses that your peers have submitted while several of your peers
-  grade your response. For more information, see
-  :ref:`ORA Peer Assessment`.
-
-- In an AI assessment, a computer algorithm grades your response. For more information,
-  see :ref:`ORA AI Assessment`.
-
-An open response assessment problem doesn't have to use all assessment types. For example, one problem
-may use self assessment and AI assessment, while another problem may use self assessment
-and peer assessment, and another problem may use only peer assessment.
-
-You'll answer open response assessment problems in much the same way that you answer other
-problems. For more information about how to submit responses, see :ref:`ORA Submit a Response`.
-
-When you submit a response to an open response assessment, the next step
-depends on the type of assessment that the problem uses. For more information,
-see :ref:`ORA Self Assessment`, :ref:`ORA Peer Assessment`, and :ref:`ORA AI Assessment`.
-
-After you submit your response, your score will be available shortly - sometimes within a few
-minutes. For information about how to access your score after your response has been graded,
-see :ref:`ORA Access Scores Students`.
-
-If you want to experiment with open response assessments, you can try out the open
-assessment problems in the `EdX Demo <https://courses.edx.org/courses/edX/DemoX/Demo_Course/info>`_
-course. To get started, go
-to the `Self-Assessed Essay <https://courses.edx.org/courses/edX/DemoX/Demo_Course/courseware/graded_interactions/machine_grading/2>`_
-unit, and then enter a response in the **Response** field under the
-question. You can enter your own response, or you can use one of the sample
-responses in the `Sample Answers <https://courses.edx.org/courses/edX/DemoX/Demo_Course/courseware/graded_interactions/machine_grading/6/>`_
-unit.
-
-.. _ORA Submit a Response:
-
-Submit a Response
------------------
-
-Submitting a response is slightly different if you're submitting a written response
-or uploading a file.
-
-#. Enter the response that you want to submit.
-
-   - If you're submitting a written response, type your response in the
-     **Response** field.
-
-   - If you're uploading a file, click **Choose File** under the **Response**
-     field. In the dialog box that opens, select the file that you want to upload,
-     and then click **Open**.
-
-#. Click **Submit**, and then click **OK** in the dialog box to continue.
-
-   .. note:: If you want to save your response and work on it again later, click **Save**.
-             An "Answer saved, but not yet submitted" message appears directly under the **Save** and
-             **Submit** buttons.
-
-After you submit your response, the assessment types start running in the order in which they
-appear in the problem. For more information,
-see :ref:`ORA Self Assessment`, :ref:`ORA Peer Assessment`, or :ref:`ORA AI Assessment`.
-
-.. _ORA Self Assessment:
-
-Self Assessment
----------------
-
-.. note::
-
-    You can delete this section if your ORA problem doesn't use self assessments.
-
-
-In a self assessment, the rubric for the problem appears below your response immediately
-after you submit the response. You then assess your response based on the rubric.
-
-Perform a Self Assessment
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#. Submit a response to a self-assessed ORA problem.
-
-#. When the rubric appears, compare your response with the rubric, and select the
-   option that you think is appropriate for each category.
-
-   .. image:: ../Images/Rubric1.png
-
-#. Click **Submit assessment**.
-
-   Your response appears, and you can see the scores that you gave
-   yourself.
-
-.. _ORA Peer Assessment:
-
-Peer Assessment
----------------
-
-.. note::
-
-    You can delete this section if your ORA problem doesn't use peer assessments.
-
-
-In a peer assessment, several students in the course grade your response while you grade
-other students' responses. You have to grade a number of your peers' responses before
-you receive your score. (After you grade the minimum number of responses required to
-receive your score, you can grade as many additional responses as you want.)
-
-After you submit your response for grading, the following
-message appears under your response.
-
-    **Your response has been submitted. Please check back later for your grade.**
-
-.. warning:: In peer assessments, the **due date** is the date by which you must not only submit your own response, but finish grading the required number of your peers' responses.
-
-Peer Grading Interface
-~~~~~~~~~~~~~~~~~~~~~~
-
-The area where you'll grade responses is the *peer
-grading interface*. Each course that has peer assessments has at least
-one peer grading interface. There may be just one peer grading interface
-for the whole course, or each individual problem may have its own
-separate peer grading interface.
-
-.. image:: ../Images/PGI_FromOEC_2Problems.png
-
-
-Perform a Peer Assessment
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. warning:: In peer assessments, the **due date** is the date by which you must not only submit your own response, but finish grading the required number of your peers' responses.
-
-Performing a peer assessment has several steps. You can find detailed instructions for each step
-below.
-
-#. :ref:`Access Responses`, either in the body of the
-   course or from the **Open Ended Console** page.
-#. :ref:`Learn to Grade` (this process is called
-   *calibration*).
-#. :ref:`Grade Responses` from other students.
-
-.. _Access Responses:
-
-Step 1: Access responses from other students
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. note::
-
-    Modify the content in this section according to
-    your course. For example, if your students can only grade by using the **Open
-    Ended Console** page, change the introductory sentence below, and delete the
-    second and third bullets.
-
-
-**Note** *You can only grade a response if you've submitted a response to the
-question, an instructor has already graded at least 20 responses, and
-there are more essays from other students left to grade. If you haven't submitted
-a response or no responses are available for grading, you see a yellow message in the
-interface.*
-
-   .. image:: ../Images/PAStudent_NoSubmissions.png
-
-
-There are several ways to access other students' responses, depending on
-the way that the course is set up.
-
--  Through the **Open Ended Console** page. This option is always
-   available for every course. To access the **Open Ended Console** page,
-   click the **Open Ended Panel** tab at the top of any page in the course.
-   When you see the list of problems that have responses available to grade,
-   click the name of the problem that you want to open it.
-
-   .. image:: ../Images/PGI_FromOEC_2Problems.png
-
--  Through the courseware, in a specific unit. This option is only available if the
-   instructor has included a peer grading interface for the problem in the body of
-   the course. To access responses in the courseware, go to the unit that contains
-   the open response assessment problem. Scroll down past the response that you
-   submitted until you see the peer grading interface that appears below the problem.
-
-   .. image:: ../Images/PGI_InUnitComposite.png
-
--  Through the courseware, in a separate section. This option may not be available
-   for your course. If it is, you'll see the section for peer grading in the
-   course accordion on the left side of your screen. For example, MIT's 6.00x:
-   Introduction to Computer Science and Programming course has a separate section
-   that holds all the course peer grading interfaces. To access peer grading for
-   a problem, you click the problem name.
-
-   .. image:: ../Images/PGI_Multiple-600x.png
-
-
-.. _Learn to Grade:
-
-Step 2: Learn to grade
-^^^^^^^^^^^^^^^^^^^^^^
-
-Before you grade your peers' responses, you must learn to grade
-the same way that an instructor would. In this process, called
-*calibration*, you'll grade several responses that an instructor has already
-graded. If your grading is similar to the instructor's, you can begin grading
-other students' responses to the question.
-
-#. Click the name of the problem. When the **Learning to grade** page
-   opens, click **Start learning to grade**.
-
-#. When the problem opens, compare the student's response with the
-   rubric. Select the options that best apply to the response, and then
-   click **Submit**.
-
-#. Review the **How did I do?** message that you receive, and then click
-   **Continue**.
-
-   .. image:: ../Images/PG_Calibration_Correct.png
-
-   .. image:: ../Images/PG_Calibration_Incorrect.png
-
-   When you click **Continue**, the next student response appears for
-   you to grade, and you see a yellow **Calibration essay saved** message in
-   the top left corner of the page.
-
-#. Continue to grade responses. After you grade the required number of
-   responses correctly, you receive a **Ready to grade!** message. You
-   can then start to grade responses for other students.
-
-.. _Grade Responses:
-
-Step 3: Grade responses
-^^^^^^^^^^^^^^^^^^^^^^^
-
-When you grade a peer assessment response, you can not only select
-options in the rubric, but also provide additional feedback for the
-student who submitted the response.
-
-#. When the response opens, select the options in the rubric that you
-   feel best apply to the response, as you did in the calibration process.
-
-   If you have concerns about the response, you can select other
-   options to flag the response for instructor review. You don't have to fill
-   out the rubric before you select these options.
-
-   -  If you aren't sure how to grade the response, select the **I am unsure about
-      the scores I have given above** check box.
-   -  If the response is offensive, or if you suspect that it contains plagiarized
-      material, select the **This submission has explicit, offensive, or (I suspect)
-      plagiarized content** check box.
-
-#. Under **Written Feedback**, write a comment about the score that you
-   gave the response.
-
-#. Click **Submit**. You see a **Successfully saved your feedback**
-   message at the top of the screen, and the next response opens.
-
-#. Continue to grade until you've graded the required number of
-   responses (usually 3). When you've graded enough responses, you
-   receive the following message.
-
-   .. image:: ../Images/DoneGrading.png
-
-   When you see this message, you can access the score for your own
-   response. For more information, see :ref:`ORA Access Scores Students`.
-
-If you want to grade additional responses at any time, you can go back
-to the **Peer Grading** page and click the name of the problem that you want
-to continue grading.
-
-.. note:: When a response opens for you to grade, it leaves the current "grading pool"
-          that other instructors or students are grading from, which prevents other
-          instructors or students from
-          grading the response while you are working on it. If you do not submit a score
-          for this response within 30 minutes, the response returns to the grading pool
-          (so that it again becomes available for others to grade), even if you still have
-          the response open on your screen.
-
-          If the response returns to the grading pool (because the 30 minutes have passed),
-          but the response is still open on your screen, you can still submit feedback for
-          that response. If another instructor or student grades the response after it returns to the
-          grading pool but before you submit your feedback, the response receives two grades.
-
-          If you click your browser's **Back** button to return to the problem list before you
-          click **Submit** to submit your feedback for a response, the response stays outside
-          the grading pool until 30 minutes have passed. When the response returns to the
-          grading pool, you can grade it.
-
-.. _ORA AI Assessment:
-
-Artificial Intelligence (AI) Assessment
----------------------------------------
-
-.. note::
-
-    You can delete this section if your ORA problem doesn't use AI assessments.
-
-
-In an AI assessment, an instructor grades a sample set of student responses to the
-open response assessment problem. A machine learning algorithm then creates a model
-based on the instructor's scores and grades the remaining students' responses.
-
-After you submit your response to an AI assessment, the following message appears under your
-response.
-
-    **Your response has been submitted. Please check back later for your grade.**
-
-Depending on the time that it takes for the instructor to grade a sample set of
-responses, you may receive your grade within minutes, or you may have to wait
-a few days. You won't receive a notification when your score is ready, so keep
-checking back.
-
-For more information about accessing your scores, see :ref:`ORA Access Scores Students`.
-
-.. _ORA Access Scores Students:
-
-Access Scores and Feedback
---------------------------
-
-.. note::
-
-    Modify the text in this section to apply to your course.
-
-
-For *self assessments*, the score that you give yourself appears as soon as you submit
-the score.
-
-For *peer assessments* and *AI assessments*, you'll access your scores through the **Open Ended Console** page.
-
-#. In the EdX Demo course, click the **Open Ended Panel** tab at the top
-   of the page.
-
-#. On the **Open Ended Console** page, click **Problems You Have
-   Submitted**.
-
-#. On the **Open Ended Problems** page, check the **Status** column to
-   see whether your responses have been graded. The status for each problem is
-   either **Waiting to be Graded** or **Finished**.
-
-#. If **Finished** appears in the **Status** column for the problem you want,
-   click the name of the problem to see your score for that problem. When you
-   click the name of the problem, the problem opens in the courseware.
-
-For both AI and peer assessments, the score appears below your response
-in an abbreviated version of the rubric.
-
-.. image:: ../Images/AIScoredResponse.png
-
-For peer assessments, you can
-also see the written feedback that your response received from different
-graders.
-
-.. image:: ../Images/PeerScoredResponse.png
-
-If you want to see the full rubric for either an AI or peer assessment,
-click **Toggle Full Rubric**.
-
-.. note:: For a peer assessment, if you haven't yet graded enough
-          problems to see your score, you receive a message that lets you know how
-          many problems you still need to grade.
-
-.. image:: ../Images/FeedbackNotAvailable.png
-
-For more information about grading peer assessments, see :ref:`ORA Peer Assessment`.
-
-Resubmitting a Response
------------------------
-
-.. note::
-
-    You can delete this section if you don't allow students to submit multiple responses.
-
-Some open response assessments allow multiple attempts. For these
-problems, a **New Submission** button appears below your original
-response.
-
-If you want to answer the question again, click **New Submission** to
-clear your former response, and click **OK** in the dialog box that
-appears. You can then enter a new response for the problem.
diff --git a/docs/en_us/data/Makefile b/docs/en_us/data/Makefile
deleted file mode 100644
index 7a930576ed..0000000000
--- a/docs/en_us/data/Makefile
+++ /dev/null
@@ -1,164 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-PAPER         ?=
-BUILDDIR      ?= build
-
-# User-friendly check for sphinx-build
-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
-endif
-
-Q_FLAG        =
-
-ifeq ($(quiet), true)
-Q_FLAG = -Q
-endif
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = $(Q_FLAG) -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/edXDocs.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/edXDocs.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/edXDocs"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/edXDocs"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/docs/en_us/data/source/Images/AWS_Credentials.png b/docs/en_us/data/source/Images/AWS_Credentials.png
deleted file mode 100644
index 31fa3df1fd..0000000000
Binary files a/docs/en_us/data/source/Images/AWS_Credentials.png and /dev/null differ
diff --git a/docs/en_us/data/source/Images/Access_AmazonS3.png b/docs/en_us/data/source/Images/Access_AmazonS3.png
deleted file mode 100644
index d8e3379ea0..0000000000
Binary files a/docs/en_us/data/source/Images/Access_AmazonS3.png and /dev/null differ
diff --git a/docs/en_us/data/source/Images/Data_Czar_Initialization.png b/docs/en_us/data/source/Images/Data_Czar_Initialization.png
deleted file mode 100644
index c883529a7b..0000000000
Binary files a/docs/en_us/data/source/Images/Data_Czar_Initialization.png and /dev/null differ
diff --git a/docs/en_us/data/source/browsers.rst b/docs/en_us/data/source/browsers.rst
deleted file mode 100644
index c98836b8f7..0000000000
--- a/docs/en_us/data/source/browsers.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../shared/browsers.rst
\ No newline at end of file
diff --git a/docs/en_us/data/source/conf.py b/docs/en_us/data/source/conf.py
deleted file mode 100644
index 18e89e3ac8..0000000000
--- a/docs/en_us/data/source/conf.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-import sys, os
-
-# on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-
-
-
-
-
-
-
-sys.path.append(os.path.abspath('../../../'))
-sys.path.append(os.path.abspath('../../'))
-
-#from docs.shared.conf import *
-
-sys.path.insert(0, os.path.abspath('.'))
-
-master_doc = 'index'
-
-# Add any paths that contain templates here, relative to this directory.
-#templates_path.append('source/_templates')
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path.append('source/_static')
-
-project = u'edX Research Guide'
-copyright = u'2014, edX'
-
-# The short X.Y version.
-version = ''
-# The full version, including alpha/beta/rc tags.
-release = ''
-
-#Added to turn off smart quotes so users can copy JSON values without problems.
-html_use_smartypants = False
\ No newline at end of file
diff --git a/docs/en_us/data/source/index.rst b/docs/en_us/data/source/index.rst
deleted file mode 100644
index 03c3ccc964..0000000000
--- a/docs/en_us/data/source/index.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-######################
-edX Research Guide
-######################
-
-This document is intended for researchers and data czars at edX partner institutions who use the edX data exports to gain insight into their courses and students.
-
-.. toctree::
-   :maxdepth: 2
-
-   read_me.rst
-   preface.rst
-   browsers.rst
-   internal_data_formats/change_log.rst
-   internal_data_formats/data_czar.rst
-   internal_data_formats/credentials.rst
-   internal_data_formats/package.rst
-   internal_data_formats/sql_schema.rst
-   internal_data_formats/discussion_data.rst
-   internal_data_formats/wiki_data.rst
-   internal_data_formats/tracking_logs.rst
-   internal_data_formats/event_list.rst
-
diff --git a/docs/en_us/data/source/internal_data_formats/change_log.rst b/docs/en_us/data/source/internal_data_formats/change_log.rst
deleted file mode 100644
index f3d14616b8..0000000000
--- a/docs/en_us/data/source/internal_data_formats/change_log.rst
+++ /dev/null
@@ -1,169 +0,0 @@
-.. _Change Log:
-
-###########
-Change Log
-###########
-
-**********************
-October-December 2014
-**********************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 10/23/14
-     - Added examples of the format used to identify course components to the
-       :ref:`Student_Info` and :ref:`Tracking Logs` chapters.
-   * - 
-     - Updated the ``child_render`` event to reflect the name change for the
-       ``child_id`` member field. See :ref:`Tracking Logs`.
-   * - 10/20/14
-     - Updated the :ref:`Package` chapter to remove instructions for
-       downloading weekly event files.
-   * - 10/16/14
-     - Updated video events with new fields relating to mobile device use in
-       the :ref:`Tracking Logs` chapter.
-   * - 10/07/14
-     - Added new student and instructor events relating to cohort use to the
-       :ref:`Tracking Logs` chapter.
-   * - 
-     - Removed information about XML course formats. See the `edX Open
-       Learning XML Guide <http://edx-open-learning-
-       xml.readthedocs.org/en/latest/index.html>`_ for information about
-       building XML courses.
-
-
-**********************
-July-September 2014
-**********************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 09/30/14
-     - Added information about the data that is available to course teams to
-       the :ref:`Package` chapter.
-   * - 09/18/14
-     - Added descriptions of two columns added to the :ref:`auth_userprofile
-       table<auth_userprofile>`.
-   * - 09/08/14
-     - Added cautions to the :ref:`Getting_Credentials_Data_Czar` chapter.
-   * - 09/04/14
-     - Updated the :ref:`Discussion Forums Data` chapter to include the
-       ``thread_type`` field for CommentThreads and the ``endorsement`` field
-       for Comments.
-   * - 08/25/14
-     - Removed information on course grading. See `Establishing a Grading
-       Policy <http://edx.readthedocs.org/projects/edx-partner-course-
-       staff/en/latest/building_course/establish_grading_policy.html>`_ in
-       *Building and Running an edX Course*.
-   * -
-     - Removed information on the XML for drag and drop. See `Drag and Drop
-       Problems <http://edx.readthedocs.org/projects/edx-partner-course-
-       staff/en/latest/exercises_tools/drag_and_drop.html>`_ in *Building and
-       Running an edX Course*.
-   * - 08/12/14
-     - Added the :ref:`ora2` section to the :ref:`Tracking Logs` chapter.
-   * - 08/01/14
-     - Added the :ref:`Package` chapter with information to help data czars
-       locate and download data package files.
-   * - 07/10/14
-     - Added the :ref:`Getting_Credentials_Data_Czar` chapter with information
-       to help new data czars set up credentials for secure data transfers.
-
-
-**********************
-April-June 2014
-**********************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 06/27/14
-     - Made a correction to the ``edx.forum.searched`` event name in the
-       :ref:`Tracking Logs` chapter.
-   * - 
-     - Added the ``stop_video`` event to the :ref:`Tracking Logs` chapter.
-   * - 
-     - Updated the ``seek_video`` event in the :ref:`Tracking Logs` chapter.
-   * - 06/23/14
-     - Added a `Preface`_ with resources for course teams, developers,
-       researchers, and students.
-   * - 05/23/14
-     - Added descriptions of the enrollment upgrade events to the
-       :ref:`Tracking Logs` chapter.
-   * - 05/22/14
-     - Added descriptions of five video- and problem-related events to the
-       :ref:`Tracking Logs` chapter.
-   * - 
-     - Added the new ``edx.forum.searched`` event to the
-       :ref:`Tracking Logs` chapter.
-   * - 05/06/14
-     - Added enrollment event types to the :ref:`Tracking Logs` chapter. 
-   * - 05/05/14
-     - Removed information on the Poll module. See `Polls 
-       <http://edx.readthedocs.org/projects/edx-partner-course-
-       staff/en/latest/exercises_tools/poll.html>`_ in *Building and Running an
-       edX Course*.
-   * -
-     - Removed information on the Word Cloud tool. See `Word Cloud tool 
-       <http://edx.readthedocs.org/projects/edx-partner-course-
-       staff/en/latest/exercises_tools/word_cloud.html>`_ in *Building and
-       Running an edX Course*.
-   * - 
-     - Removed information on CustomResponse XML and Python Script. See `Write-
-       Your-Own-Grader Problem <http://edx.readthedocs.org/projects/edx-
-       partner-course-staff/en/latest/exercises_tools/custom_python.html>`_ in
-       the  *Building and Running an edX Course* guide.
-   * - 
-     - Removed information on Formula Equation Input. See `Create a Math
-       Expression Input Problem <http://edx.readthedocs.org/projects/edx-
-       partner-course-
-       staff/en/latest/exercises_tools/math_expression_input.html>`_ in the
-       *Building and Running an edX Course* guide.
-   * - 04/29/14
-     - Corrected misstatement on how :ref:`Discussion Forums Data` is sent in
-       data packages.
-   * - 04/25/14
-     - Added new event types to the :ref:`Tracking Logs` chapter for interactions with PDF files.
-       
-
-**********************
-January-March 2014
-**********************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 03/31/14
-     - Added new fields for the server ``problem_check`` event type to the :ref:`Tracking Logs` chapter.
-   * -
-     - Reformatted the :ref:`Tracking Logs` chapter to improve readability.
-   * - 03/28/14
-     - Added the :ref:`Data_Czar` chapter.
-   * - 03/24/14
-     - Added the ``user_api_usercoursetag`` table to the :ref:`Student_Info` chapter and the ``assigned_user_to_partition`` and ``child_render`` event types to the :ref:`Tracking Logs` chapter.
-   * - 03/19/14
-     - Provided alternative formatting for the examples in the :ref:`Discussion Forums Data` chapter.
-   * - 03/13/14
-     - Updated the :ref:`Student_Info` chapter.
-   * - 02/24/14
-     - Added descriptions of new fields to the :ref:`Wiki_Data` chapter.
-   * - 02/21/14
-     - Added descriptions of new fields to the :ref:`Discussion Forums Data` chapter.
-   * - 02/14/14
-     - Added the ``seek_video`` and ``speed_change_video`` event types to the :ref:`Tracking Logs` chapter.
-
-.. _Preface: http://edx.readthedocs.org/projects/devdata/en/latest/preface.html
\ No newline at end of file
diff --git a/docs/en_us/data/source/internal_data_formats/credentials.rst b/docs/en_us/data/source/internal_data_formats/credentials.rst
deleted file mode 100644
index cbeb87f2f5..0000000000
--- a/docs/en_us/data/source/internal_data_formats/credentials.rst
+++ /dev/null
@@ -1,220 +0,0 @@
-.. _Getting_Credentials_Data_Czar:
-
-####################################################
-Keys and Credentials for Data Transfers
-####################################################
-
-EdX transfers course data to the data czars at our partner institutions in
-regularly generated data packages. Data packages can only be accessed by a
-single contact at each university, referred to as the "data czar".
-
-The data czar who is selected at each institution sets up keys for securely
-transferring files from edX to the partner institution. Meanwhile, the
-Analytics team at edX sets up credentials so that the data czar can log in to
-the site where data packages are stored.
-
- .. image:: ../Images/Data_Czar_Initialization.png
-  :alt: Flowchart of data czar creating public and private keys and sending the
-      public key to edX, and of edX creating data storage credentials and
-      encrypting those credentials with the public key before sending them to
-      the data czar
-
-After these steps for setting up credentials are complete, the data czar can
-download data packages on an ongoing basis.
-
-****************************************************************
-Data Czar: Create Keys for Encryption and Decryption
-****************************************************************
-
-To assure the security of data packages, the edX Analytics team encrypts all
-files before making them available to a partner institution. As a result, when
-you receive a data package (or other files) from the edX Analytics team, you
-must decrypt the files that it contains before you use them.
-
-The cryptographic processes of encrypting and decrypting data files require
-that you create a pair of keys: the public key in the pair, which you send to
-the edX Analytics team, is used to encrypt data. You use your corresponding
-private key to decrypt any files that have been encrypted with that public key.
-
-To create the keys needed for this encryption and decryption process, you use
-GNU Privacy Guard (GnuPG or GPG). Essentially, you install a cryptographic
-application on your local computer and then supply your email address and a
-secret passphrase (a password).
-
-.. important:: The email address that you supply when you create your keys 
- must be your official email address at your edX partner institution. After you
- specify the passphrase, be sure to take any steps necessary to assure that you
- can use it in the future. To minimize security risks, GPG does not provide a
- mechanism for supplying you with a reminder hint.
-
-The result is the public key that you send to edX to use in encrypting data
-files for your institution, and the private key which you keep secret and use
-to decrypt the encrypted files that you receive. Creating these keys is a one-
-time process that you coordinate with your edX program manager. Instructions
-for creating the keys on Windows or Macintosh follow.
-
-For more information about GPG encryption and creating key pairs, see the
-`Gpg4win Compendium`_.
-
-.. _Gpg4win Compendium: http://www.gpg4win.org/doc/en/gpg4win-compendium.html
-
-=====================
-Create Keys: Windows
-=====================
-
-#. Go to the Gpg4win_ website and download the most recent version of Gpg4win.
-
-#. Install Gpg4win and then open the Kleopatra Gpg4win application. A wizard
-   presents a series of dialog boxes to collect information from you and 
-   generate your public key (called a certificate in Kleopatra).
-    
-   a. When you are prompted to specify the type of key pair you want, click
-      **Create personal OpenPGP key pair**.
-
-   b.  When you are prompted for your email address, be sure to enter *your
-       official university or institution email address*. EdX cannot use
-       public keys that are based on personal or other non-official email
-       addresses to encrypt data.
-
-   c. When you are prompted for a passphrase, enter a strong passphrase. Be
-      sure to select a passphrase that you can remember, or use a secure method
-      of retaining it for reuse in the future: you use this passphrase when you
-      decrypt your data packages.
-
-3. When Kleopatra presents the **Key Pair Successfully Created** dialog box,
-   click **Send Certificate by EMail** to send the public key (and only the
-   public key) to your edX program manager.
-
-#. Optionally, click **Make a Backup Copy of Your Key Pair** to store both of
-   the keys on a removable data storage device.
-
-.. important:: Do not reveal your passphrase, or share your private key, with anyone else.
-
-.. _Gpg4win: http://gpg4win.org/
-
-=======================
-Create Keys: Macintosh
-=======================
-
-#. Go to the `GPG Tools`_ website. Scroll down to the **GPG Suite** section of
-   the page and click **Download GPG Suite**.
-
-#. When the download is complete, click the .dmg file to begin the
-   installation.
-
-   When installation is complete, GPG Keychain Access opens a web page with
-   `First Steps`_ and a dialog box.
-
-#. Enter your name and email address. Be sure to enter *your official
-   university or institution email address*. EdX cannot use public keys that
-   are based on personal or other non-official email addresses to encrypt data.
-
-#. Click **Generate key**. A dialog box opens to prompt you for a passphrase.
-
-#. Enter a strong passphrase. Be sure to select a passphrase that you can
-   remember, or use a secure method of retaining it for reuse in the future:
-   you use this passphrase when you decrypt your data packages.
-
-#. To send only your public key to your edX program manager, click the key and
-   then click **Export**. A dialog box opens.
-
-  a. Specify a file name and location to save the file. 
-     
-  b. Make sure that **Format** is set to ASCII.
-  
-  c. Make sure that **Allow secret key export** is cleared.
-  
-  When you click **Save**, only the public key is saved in the resulting .asc
-  file. Do not share your private key with edX or any third party.
-
-7. Compose an e-mail message to your edX program manager. Attach the .asc
-   file that you saved in the previous step to the message, then send the
-   message.
-
-.. _GPG Tools: https://gpgtools.org/
-.. _First Steps: http://support.gpgtools.org/kb/how-to/first-steps-where-do-i-start-where-do-i-begin#setupkey
-
-****************************************************************
-EdX: Deliver Credentials for Accessing Data Storage
-****************************************************************
-
-The data packages that edX prepares for each partner organization are uploaded
-to the Amazon Web Service (AWS) Simple Storage Service (Amazon S3). The edX
-Analytics team creates an individual account to access this storage service for
-each data czar. The credentials for accessing this account are called an Access
-Key and a Secret Key.
-
-After the edX Analytics team creates these access credentials for you, they use
-the public encryption key that you sent your program manager to encrypt the
-credentials into a **credentials.csv.gpg** file. The edX Analytics team then
-sends the file to you as an email attachment.
-
-The **credentials.csv.gpg** file is likely to be the first file that you
-decrypt with your private GPG key. You use the same process to decrypt the data
-package files that you retrieve from Amazon S3. See `Decrypt an Encrypted
-File`_.
-
- .. image:: ../Images/Access_AmazonS3.png
-  :alt: Flowchart of edX collecting files for the data package and then
-      encrypting, compressing, and uploading them to Amazon S3 and of data czar
-      decrypting access credentials, accessing S3 bucket, and then downloading,
-      extracting, and decrypting data package files
-
-.. _Decrypt an Encrypted File:
-
-****************************************************************
-Decrypt an Encrypted File
-****************************************************************
-
-To work with an encrypted .gpg file, you use the same GNU Privacy Guard program
-that you used to create your public/private key pair. You use your private key
-to decrypt the Amazon S3 credentials file and the files in your data packages.
-
-#. Save the encrypted file in an accessible location. 
-
-#. On a Windows computer, open Windows Explorer. On a Macintosh, open Finder.
-
-#. Navigate to the file and right-click it. 
-   
-#. On a Windows computer, select **Decrypt and verify**, then click
-   **Decrypt/Verify**. On a Macintosh, select **Services**, then click
-   **OpenPGP: Decrypt File**.
-
-#. Enter your passphrase. The GNU Privacy Guard program decrypts the file.
-   
-For example, when you decrypt the credentials.csv.gpg file the result is a
-credentials.csv file. Open the decrypted credentials.csv file to see that it
-contains your email address, your Access Key, and your Secret Key.
-
- .. image:: ../Images/AWS_Credentials.png
-  :alt: A csv file, open in Notepad, with the Access Key value and the Secret Key value underlined
-
-.. _Access Amazon S3:
-
-****************************************************************
-Access Amazon S3
-****************************************************************
-
-To connect to Amazon S3, you must have your decrypted credentials. You may want
-to have a third-party tool that gives you a user interface for managing files
-and transferring them from Amazon S3 to your network. Some data czars use
-applications like CloudBerry Explorer for Amazon S3, Bucket Explorer, or S3
-Browser. Alternatively, you can use the `AWS Command Line Interface`_.
-
-#. Select and install a third-party tool or interface to manage your S3
-   account.
-
-#. Open your decrypted ``credentials.csv`` file. This file contains your AWS
-   Access Key and your AWS Secret Key.
-
-#. Open the third-party tool. In most tools, you set up information about the
-   S3 account and then supply your Access Key and your Secret Key to connect to
-   that account. For more information, refer to the documentation for the tool
-   that you selected.
-
-   Data package files are in the edX **course-data** and
-   **edx-course-data** buckets. For information about the files that you
-   download from Amazon S3, see :ref:`Package`.
-
-.. _AWS Command Line Interface: http://aws.amazon.com/cli/
-
diff --git a/docs/en_us/data/source/internal_data_formats/data_czar.rst b/docs/en_us/data/source/internal_data_formats/data_czar.rst
deleted file mode 100644
index 51343a9f6d..0000000000
--- a/docs/en_us/data/source/internal_data_formats/data_czar.rst
+++ /dev/null
@@ -1,143 +0,0 @@
-.. _Data_Czar:
-
-####################################################
-Data Czar/Data Team Selection and Responsibilities
-####################################################
-
-A data czar is the single representative at a partner institution who has the
-credentials to download and decrypt edX data packages. The data czar is
-responsible for transferring data securely to researchers and other interested
-parties after it is received. Due to the sensitivity of this data, the
-responsibility for these activities is restricted to one individual. At each
-partner institution, the data czar is the primary point of contact for
-information about edX data.
-
-* :ref:`Skills_Experience_Data_Czar`
-
-* :ref:`Resources_Information`
-
-At some institutions, only the data czar works on research projects that use
-the course data in edX data packages. At other institutions, the data czar
-works with a team of additional contributors, or is responsible only for
-making a secure transfer of the data to the research team. Typically, the data
-team includes members in the following roles (or a data czar with these skill
-sets):
-
-* Database administrators work with the SQL and NoSQL data files and write queries on the data.
-
-* Statisticians and data analysts mine the data.
-
-* Educational researchers pose questions and interpret the results of queries on the data.
-
-See :ref:`Skills_Experience_Contributors`.
-
-All of the individuals who are permitted to access the data should be trained
-in, and comply with, their institution's secure data handling protocols.
-
-.. _Skills_Experience_Data_Czar:
-
-**************************************
-Skills and Experience of Data Czars
-**************************************
-
-The individuals who are selected by a partner institution to be edX data czars
-typically have experience working with sensitive student data, are familiar
-with encryption/decryption and file transfer protocols, and can validate,
-copy, move, and store large files. The data czar is responsible for ensuring
-compliance with your institution's and country's regulations with respect to
-the sharing of this data.
-
-=====================
-General Skills
-=====================
-
-- Ability to set up and manage data access.
-
-- Knowledgeable of general data privacy and security best practices.
-
-- Experience with management of sensitive student data.
-
-=====================
-Technical Skills
-=====================
-
-- Familiarity with PGP and GPG encryption and decryption.
-
-- Ability to download large files from Amazon Web Service (AWS) Simple Storage
-  Service (S3).
-
-- Experience working with archive files in TAR, GZ, and ZIP formats.
-
-- Familiarity with SQL and noSQL (Mongo) databases.
-
-- Familiarity with CSV and JSON file formats. 
-
-- Experience copying, moving, and storing large files in bulk.
-
-- Ability to validate the data and files received and distributed.
-
-.. _Resources_Information:
-
-**************************************
-Resources and Information
-**************************************
-
-The edX Analytics team adds every data czar to a Google Group and mailing
-list called `course-data`_.
-
-.. _course-data: http://groups.google.com/a/edx.org/forum/#!forum/course-data
-
-EdX also hosts an `Open edX Analytics wiki`_ that is available to the
-public. The wiki provides links to the engineering roadmap, information about
-operational issues, and release notes describing past releases.
-
-.. _Open edX Analytics wiki: http://edx-wiki.atlassian.net/wiki/display/OA/Open+edX+Analytics+Home
-
-.. _Skills_Experience_Contributors:
-
-*************************************************
-Skills and Experience of Other Contributors
-*************************************************
-
-In addition to the data czar, each partner institution assembles a team of
-contributors to their research projects. This team can include database
-administrators, software engineers, data specialists, and educational
-researchers. The team can be large or small, but collectively its members need
-to be able to work with SQL and NoSQL databases, write queries, and convert
-the data from raw formats into standard research packages, such as CSV files,
-spreadsheets, or other desired formats.
-
-=====================
-General Skills
-=====================
-
-- Attention to detail.
-
-- Experience setting up and testing a data conversion pipeline.
-
-- Ability to identify interesting features in a complex and rich data set.
-
-- Familiarity with anonymization and obfuscation techniques.
-
-- Familiarity with data privacy and security best practices.
-
-- Experience managing sensitive student data.
-
-=====================
-Technical Skills
-=====================
-
-- Familiarity with CSV, MongoDB, JSON, Unicode, XML, HTML.
-
-- Ability to set up, query, and administer both SQL and noSQL databases. 
-
-- Experience with console/bash scripts.
-
-- Basic or advanced scripting (for example, using Python or Ruby) to convert,
-  join, and aggregate data from different data sources, handle JSON
-  serialization, and Unicode specificities.
-
-- Experience with data mining and data aggregation across a rich, varied data set.
-
-- Ability to write parsing scripts that properly handle JSON serialization and
-  Unicode.
diff --git a/docs/en_us/data/source/internal_data_formats/discussion_data.rst b/docs/en_us/data/source/internal_data_formats/discussion_data.rst
deleted file mode 100644
index a51641629c..0000000000
--- a/docs/en_us/data/source/internal_data_formats/discussion_data.rst
+++ /dev/null
@@ -1,404 +0,0 @@
-.. _Discussion Forums Data:
-
-######################
-Discussion Forums Data
-######################
-
-EdX discussion data is stored as collections of JSON documents in a MongoDB
-database. MongoDB is a document-oriented, NoSQL database system. Documentation
-can be found at the mongodb_ web site.
-
-..  _mongodb: http://docs.mongodb.org/manual/
-
-In the data package, discussion data is delivered in a .mongo file, identified
-by organization and course, in this format:
-edX-*organization*-*course*-*source*.mongo.
-
-The primary collection that holds all of the discussion posts written by users
-is "contents". Two different types of objects are stored, representing the
-three levels of interactions that users can have in a discussion.
-
-* A ``CommentThread`` represents the first level of interaction: a post that
-  opens a new thread, often a student question of some sort.
-
-* A ``Comment`` represents both the second and third levels of interaction: a
-  response made directly to the conversation started by a ``CommentThread`` is
-  a ``Comment``. Any further contributions made to a specific response are also
-  in ``Comment`` objects.
-
-A sample of the field/value pairs that are in the mongo file, and descriptions
-of the attributes that these two types of objects share and that are specific
-to each type, follow.
-
-In addition to these collections, events are also emitted to track specific
-user activities. See :ref:`forum_events`.
-
-*********
-Samples
-*********
-
-Two sample rows, or JSON documents, from a ``.mongo`` file of discussion data
-follow. 
-
-----------------------------------------
-CommentThread Document Example
-----------------------------------------
-
-The JSON documents that include discussion data are delivered in a compact,
-machine-readable format that can be difficult to read at a glance.
-
-.. code-block:: json
-
- { "_id" : { "$oid" : "50f1dd4ae05f6d2600000001" }, "_type" : "CommentThread",
- "anonymous" :false, "anonymous_to_peers" : false, "at_position_list" : [],
- "author_id" : "NNNNNNN","author_username" : "AAAAAAAAAA", "body" : "Welcome to
- the edX101 forum!\n\nThis forum willbe regularly monitored by edX. Please post
- your questions and comments here. When asking aquestion, don't forget to
- search the forum to check whether your question has already
- beenanswered.\n\n", "closed" : false, "comment_count" : 0, "commentable_id" :
- "i4x-edX-edX101-course-How_to_Create_an_edX_Course", "course_id" :
- "edX/edX101/How_to_Create_an_edX_Course","created_at" : { "$date" :
- 1358028106904 }, "last_activity_at" : { "$date" : 1358134464424 },"tags_array"
- : [], "thread_type": "discussion", "title" : "Welcome to the edX101 forum!",
- "updated_at" : { "$date" :1358134453862 }, "votes" : { "count" : 1, "down" :
- [], "down_count" : 0, "point" : 1, "up" :[ "48" ], "up_count" : 1 } }
-
-If you use a JSON formatter to "pretty print" this document, a version that is
-more readable is produced.
-
-.. code-block:: json
-
- {
-  "_id": {
-    "$oid": "50f1dd4ae05f6d2600000001"
-  },
-  "_type": "CommentThread",
-  "anonymous": false,
-  "anonymous_to_peers": false,
-  "at_position_list": [
- 
-  ],
-  "author_id": "NNNNNNN",
-  "author_username": "AAAAAAAAAA",
-  "body": "Welcome to the edX101 forum!\n\nThis forum will be regularly 
-  monitored by edX. Please post your questions and comments here. When 
-  asking a question, don't forget to search the forum to check whether 
-  your question has already been answered.\n\n",
-  "closed": false,
-  "comment_count": 0,
-  "commentable_id": "i4x-edX-edX101-course-How_to_Create_an_edX_Course",
-  "course_id": "edX\/edX101\/How_to_Create_an_edX_Course",
-  "created_at": {
-    "$date": 1358028106904
-  },
-  "last_activity_at": {
-    "$date": 1358134464424
-  },
-  "tags_array": [
- 
-  ],
-  "thread_type": "discussion",
-  "title": "Welcome to the edX101 forum!",
-  "updated_at": {
-    "$date": 1358134453862
-  },
-  "votes": {
-    "count": 1,
-    "down": [
- 
-    ],
-    "down_count": 0,
-    "point": 1,
-    "up": [
-      "48"
-    ],
-    "up_count": 1
-  }
- }
-
-----------------------------------------
-Comment Document Example
-----------------------------------------
-
-.. code-block:: json
-
- { "_id" : { "$oid" : "52e54fdd801eb74c33000070" }, "votes" : { "up" : [],
- "down" : [], "up_count" : 0, "down_count" : 0, "count" : 0, "point" : 0 },
- "visible" : true, "abuse_flaggers" : [], "historical_abuse_flaggers" : [],
- "parent_ids" : [], "at_position_list" : [], "body" : "I'm hoping this
- Demonstration course will help me figure out how to take the course I
- registered for. I am just auditing the course, but I want to benefit from it
- as much as possible, as I am extremely interested in it.\n", "course_id" :
- "edX/DemoX/Demo_Course", "_type" : "Comment", "endorsed" : true, "endorsement"
- : { "user_id" : "9", "time" : ISODate("2014-08-29T15:11:49.442Z") },
- "anonymous" : false, "anonymous_to_peers" : false, "author_id" : "NNNNNNN",
- "comment_thread_id" : { "$oid" : "52e4e880c0df1fa59600004d" },
- "author_username" : "AAAAAAAAAA", "sk" : "52e54fdd801eb74c33000070",
- updated_at" : { "$date" : 1390759901966 }, "created_at" : { "$date" :
- 1390759901966 } }
-
-When pretty printed, this comment looks like this:
-
-.. code-block:: json
-
- {
-  "_id": {
-    "$oid": "52e54fdd801eb74c33000070"
-  },
-  "votes": {
-    "up": [
- 
-    ],
-    "down": [
- 
-    ],
-    "up_count": 0,
-    "down_count": 0,
-    "count": 0,
-    "point": 0
-  },
-  "visible": true,
-  "abuse_flaggers": [
- 
-  ],
-  "historical_abuse_flaggers": [
- 
-  ],
-  "parent_ids": [
- 
-  ],
-  "at_position_list": [
- 
-  ],
-  "body": "I'm hoping this Demonstration course will help me figure out how 
-  to take the course I registered for. I am just auditing the course, but I 
-  want to benefit from it as much as possible, as I am extremely interested 
-  in it.\n",
-  "course_id": "edX\/DemoX\/Demo_Course",
-  "_type": "Comment",
-  "endorsed": true,
-  "endorsement": {
-    "user_id": "9",
-    "time": {
-      "$date": 1390759911966
-    }
-  }
-  "anonymous": false,
-  "anonymous_to_peers": false,
-  "author_id": "NNNNNNN",
-  "comment_thread_id": {
-    "$oid": "52e4e880c0df1fa59600004d"
-  },
-  "author_username": "AAAAAAAAAA",
-  "sk": "52e54fdd801eb74c33000070",
-  "updated_at": {
-    "$date": 1390759901966
-  },
-  "created_at": {
-    "$date": 1390759901966
-  }
- }
-
-*****************
-Shared Fields
-*****************
-
-Descriptions of the fields that are present for both ``CommentThread`` and ``Comment`` objects follow.
-
---------------------
-_id
---------------------
-  The 12-byte MongoDB unique ID for this collection. Like all MongoDB IDs, the IDs are monotonically increasing and the first four bytes are a timestamp. 
-
---------------------
-_type
---------------------
-  ``CommentThread`` or ``Comment`` depending on the type of object.
-
---------------------
-anonymous
---------------------
-  If true, this ``CommentThread`` or ``Comment`` displays in the user interface as written by "anonymous", even to those who have course staff or discussion administration roles in the course. 
-
---------------------
-anonymous_to_peers
---------------------
-  If true, this ``CommentThread`` or ``Comment`` displays in the user interface as written by "anonymous" to students, but  course staff and discussion administrators see the author's username. 
-
---------------------
-at_position_list
---------------------
-  No longer used. Child comments (replies) are sorted by their ``created_at`` timestamp only. 
-
---------------------
-author_id
---------------------
-  Identifies the user who wrote this. Corresponds to the user IDs stored in the MySQL database as ``auth_user.id``.
-
---------------------
-author_username
---------------------
-  The username of the person who wrote the discussion post or comment. 
-
---------------------
-body
---------------------
-  Text of the comment in Markdown. UTF-8 encoded.
-
---------------------
-course_id
---------------------
-  The full course_id of the course that this comment was made in, including org and run. This value can be seen in the URL when browsing the courseware section. Example: ``BerkeleyX/Stat2.1x/2013_Spring``.
-
-.. 12 Feb 14, Sarina: not yet relevant but with splitmongo changes course_id conventions will change. may be worth discussing with Don et al as to when we expect these changes to land and how to document.  
-
---------------------
-created_at
---------------------
-  Timestamp in UTC. Example: ``ISODate("2013-02-21T03:03:04.587Z")``.
-
-.. FOR-482 open to research inconsistency between the data actually in the data package and this example and description.
-
---------------------
-updated_at
---------------------
-  Timestamp in UTC. Example: ``ISODate("2013-02-21T03:03:04.587Z")``.
-
-.. FOR-482 open to research inconsistency between the data actually in the data package and this example and description.
-
---------------------
-votes
---------------------
-  Both ``CommentThread`` and ``Comment`` objects support voting. In the user interface, students can vote for posts (``CommentThread`` objects) and for responses, but not for the third-level comments made on responses. All ``Comment`` objects still have this attribute, even though there is no way to actually vote on the comment-level items in the UI. This attribute is a dictionary that has the following items inside:
-
-  * up = list of User IDs that up-voted this comment or thread.
-  * down = list of User IDs that down-voted this comment or thread (no longer used).
-  * up_count = total upvotes received.
-  * down_count = No longer used. Total downvotes received.
-  * count = total votes cast.
-  * point = net vote, now always equal to up_count.
-
-A user only has one vote per ``Comment`` or ``CommentThread``. Though it's still written to the database, the UI no longer displays an option to downvote anything.
-
-**************************
-CommentThread Fields
-**************************
-
-The following fields are specific to ``CommentThread`` objects. Each thread in the discussion forums is represented by one ``CommentThread``.
-
---------------------
-closed
---------------------
-  If true, this thread was closed by a discussion forum moderator or admin.
-
---------------------
-comment_count
---------------------
-  The number of comment replies in this thread. This includes all responses and replies, but does not include the original post that started the thread. So for this exchange::
-
-    CommentThread: "What's a good breakfast?"
-      * Comment: "Just eat cereal!"
-      * Comment: "Try a Loco Moco, it's amazing!"
-        * Comment: "A Loco Moco? Only if you want a heart attack!"
-        * Comment: "But it's worth it! Just get a spam musubi on the side."
-
-  The ``comment_count`` for this ``CommentThread`` is **4**.
-
---------------------
-commentable_id
---------------------
-  A course team can attach a discussion to any piece of content in the course, or to top level categories like "General" and "Troubleshooting". When the discussion is a top level category it is specified in the course's policy file, and the ``commentable_id`` is formatted like this: "i4x-edX-edX101-course-How_to_Create_an_edX_Course". When the discussion is a specific component in the course, the ``commentable_id`` identifies that component: "d9f970a42067413cbb633f81cfb12604".
-
---------------------
-last_activity_at
---------------------
-  Timestamp in UTC indicating the last time there was activity in the thread (new posts, edits, etc). Closing the thread does not affect the value in this field. 
-
-.. FOR-482 open to research inconsistency between the data actually in the data package and this example and description.
-
---------------------
-tags_array
---------------------
-  No longer used. 
-
-  **History**: Intended to be a list of user definable tags.
-
---------------------
-title
---------------------
-  Title of the thread. UTF-8 string.
-
---------------------
-thread_type
---------------------
-  Identifies the type of post as a "question" or "discussion".  
-
-  **History**: Added 4 Sep 2014.
-
-********************
-Comment Fields
-********************
-
-The following fields are specific to ``Comment`` objects. A ``Comment`` is either a response to a ``CommentThread`` (such as an answer to the question), or a reply to another ``Comment`` (a comment about somebody's answer). 
-
-**History**: It used to be the case that ``Comment`` replies could nest much more deeply, but this was later capped at just these three levels (post, response, comment) much in the way that StackOverflow does.
-
---------------------
-visible
---------------------
-  Not used.
-
---------------------
-abuse_flaggers
---------------------
-  Records the user id of each user who selects the **Report Misuse** flag for a ``Comment`` in the user interface. Stores an array of user ids if more than one user flags the ``Comment``. This is empty if no users flag the ``Comment``. 
-
-----------------------------------------
-historical_abuse_flaggers
-----------------------------------------
-  If a discussion moderator removes the **Report Misuse** flag from a ``Comment``, all user IDs are removed from the ``abuse_flaggers`` field and then written to this field.
-
---------------------
-endorsed
---------------------
-  Boolean value. True if a forum moderator has marked this response to a
-  ``CommentThread`` with a ``thread_type`` of "discussion" as a valuable
-  contribution, or if a forum moderator or the originator of a
-  ``CommentThread`` with a ``thread_type`` of "question" has marked this
-  response as the correct answer.
-
-  The ``endorsed`` field is present for comments that are made as replies to
-  responses, but in these cases the value is always false: the user interface
-  does not offer a way to endorse comments.
-
---------------------
-endorsement
---------------------
-  Contains ``time`` and ``user_id`` fields for the date and time that this
-  response to a post was endorsed and the numeric user ID (from
-  ``auth_user.id``) of the person who endorsed it.
-
-  **History**: Added 4 Sep 2014.
-
---------------------
-comment_thread_id
---------------------
-  Identifies the ``CommentThread`` that the ``Comment`` is a part of. 
-
---------------------
-parent_id
---------------------
-  Applies only to comments made to a response. In the example given for ``comment_count`` above, "A Loco Moco? Only if you want a heart attack!" is a comment that was made to the response, "Try a Loco Moco, it's amazing!"
-
-  The ``parent_id`` is the ``_id`` of the response-level ``Comment`` that this ``Comment`` is a reply to. Note that this field is only present in a ``Comment`` that is a reply to another ``Comment``; it does not appear in a ``Comment`` that is a reply to a ``CommentThread``.
-
---------------------
-parent_ids
---------------------
-  The ``parent_ids`` field appears in all ``Comment`` objects, and contains the ``_id`` of all ancestor comments. Since the UI now prevents comments from being nested more than one layer deep, it will only ever have at most one element in it. If a ``Comment`` has no parent, it is an empty list.
-
---------------------
-sk
---------------------
-  A randomly generated number that drives a sorted index to improve online performance.
-
diff --git a/docs/en_us/data/source/internal_data_formats/event_list.rst b/docs/en_us/data/source/internal_data_formats/event_list.rst
deleted file mode 100644
index 7b742b72ed..0000000000
--- a/docs/en_us/data/source/internal_data_formats/event_list.rst
+++ /dev/null
@@ -1,220 +0,0 @@
-.. _event_list:
-
-#######################
-Alphabetical Event List
-#######################
-
-.. list-table::
-   :widths: 40 40
-   :header-rows: 1
-
-   * - Event
-     - Description
-   * - ``add-forum-admin``
-     - :ref:`Instructor_Event_Types`
-   * - ``add-forum-community-TA``
-     - :ref:`Instructor_Event_Types`
-   * - ``add-forum-mod``
-     - :ref:`Instructor_Event_Types`
-   * - ``add-instructor``
-     - :ref:`Instructor_Event_Types`
-   * - ``add-or-remove-user-group``
-     - :ref:`Instructor_Event_Types`
-   * - ``assigned_user_to_partition``
-     - :ref:`AB_Event_Types`
-   * - ``book``
-     - :ref:`pdf`
-   * - ``calculate_grades_csv``
-     - :ref:`Instructor_Event_Types`
-   * - ``child_render``
-     - :ref:`AB_Event_Types`
-   * - ``delete-student-module-state``
-     - :ref:`Instructor_Event_Types`
-   * - ``dump-answer-dist-csv``
-     - :ref:`Instructor_Event_Types`
-   * - ``dump-graded-assignments-config``
-     - :ref:`Instructor_Event_Types`
-   * - ``dump-grades``
-     - :ref:`Instructor_Event_Types`
-   * - ``dump-grades-csv``
-     - :ref:`Instructor_Event_Types`
-   * - ``dump-grades-csv-raw``
-     - :ref:`Instructor_Event_Types`
-   * - ``dump-grades-raw``
-     - :ref:`Instructor_Event_Types`
-   * - ``edx.cohort.created``
-     - :ref:`student_cohort_events`
-   * - ``edx.cohort.creation_requested``
-     - :ref:`instructor_cohort_events`
-   * - ``edx.cohort.user_add_requested``
-     - :ref:`instructor_cohort_events`
-   * - ``edx.cohort.user_added``
-     - :ref:`student_cohort_events`
-   * - ``edx.cohort.user_removed``
-     - :ref:`student_cohort_events`
-   * - ``edx.course.enrollment.activated``
-     - :ref:`enrollment` and :ref:`instructor_enrollment`
-   * - ``edx.course.enrollment.deactivated`` 
-     - :ref:`enrollment` and :ref:`instructor_enrollment`
-   * - ``edx.forum.searched``
-     - :ref:`forum_events`
-   * - ``get_anon_ids``
-     - :ref:`Instructor_Event_Types`
-   * - ``get_student_progress_page``
-     - :ref:`Instructor_Event_Types`
-   * - ``get_student_progress_url``
-     - :ref:`Instructor_Event_Types`
-   * - ``get_students_features``
-     - :ref:`Instructor_Event_Types`
-   * - ``get_students_features/csv``
-     - :ref:`Instructor_Event_Types`
-   * - ``instructor``
-     - :ref:`Instructor_Event_Types`
-   * - ``list-beta-testers``
-     - :ref:`Instructor_Event_Types`
-   * - ``list-forum-admins``
-     - :ref:`Instructor_Event_Types`
-   * - ``list-forum-community-TAs``
-     - :ref:`Instructor_Event_Types`
-   * - ``list-forum-mods``
-     - :ref:`Instructor_Event_Types`
-   * - ``list-instructors``
-     - :ref:`Instructor_Event_Types`
-   * - ``list-staff``
-     - :ref:`Instructor_Event_Types`
-   * - ``list-students``
-     - :ref:`Instructor_Event_Types`
-   * - ``modify_access``
-     - :ref:`Instructor_Event_Types`
-   * - ``oe_feedback_response_selected``
-     - :ref:`ora`
-   * - ``oe_hide_question``
-     - :ref:`ora`
-   * - ``oe_show_full_feedback``
-     - :ref:`ora`
-   * - ``oe_show_question``
-     - :ref:`ora`
-   * - ``oe_show_respond_to_feedback``
-     - :ref:`ora`
-   * - ``openassessmentblock.get_peer_submission``
-     - :ref:`ora2`
-   * - ``openassessmentblock.peer_assess``
-     - :ref:`ora2`
-   * - ``openassessmentblock.self_assess``
-     - :ref:`ora2`
-   * - ``openassessmentblock.submit_feedback_on_assessments``
-     - :ref:`ora2`
-   * - ``openassessment.create_submission``
-     - :ref:`ora2`
-   * - ``openassessment.save_submission``
-     - :ref:`ora2`
-   * - ``openassessment.student_training_assess_example``
-     - :ref:`ora2`
-   * - ``openassessment.upload_file``
-     - :ref:`ora2`
-   * - ``page_close``
-     - :ref:`navigational`
-   * - ``pause_video``
-     - :ref:`video`
-   * - ``peer_grading_hide_question``
-     - :ref:`ora`
-   * - ``peer_grading_show_question``
-     - :ref:`ora`
-   * - ``play_video``
-     - :ref:`video`
-   * - ``problem_check``
-     - :ref:`problem`
-   * - ``problem_check_fail``
-     - :ref:`problem`
-   * - ``problem_rescore``
-     - :ref:`problem`
-   * - ``problem_rescore_fail``
-     - :ref:`problem`
-   * - ``problem_save``
-     - :ref:`problem`
-   * - ``problem_show``
-     - :ref:`problem`
-   * - ``psychometrics-histogram-generation``
-     - :ref:`Instructor_Event_Types`
-   * - ``remove-forum-admin``
-     - :ref:`Instructor_Event_Types`
-   * - ``remove-forum-community-TA``
-     - :ref:`Instructor_Event_Types`
-   * - ``remove-forum-mod``
-     - :ref:`Instructor_Event_Types`
-   * - ``remove-instructor``
-     - :ref:`Instructor_Event_Types`
-   * - ``rescore-all-submissions``
-     - :ref:`Instructor_Event_Types`
-   * - ``rescore-student-submission``
-     - :ref:`Instructor_Event_Types`
-   * - ``reset-all-attempts``
-     - :ref:`Instructor_Event_Types`
-   * - ``reset_problem``
-     - :ref:`problem`
-   * - ``reset_problem_fail``
-     - :ref:`problem`
-   * - ``reset-student-attempts``
-     - :ref:`Instructor_Event_Types`
-   * - ``rubric_select``
-     - :ref:`ora`
-   * - ``save_problem_fail``
-     - :ref:`problem`
-   * - ``save_problem_success``
-     - :ref:`problem`
-   * - ``seek_video``
-     - :ref:`video`
-   * - ``seq_goto``
-     - :ref:`navigational`
-   * - ``seq_next``
-     - :ref:`navigational`
-   * - ``seq_prev``
-     - :ref:`navigational`
-   * - ``show_answer``
-     - :ref:`problem`
-   * - ``speed_change_video``
-     - :ref:`video`
-   * - ``staff_grading_hide_question``
-     - :ref:`ora`
-   * - ``staff_grading_show_question``
-     - :ref:`ora`
-   * - ``textbook.pdf.chapter.navigated``
-     - :ref:`pdf`
-   * - ``textbook.pdf.display.scaled``
-     - :ref:`pdf`
-   * - ``textbook.pdf.display.scrolled``
-     - :ref:`pdf`
-   * - ``textbook.pdf.outline.toggled``
-     - :ref:`pdf`
-   * - ``textbook.pdf.page.navigated``
-     - :ref:`pdf`
-   * - ``textbook.pdf.search.casesensitivity.toggled``
-     - :ref:`pdf`
-   * - ``textbook.pdf.search.executed``
-     - :ref:`pdf`
-   * - ``textbook.pdf.search.highlight.toggled``
-     - :ref:`pdf`
-   * - ``textbook.pdf.search.navigatednext``
-     - :ref:`pdf`
-   * - ``textbook.pdf.thumbnails.navigated``
-     - :ref:`pdf`
-   * - ``textbook.pdf.thumbnails.toggled``
-     - :ref:`pdf`
-   * - ``textbook.pdf.zoom.buttons.changed``
-     - :ref:`pdf`
-   * - ``textbook.pdf.zoom.menu.changed``
-     - :ref:`pdf`
-   * - ``update_forum_role_membership``
-     - :ref:`Instructor_Event_Types`
-       
-
-..   * - ``hide_transcript``
-..     - :ref:`video`
-..   * - ``load_video``
-..     - :ref:`video`      
-..   * - ``problem_graded``
-..     - :ref:`problem`
-..   * - ``problem_reset``
-..     - :ref:`problem`
-..   * - ``show_transcript``
-..     - :ref:`video`
diff --git a/docs/en_us/data/source/internal_data_formats/package.rst b/docs/en_us/data/source/internal_data_formats/package.rst
deleted file mode 100644
index b0cc0ce005..0000000000
--- a/docs/en_us/data/source/internal_data_formats/package.rst
+++ /dev/null
@@ -1,238 +0,0 @@
-.. _Package:
-
-######################################
-Data Delivered in Data Packages
-######################################
-
-For partners who are running courses on edx.org and edge.edx.org, edX regularly
-makes research data available for download from the Amazon S3 storage service.
-The *data package* that data czars download from Amazon S3 consists of a set of
-compressed and encrypted files that contain event logs and database snapshots
-for all of their organizations' edx.org and edge.edx.org courses.
-
-* :ref:`Data Package Files`
-
-* :ref:`Amazon S3 Buckets and Directories`
-
-* :ref:`Download Data Packages from Amazon S3`
-
-* :ref:`Data Package Contents`
-
-Course-specific data is also available to the members of individual course
-teams. Users who are assigned the Instructor or Course Staff role can view and
-download data from the Instructor Dashboard in their live courses and from edX
-Insights. The data available to course teams from these applications is a
-subset of the data available in the data packages. For more information, see
-`Building and Running an edX Course`_ and `Using edX Insights`_.
-
-.. _Data Package Files:
-
-**********************
-Data Package Files
-**********************
-
-A data package consists of different files that contain event data and database
-data. 
-
-.. note:: In all file names, the date is in {YYYY}-{MM}-{DD} format.
-
-You download these files from different Amazon S3 "buckets". See :ref:`Amazon
-S3 Buckets and Directories`.
-
-============
-Event Data
-============
-
-The ``{org}-{site}-events-{date}.log.gz.gpg`` file contains a daily log of
-course events. A separate file is available for courses running on edge.edx.org
-(with "edge" for {site} in the file name) and on edx.org (with "edx" for
-{site}).
-
-For a partner organization named UniversityX, these daily files are identified
-by the organization name, the edX site name, and the date. For example,
-``universityx-edge-2014-07-25.log.gz.gpg``.
-
-For information about the contents of these files, see :ref:`Data Package
-Contents`.
-
-==================
-Database Data
-==================
-
-The ``{org}-{date}.zip`` file contains views on database tables. This file
-includes data as of the time of the export, for all of an organization's
-courses on both the edx.org and edge.edx.org. sites. A new file is available
-every week, representing the database at that point in time.
-
-For a partner organization named UniversityX, each weekly file is identified by
-the organization name and its extraction date: for example,
-``universityx-2013-10-27.zip``.
-
-For information about the contents of this file, see :ref:`Data Package
-Contents`.
-
-.. _Amazon S3 Buckets and Directories:
-
-********************************************
-Amazon S3 Buckets and Directories
-********************************************
-
-Data package files are located in the following buckets on Amazon S3:
-
-* The **edx-course-data** bucket contains the daily
-  ``{org}-{site}-events-{date}.log.gz.gpg`` files of course event data.
-  
-* The **course-data** bucket contains the weekly ``{org}-{date}.zip`` database
-  snapshot. 
-
-For information about accessing Amazon S3, see :ref:`Access Amazon S3`.
-
-.. _Download Data Packages from Amazon S3:
-
-****************************************************************
-Download Data Packages from Amazon S3
-****************************************************************
-
-You download the files in your data package from the Amazon S3 storage service.
-
-==========================
-Download Daily Event Files
-==========================
-
-#. To download daily event files, use the AWS Command Line Interface or a
-   third-party tool to connect to the **edx-course-data** bucket on Amazon S3.
-
-   For information about providing your credentials to connect to Amazon S3,
-   see :ref:`Access Amazon S3`.
-
-#. Navigate the directory structure in the **edx-course-data** bucket to locate
-   the files that you want:
-
-   ``{org}/{site}/events/{year}``
-
-   The event logs in the ``{year}`` directory are in compressed, encrypted
-   files named ``{org}-{site}-events-{date}.log.gz.gpg``.
-
-3. Download the ``{org}-{site}-events-{date}.log.gz.gpg`` file.
-
-   If your organization has courses running on both edx.org and edge.edx.org,
-   separate log files are available for the "edx" site and the "edge" site.
-   Repeat this step to download the file for the other site.
-
-============================
-Download Weekly Files
-============================
-
-.. note:: If you are using a third-party tool to connect to Amazon S3, you may 
- not be able to navigate from one edX bucket to the other in a single session.
- You may need to disconnect from Amazon S3 and then reconnect to the other
- bucket.
-
-#. To download a weekly database data file, connect to the edX **course-data**
-   bucket on Amazon S3 using the AWS Command Line Interface or a third-party
-   tool.
-
-   For information about providing your credentials to connect to Amazon S3,
-   see :ref:`Access Amazon S3`.
-
-2. Download the ``{org}-{date}.zip`` database data file from the **course-
-   data** bucket.
-
-.. _AWS Command Line Interface: http://aws.amazon.com/cli/
-
-.. _Data Package Contents:
-
-**********************
-Data Package Contents
-**********************
-
-Each of the files you download contains one or more files of research data.
-
-================================================================
-Extracted Contents of ``{org}-{site}-events-{date}.log.gz.gpg``
-================================================================
-
-The ``{org}-{site}-events-{date}.log.gz.gpg`` file contains all event data for
-courses on a single edX site for one 24-hour period. After you download a
-``{org}-{site}-events-{date}.log.gz.gpg`` file for your institution, you:
-
-#. Use your private key to decrypt the file. See :ref:`Decrypt an Encrypted
-   File`.
-
-#. Extract the log file from the compressed .gz file. The result is a single
-   file named ``{org}-{site}-events-{date}.log``. (Alternatively, the data can
-   be decompressed in stream using a tool such as gzip or, related libraries in
-   your preferred programming language.)
-
-============================================
-Extracted Contents of ``{org}-{date}.zip``
-============================================
-
-After you download the ``{org}-{date}.zip`` file for your
-institution, you:
-
-#. Extract the contents of the file. When you extract (or unzip) this file, all
-   of the files that it contains are placed in the same directory. All of the
-   extracted files end in ``.gpg``, which indicates that they are encrypted.
-
-#. Use your private key to decrypt the extracted files. See
-   :ref:`Decrypt an Encrypted File`.
-
-The result of extracting and decrypting the ``{org}-{date}.zip`` file is the
-following set of sql and mongo database files.
-
-``{org}-{course}-{date}-auth_user-{site}-analytics.sql``
-
-  Information about the users who are authorized to access the course. See
-  :ref:`auth_user`.
-
-``{org}-{course}-{date}-auth_userprofile-{site}-analytics.sql``
-
-  Demographic data provided by users during site registration. See
-  :ref:`auth_userprofile`.
-
-``{org}-{course}-{date}-certificates_generatedcertificate-{site}-analytics.sql``
-
-  The final grade and certificate status for students (populated after course
-  completion). See :ref:`certificates_generatedcertificate`.
-
-``{org}-{course}-{date}-courseware_studentmodule-{site}-analytics.sql``
-
-  The courseware state for each student, with a separate row for each item in
-  the course content that the student accesses. No file is produced for courses
-  that do not have any records in this table (for example, recently created
-  courses). See :ref:`courseware_studentmodule`.
-
-``{org}-{course}-{date}-student_courseenrollment-{site}-analytics.sql``
-
-  The enrollment status and type of enrollment selected by each student in the
-  course. See :ref:`student_courseenrollment`.
-
-``{org}-{course}-{date}-user_api_usercoursetag-{site}-analytics.sql``
-
-  Metadata that describes different types of student participation in the
-  course. See :ref:`user_api_usercoursetag`.
-
-``{org}-{course}-{date}-user_id_map-{site}-analytics.sql``
-
-   A mapping of user IDs to site-wide obfuscated IDs. See :ref:`user_id_map`.
-
-``{org}-{course}-{date}-{site}.mongo``
-
-  The content and characteristics of course discussion interactions. See
-  :ref:`Discussion Forums Data`.
-
-``{org}-{course}-{date}-wiki_article-{site}-analytics.sql``
-
-  Information about the articles added to the course wiki. See
-  :ref:`wiki_article`.
-
-``{org}-{course}-{date}-wiki_articlerevision-{site}-analytics.sql``
-
-  Changes and deletions affecting course wiki articles. See
-  :ref:`wiki_articlerevision`.
-
-
-
-.. _Using edX Insights: http://edx-insights.readthedocs.org/en/latest/
-.. _Building and Running an edX Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/
\ No newline at end of file
diff --git a/docs/en_us/data/source/internal_data_formats/sql_schema.rst b/docs/en_us/data/source/internal_data_formats/sql_schema.rst
deleted file mode 100644
index af3f6d8fab..0000000000
--- a/docs/en_us/data/source/internal_data_formats/sql_schema.rst
+++ /dev/null
@@ -1,1191 +0,0 @@
-.. _Student_Info:
-
-##############################
-Student Info and Progress Data
-##############################
-
-The following sections detail how edX stores stateful data for students internally, and is useful for developers and researchers who are examining database exports. This data includes:
-
-* :ref:`User_Data`
-* :ref:`Courseware_Progress`
-* :ref:`Certificates`
-
-Conventions to keep in mind:
-
-* EdX uses MySQL 5.1 relational database system with InnoDb storage engine.
-* All strings are stored as UTF-8.
-* All datetimes are stored as UTC (Coordinated Universal Time).
-
-.. note::
-     EdX also uses the Django Python Web framework. Tables that are built into the Django Web framework are documented here only if they are used in unconventional ways.
-
-Descriptions of the tables and columns that store student data follow, first in summary form with field types and constraints, and then with a detailed explanation of each column. 
-
-********************
-MySQL Terminology
-********************
-
-The summary information provided about the SQL table columns uses the following MySQL schema terminology.
-
-========
-Type
-========
-
-  The kind of data and the size of the field. When a numeric field has a length specified, the length indicates how many digits display but does not affect the number of bytes used.
-
-  .. list-table::
-     :widths: 25 65
-     :header-rows: 1
-
-     * - Value
-       - Description
-     * - int
-       - 4 byte integer.
-     * - smallint
-       - 2 byte integer, sometimes used for enumerated values.
-     * - tinyint
-       - 1 byte integer, usually used to indicate a Boolean with 0 = False and 1 = True.
-     * - varchar
-       - String, typically short and indexable. The length is the number of chars, not bytes, to support multi-byte character sets.
-     * - longtext
-       - A long block of text, usually not indexed.
-     * - date
-       - Date
-     * - datetime
-       - Datetime in UTC, precision in seconds.
-
-========
-Null
-========
-
-  .. list-table::
-     :widths: 25 70
-     :header-rows: 1
-
-     * - Value
-       - Description
-     * - YES
-       - NULL values are allowed.
-     * - NO
-       - NULL values are not allowed.
-
-.. note::
-     Django often just places blank strings instead of NULL when it wants to indicate a text value is optional. This is more meaningful for numeric and date fields.
-
-========
-Key
-========
-
-  .. list-table::
-     :widths: 25 65
-     :header-rows: 1
-
-     * - Value
-       - Description
-     * - PRI
-       - Primary key for the table, usually named ``id``, unique.
-     * - UNI
-       - Unique
-     * - MUL
-       - Indexed for fast lookup, but the same value can appear multiple times. A unique index that allows NULL can also show up as MUL.
-
-.. _User_Data:
-
-****************
-User Data
-****************
-
-The following tables store data gathered during site registration and course enrollment. 
-
-* :ref:`auth_user`
-* :ref:`auth_userprofile`
-* :ref:`student_courseenrollment`
-* :ref:`user_api_usercoursetag`
-* :ref:`user_id_map`
-
-.. _auth_user:
-
-================================
-Columns in the auth_user Table
-================================
-
-The ``auth_user`` table is built into the edX Django Web framework. It holds generic information necessary for user login and permissions. 
-
-A sample of the heading row and a data row in the ``auth_user`` table follow.
-
-.. code-block:: json
-
-    id  username  first_name  last_name  email  password  is_staff  is_active 
-    is_superuser  last_login  date_joined status  email_key  avatar_typ
-    country  show_country  date_of_birth  interesting_tags  ignored_tags  
-    email_tag_filter_strategy display_tag_filter_strategy 
-    consecutive_days_visit_count
-
-    9999999    AAAAAAAAA    AAAAAA  AAAAAA 1 1 0 2014-01-01 17:28:27 2012-03-04 
-    00:57:49   NULL      0 NULL      0 0
-
-The ``auth_user`` table has the following columns:
-
-  +------------------------------+--------------+------+-----+------------------+
-  | Column                       | Type         | Null | Key | Comment          |
-  +==============================+==============+======+=====+==================+
-  | id                           | int(11)      | NO   | PRI |                  |
-  +------------------------------+--------------+------+-----+------------------+
-  | username                     | varchar(30)  | NO   | UNI |                  |
-  +------------------------------+--------------+------+-----+------------------+
-  | first_name                   | varchar(30)  | NO   |     | # Never used     |
-  +------------------------------+--------------+------+-----+------------------+
-  | last_name                    | varchar(30)  | NO   |     | # Never used     |
-  +------------------------------+--------------+------+-----+------------------+
-  | email                        | varchar(75)  | NO   | UNI |                  |
-  +------------------------------+--------------+------+-----+------------------+
-  | password                     | varchar(128) | NO   |     |                  |
-  +------------------------------+--------------+------+-----+------------------+
-  | is_staff                     | tinyint(1)   | NO   |     |                  |
-  +------------------------------+--------------+------+-----+------------------+
-  | is_active                    | tinyint(1)   | NO   |     |                  |
-  +------------------------------+--------------+------+-----+------------------+
-  | is_superuser                 | tinyint(1)   | NO   |     |                  |
-  +------------------------------+--------------+------+-----+------------------+
-  | last_login                   | datetime     | NO   |     |                  |
-  +------------------------------+--------------+------+-----+------------------+
-  | date_joined                  | datetime     | NO   |     |                  |
-  +------------------------------+--------------+------+-----+------------------+
-  | status                       | varchar(2)   | NO   |     | # Obsolete       |
-  +------------------------------+--------------+------+-----+------------------+
-  | email_key                    | varchar(32)  | YES  |     | # Obsolete       |
-  +------------------------------+--------------+------+-----+------------------+
-  | avatar_typ                   | varchar(1)   | NO   |     | # Obsolete       |
-  +------------------------------+--------------+------+-----+------------------+
-  | country                      | varchar(2)   | NO   |     | # Obsolete       |
-  +------------------------------+--------------+------+-----+------------------+
-  | show_country                 | tinyint(1)   | NO   |     | # Obsolete       |
-  +------------------------------+--------------+------+-----+------------------+
-  | date_of_birth                | date         | YES  |     | # Obsolete       |
-  +------------------------------+--------------+------+-----+------------------+
-  | interesting_tags             | longtext     | NO   |     | # Obsolete       |
-  +------------------------------+--------------+------+-----+------------------+
-  | ignored_tags                 | longtext     | NO   |     | # Obsolete       |
-  +------------------------------+--------------+------+-----+------------------+
-  | email_tag_filter_strategy    | smallint(6)  | NO   |     | # Obsolete       |
-  +------------------------------+--------------+------+-----+------------------+
-  | display_tag_filter_strategy  | smallint(6)  | NO   |     | # Obsolete       |
-  +------------------------------+--------------+------+-----+------------------+
-  | consecutive_days_visit_count | int(11)      | NO   |     | # Obsolete       |
-  +------------------------------+--------------+------+-----+------------------+
-
-----
-id
-----
-  Primary key, and the value typically used in URLs that reference the user. A user has the same value for ``id`` here as they do in the MongoDB database's users collection. Foreign keys referencing ``auth_user.id`` will often be named ``user_id``, but are sometimes named ``student_id``.
-
-----------
-username
-----------
-  The unique username for a user in our system. It can contain alphanumerics and the special characters shown within the brackets: [ _ @ + - . ]. The username is the only user-provided information that other users can currently see. EdX has never allowed users to change usernames, but may do so in the future.
-
-------------
-first_name
-------------
-  Not used; a user's full name is stored in ``auth_userprofile.name`` instead.
-
------------
-last_name
------------
-  Not used; a user's full name is stored in ``auth_userprofile.name`` instead.
-
--------
-email
--------
-  The user's email address, which is the primary mechanism users use to log in. This value is optional by default in Django, but is required by edX. This value must be unique to each user and is never shown to other users.
-
-----------
-password
-----------
-  A hashed version of the user's password. Depending on when the password was last set, this will either be a SHA1 hash or PBKDF2 with SHA256 (Django 1.3 uses the former and 1.4 the latter).
-
-----------
-is_staff
-----------
-  Most users have a 0 for this field. Set to 1 if the user is a staff member of **edX**, with corresponding elevated privileges that cut across courses. It does not indicate that the person is a member of the course staff for any given course. 
-
-  Generally, users with this flag set to 1 are either edX program managers responsible for course delivery, or edX developers who need access for testing and debugging purposes. Users who have ``is_staff`` = 1 have instructor privileges on all courses and can see additional debug information on the Instructor tab.
-
-.. note::
-     This designation has no bearing on a user's role in the discussion forums, and confers no elevated privileges there.
-
------------
-is_active
------------
-  This value is 1 if the user has clicked on the activation link that was sent to them when they created their account, and 0 otherwise. 
-
-  Users who have ``is_active`` = 0 generally cannot log into the system. However, when users first create an account, they are automatically logged in even though they have not yet activated the account. This is to let them experience the site immediately without having to check their email. A message displays on the dashboard to remind users to check their email and activate their accounts when they have time. When they log out, they cannot log back in again until activation is complete. However, because edX sessions last a long time, it is possible for someone to use the site as a student for days without being "active".
-
-  Once ``is_active`` is set to 1, it is *only* set back to 0 if the user is banned (which is a very rare, manual operation).
-
---------------
-is_superuser
---------------
-  Controls access to django_admin views: set to 1 (true) only for site admins. 0 for almost everybody.
-
-  **History**: Only the earliest developers of the system have this set to 1, and it is no longer really used in the codebase.
-
-------------
-last_login
-------------
-  A datetime of the user's last login. Should not be used as a proxy for activity, since people can use the site all the time and go days between logging in and out.
-
--------------
-date_joined
--------------
-  Date that the account was created.
-
-.. note::
-     This is not the date that the user activated the account.
-
--------------------
-Obsolete columns
--------------------
-  All of the following columns were added by an application called Askbot, a discussion forum package that is no longer part of the system.
-
-  * status
-  * email_key
-  * avatar_typ
-  * country
-  * show_country
-  * date_of_birth
-  * interesting_tags
-  * ignored_tags
-  * email_tag_filter_strategy
-  * display_tag_filter_strategy
-  * consecutive_days_visit_count
-
-  Only users who were part of the prototype 6.002x course run in the Spring of 2012 have any information in these columns. Even for those users, most of this information was never collected. Only the columns with values that are automatically generated have any values in them, such as the tag-related columns.
-
-  These columns are unrelated to the discussion forums that edX currently uses, and will eventually be dropped from this table.
-
-.. _auth_userprofile:
-
-======================================
-Columns in the auth_userprofile Table
-======================================
-
-The ``auth_userprofile`` table stores user demographic data collected during the student registration process. 
-Every row in this table corresponds to one row in ``auth_user``. 
-
-A sample of the heading row and a data row in the ``auth_userprofile`` table follow.
-
-.. code-block:: json
-
-    id  user_id name  language  location  meta  courseware  gender  mailing_address 
-    year_of_birth level_of_education  goals allow_certificate  country  city
-
-    9999999  AAAAAAAA  AAAAAAAAA English MIT {"old_emails": [["aaaaa@xxxxx.xxx", 
-    "2012-11-16T10:28:10.096489"]], "old_names": [["BBBBBBBBBBBBB", "I wanted 
-    to test out the name-change functionality", "2012-10-22T12:23:10.598444"]]} 
-    course.xml  NULL  NULL  NULL  NULL  NULL  1      NULL
-
-The ``auth_userprofile`` table has the following columns:
-
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | Column             | Type         | Null | Key | Comment                                  |
-  +====================+==============+======+=====+==========================================+
-  | id                 | int(11)      | NO   | PRI |                                          |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | user_id            | int(11)      | NO   | UNI |                                          |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | name               | varchar(255) | NO   | MUL |                                          |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | language           | varchar(255) | NO   | MUL | # Obsolete                               |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | location           | varchar(255) | NO   | MUL | # Obsolete                               |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | meta               | longtext     | NO   |     |                                          |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | courseware         | varchar(255) | NO   |     | # Obsolete                               |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | gender             | varchar(6)   | YES  | MUL | # Only users signed up after prototype   |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | mailing_address    | longtext     | YES  |     | # Only users signed up after prototype   |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | year_of_birth      | int(11)      | YES  | MUL | # Only users signed up after prototype   |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | level_of_education | varchar(6)   | YES  | MUL | # Only users signed up after prototype   |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | goals              | longtext     | YES  |     | # Only users signed up after prototype   |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | allow_certificate  | tinyint(1)   | NO   |     |                                          |
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | country            | varchar(2)   | YES  |     |                                          |  
-  +--------------------+--------------+------+-----+------------------------------------------+
-  | city               | longtext     | YES  |     |                                          | 
-  +--------------------+--------------+------+-----+------------------------------------------+
-
-**History**: ``country`` and ``city`` added January 2014. The organization of this table was different for the students who signed up for the MITx prototype phase in the spring of 2012, than for those who signed up afterwards. The column descriptions that follow detail the differences in the demographic data gathered.
-
-----
-id
-----
-  Primary key, not referenced anywhere else.
-
----------
-user_id
----------
-  A foreign key that maps to ``auth_user.id``.
-
-------
-name
-------
-  String for a user's full name. EdX makes no constraints on language or breakdown into first/last name. The names are never shown to other students. International students usually enter a romanized version of their names, but not always. Name changes are permitted, and the previous name is logged in the ``meta`` field.
-
-  **History**: A former edX policy required manual approval of name changes to guard the integrity of the certificates. Students would submit a name change request, and an edX team member would approve or reject the request. 
-
-----------
-language
-----------
-  No longer used. 
-
-  **History**: User's preferred language, asked during the sign up process for the 6.002x prototype course given in the Spring of 2012. Sometimes written in those languages. EdX stopped collecting this data after MITx transitioned to edX, but never removed the values for the first group of students.
-
-----------
-location
-----------
-  No longer used. 
-
-  **History**: User's location, asked during the sign up process for the 6.002x prototype course given in the Spring of 2012. The request was not specific, so people tended to put the city they were in, though some just supplied a country and some got as specific as their street address. Again, sometimes romanized and sometimes written in their native language. Like ``language``, edX stopped collecting this column after MITx transitioned to edX, so it is only available for the first batch of students.
-
-------
-meta
-------
-  An optional, freeform text field that stores JSON data. This field allows us to associate arbitrary metadata with a user. An example of the JSON that can be stored in this field follows, using pretty print for an easier-to-read display format.
-
-.. code-block:: json
-
- {
-  "old_names": [
-    [
-      "Mike Smith",
-      "Mike's too informal for a certificate.",
-      "2012-11-15T17:28:12.658126"
-    ],
-    [
-      "Michael Smith",
-      "I want to add a middle name as well.",
-      "2013-02-07T11:15:46.524331"
-    ]
-  ],
-  "old_emails": [
-    [
-      "mr_mike@email.com",
-      "2012-10-18T15:21:41.916389"
-    ]
-  ],
-  "6002x_exit_response": {
-    "rating": [
-      "6"
-    ],
-    "teach_ee": [
-      "I do not teach EE."
-    ],
-    "improvement_textbook": [
-      "I'd like to get the full PDF."
-    ],
-    "future_offerings": [
-      "true"
-    ],
-    "university_comparison": [
-      "This course was <strong>on the same level<\/strong> as the university class."
-    ],
-    "improvement_lectures": [
-      "More PowerPoint!"
-    ],
-    "highest_degree": [
-      "Bachelor's degree."
-    ],
-    "future_classes": [
-      "true"
-    ],
-    "future_updates": [
-      "true"
-    ],
-    "favorite_parts": [
-      "Releases, bug fixes, and askbot."
-    ]
-  }
- }
-
-Details about this metadata follow. Please note that the "fields" described here are found as JSON attributes *inside* a given ``meta`` field, and are *not* separate database columns of their own.
-
-  ``old_names``
-
-    A list of the previous names this user had, and the timestamps at which they submitted a request to change those names. These name change request submissions used to require a staff member to approve it before the name change took effect. This is no longer the case, though their previous names are still recorded.
-
-    Note that the value stored for each entry is the name they had, not the name they requested to get changed to. People often changed their names as the time for certificate generation approached, to replace nicknames with their actual names or correct spelling/punctuation errors.
-
-    The timestamps are UTC, like all datetimes stored in our system.
-
-  ``old_emails``
-
-    A list of previous emails this user had, with timestamps of when they changed them, in a format similar to `old_names`. There was never an approval process for this.
-
-    The timestamps are UTC, like all datetimes stored in our system.
-
-  ``6002x_exit_response``
-
-    Answers to a survey that was sent to students after the prototype 6.002x course in the Spring of 2012. The questions and number of questions were randomly selected to measure how much survey length affected response rate. Only students from this course have this field.
-
-------------
-courseware
-------------
-  No longer used. 
-
-  **History**: At one point, it was part of a way to do A/B tests, but it has not been used for anything meaningful since the conclusion of the prototype course in the spring of 2012.
-
---------
-gender
---------
-  Collected during student signup from a dropdown list control. 
-
-  .. list-table::
-       :widths: 10 80
-       :header-rows: 1
-
-       * - Value
-         - Description
-       * - f
-         - Female
-       * - m
-         - Male
-       * - o
-         - Other
-       * - (blank)
-         - User did not specify a gender.
-       * - NULL
-         - This student signed up before this information was collected.
-
-  **History**: This information began to be collected after the transition from MITx to edX; prototype course students have NULL for this field.
-
------------------
-mailing_address
------------------
-  Collected during student signup from a text field control. A blank string for students who elect not to enter anything.
-
-  **History**: This information began to be collected after the transition from MITx to edX; prototype course students have NULL for this field.
-
----------------
-year_of_birth
----------------
-  Collected during student signup from a dropdown list control. NULL for students who decide not to fill this in.
-
-  **History**: This information began to be collected after the transition from MITx to edX; prototype course students have NULL for this field.
-
---------------------
-level_of_education
---------------------
-  Collected during student signup from a dropdown list control. 
-
-  .. list-table::
-       :widths: 10 80
-       :header-rows: 1
-
-       * - Value
-         - Description
-       * - p
-         - Doctorate.
-       * - m
-         - Master's or professional degree.
-       * - b
-         - Bachelor's degree.
-       * - a
-         - Associate's degree.
-       * - hs
-         - Secondary/high school.
-       * - jhs
-         - Junior secondary/junior high/middle school.
-       * - el
-         - Elementary/primary school.
-       * - none
-         - None.
-       * - other
-         - Other.
-       * - (blank)
-         - User did not specify level of education.
-       * - p_se
-         - Doctorate in science or engineering (no longer used).
-       * - p_oth
-         - Doctorate in another field (no longer used).
-       * - NULL
-         - This student signed up before this information was collected.
-
-  **History**: Data began to be collected in this column after the transition from MITx to edX; prototype course students have NULL for this field.
-
--------
-goals
--------
-  Collected during student signup from a text field control with the label "Goals in signing up for edX". A blank string for students who elect not to enter anything.
-
-  **History**: This information began to be collected after the transition from MITx to edX; prototype course students have NULL for this field. 
-
--------------------
-allow_certificate
--------------------
-  Set to 1 (true). 
-
-  **History**: Prior to 10 Feb 2014, this field was set to 0 (false) if log
-  analysis revealed that the student was accessing the edX site from a country
-  that the U.S. had embargoed. This restriction is no longer in effect, and on
-  10 Feb 2014 this value was changed to 1 for all users.
-
-
-----------------------
-country
-----------------------
-  Stores a two-digit country code based on the selection made by the student
-  during registration. Set to an empty string for students who do not select a
-  country.
-
-  **History**: Added in Jan 2014, but not implemented until 18 Sep 2014. Null
-  for all user profiles created before 18 Sep 2014.
-
-------
-city
-------
-  Not currently used. Set to null for all user profiles.
-
-  **History**: Added in Jan 2014, not yet implemented.
-
-.. _student_courseenrollment:
-
-==============================================
-Columns in the student_courseenrollment Table
-==============================================
-
-A row in this table represents a student's enrollment for a particular course run. 
-
-.. note:: A row is created for every student who starts the enrollment process, even if they never complete registration.
-
-**History**: As of 20 Aug 2013, this table retains the records of students who unenroll. Records are no longer deleted from this table.
-
-A sample of the heading row and a data row in the ``student_courseenrollment`` table follow.
-
-.. code-block:: sql
-
-    id  user_id course_id created is_active mode
-
-    1135683 9999999 edX/DemoX/Demo_course 2013-03-19 17:20:58 1 honor
-
-The ``student_courseenrollment`` table has the following columns:
-
-+-----------+--------------+------+-----+---------+----------------+
-| Field     | Type         | Null | Key | Default | Extra          |
-+===========+==============+======+=====+=========+================+
-| id        | int(11)      | NO   | PRI | NULL    | auto_increment |
-+-----------+--------------+------+-----+---------+----------------+
-| user_id   | int(11)      | NO   | MUL | NULL    |                |
-+-----------+--------------+------+-----+---------+----------------+
-| course_id | varchar(255) | NO   | MUL | NULL    |                |
-+-----------+--------------+------+-----+---------+----------------+
-| created   | datetime     | YES  | MUL | NULL    |                |
-+-----------+--------------+------+-----+---------+----------------+
-| is_active | tinyint(1)   | NO   |     | NULL    |                |
-+-----------+--------------+------+-----+---------+----------------+
-| mode      | varchar(100) | NO   |     | NULL    |                |
-+-----------+--------------+------+-----+---------+----------------+
-
-----
-id
-----
-  Primary key.
-
----------
-user_id
----------
-  Student's ID in ``auth_user.id``.
-
------------
-course_id
------------
-  The ID of the course run that the user is enrolling in, in the format
-  ``{key type}:{org}+{course}+{run}``. For example,
-  ``course-v1:edX+DemoX+Demo_2014``. When you view the course content in your
-  browser, the ``course_id`` appears as part of the URL. For example,
-  ``http://www.edx.org/courses/course-v1:edX+DemoX+Demo_2014/info``.
-
-  **History**: In October 2014, identifiers for some new courses began to use
-  the format shown above. Other new courses, and all courses created prior to
-  October 2014, use the format ``{org}/{course}/{run}``,  for example,
-  ``MITx/6.002x/2012_Fall``. The URL format for a course with a ``course_id``
-  in this format was
-  ``https://www.edx.org/courses/MITx/6.002x/2012_Fall/info``.
-
----------
-created
----------
-  Stores the date and time that this row was created, in UTC format.
-
------------
-is_active
------------
-  Boolean indicating whether this enrollment is active. If an enrollment is not active, a student is not enrolled in that course. For example, if a student decides to unenroll from the course, ``is_active`` is set to 0 (false). The student's state in ``courseware_studentmodule`` is untouched, so courseware state is not lost if a student unenrolls and then re-enrolls.  
-
-  ``is_active`` can also be set to 0 if a student begins the process of enrolling in a course by purchasing a verified certificate, but then abandond the shopping cart before completing the purchase (and the enrollment).
-
-  **History**: This column was introduced in the 20 Aug 2013 release. Before this release, unenrolling a student simply deleted the row in ``student_courseenrollment``.
-
-------
-mode
-------
-  String indicating what kind of enrollment this is: blank, audit, honor, or verified. 
-
-  **History**: All enrollments prior to 20 Aug 2013 are "honor". 
-
-  .. _user_api_usercoursetag:
-
-============================================
-Columns in the user_api_usercoursetag Table
-============================================
-
-This table uses key-value pairs to store metadata about a specific student's involvement in a specific course. For example, for a course that assigns students to groups randomly for A/B testing, a row in this table identifies the student's assignment to a partition and group.
-
-**History**: Added 7 Mar 2014.
-
-.. need a sample header and row from a data package when available
-
-The ``user_api_usercoursetag`` table has the following columns: 
-
-.. list-table::
-     :widths: 15 15 15 15
-     :header-rows: 1
-
-     * - Column
-       - Type
-       - Null
-       - Key
-     * - user_id
-       - int(11)  
-       - NO
-       - PRI
-     * - course_id
-       - varchar(255)
-       - NO
-       -
-     * - key
-       - varchar(255)
-       - NO
-       -
-     * - value
-       - textfield
-       - NO
-       -
-
-.. need type, null, key for each one
-
----------
-user_id
----------
-  The student's ID in ``auth_user.id``.
-
------------
-course_id
------------
-  The course identifier, in the format ``{key type}:{org}+{course}+{run}``. For
-  example, ``course-v1:edX+DemoX+Demo_2014``.
-
-  **History**: In October 2014, identifiers for some new courses began to use
-  the format shown above. Other new courses, and all courses created prior to
-  October 2014, use the format ``{org}/{course}/{run}``,  for example,
-  ``MITx/6.002x/2012_Fall``.
-
-----
-key
-----
-  Identifies an attribute of the course. 
-
-  For example, for a course that includes modules that are set up to perform A/B testing, the value in this column identifies a partition, or type of experiment. The key for the partition is in the format ``xblock.partition_service.partition_ID``, where ID is an integer.
-
-------
-value
-------
-  The content for the key that is set for a student. 
-
-  For example, for a course that includes modules that are set up to perform A/B testing, this column stores the group ID of the particular group the student is assigned to within the partition.
-
-.. _user_id_map:
-
-==================================
-Columns in the user_id_map Table
-==================================
-
-A row in this table maps a student's real user ID to an anonymous ID generated to obfuscate the student's identity.
-
-A sample of the heading row and a data row in the ``user_id_map`` table follow.
-
-.. code-block:: sql
-
-    hash_id id  username
-
-    e9989f2cca1d699d88e14fd43ccb5b5f  9999999 AAAAAAAA
-
-The ``student_courseenrollment`` table has the following columns: 
-
-.. list-table::
-     :widths: 15 15 15 15
-     :header-rows: 1
-
-     * - Column
-       - Type
-       - Null
-       - Key
-     * - hashid
-       - int(11) 
-       - NO
-       - PRI
-     * - id
-       - int(11)
-       - NO
-       -
-     * - username
-       - varchar(30)
-       - NO
-       -
-
-----------
-hash_id
-----------
-   The user ID generated to obfuscate the student's identity.
-
----------
-id
----------
-  The student's ID in ``auth_user.id``.
-
------------
-username
------------
-  The student's username in ``auth_user.username``. 
-
-.. _Courseware_Progress:
-
-************************
-Courseware Progress Data
-************************
-
-Any piece of content in the courseware can store state and score in the ``courseware_studentmodule`` table. Grades and the user Progress page are generated by doing a walk of the course contents, searching for graded items, looking up a student's entries for those items in ``courseware_studentmodule`` via *(course_id, student_id, module_id)*, and then applying the grade weighting found in the course policy and grading policy files. Course policy files determine how much weight one problem has relative to another, and grading policy files determine how much categories of problems are weighted (for example, HW=50%, Final=25%, etc.).
-
-==================================
-About Modules
-==================================
-
-It's important to understand what "modules" are in the context of our system, as the terminology can be confusing. For the conventions of this table and many parts of our code, a "module" is a content piece that appears in the courseware. This can be nearly anything that appears when users are in the courseware tab: a video, a piece of HTML, a problem, etc. Modules can also be collections of other modules, such as sequences, verticals (modules stacked together on the same page), weeks, chapters, etc. In fact, the course itself is a top level module that contains all the other contents of the course as children. You can imagine the entire course as a tree with modules at every node.
-
-Modules can store state, but whether and how they do so varies based on the implementation for that particular kind of module. When a user loads a page, the system looks up all the modules that need to be rendered in order to display it, and then asks the database to look up state for those modules for that user. If there is no corresponding entry for that user for a given module, a new row is created and the state is set to an empty JSON dictionary.
-
-.. _courseware_studentmodule:
-
-====================================================================
-Columns in the courseware_studentmodule Table
-====================================================================
-
-The ``courseware_studentmodule`` table holds all courseware state for a given user. 
-
-A sample of the heading row and a data row in the ``courseware_studentmodule`` table follow.
-
-.. code-block:: sql
-
-    id  module_type module_id student_id  state grade created modified  max_grade done  
-    course_id
-
-    33973858  course  i4x://edX/DemoX/course/Demo_course  96452 {"position": 3} NULL  
-    2013-03-19 17:21:07 2014-01-07 20:18:54 NULL  na  edX/DemoX/Demo_course
-
-Students have a separate row for every piece of content that they access or that is created to hold state data, making this the largest table in the data package. 
-
-
-The ``courseware_studentmodule`` table has the following columns:
-
-+-------------+--------------+------+-----+---------+----------------+
-| Field       | Type         | Null | Key | Default | Extra          |
-+=============+==============+======+=====+=========+================+
-| id          | int(11)      | NO   | PRI | NULL    | auto_increment |
-+-------------+--------------+------+-----+---------+----------------+
-| module_type | varchar(32)  | NO   | MUL | problem |                |
-+-------------+--------------+------+-----+---------+----------------+
-| module_id   | varchar(255) | NO   | MUL | NULL    |                |
-+-------------+--------------+------+-----+---------+----------------+
-| student_id  | int(11)      | NO   | MUL | NULL    |                |
-+-------------+--------------+------+-----+---------+----------------+
-| state       | longtext     | YES  |     | NULL    |                |
-+-------------+--------------+------+-----+---------+----------------+
-| grade       | double       | YES  | MUL | NULL    |                |
-+-------------+--------------+------+-----+---------+----------------+
-| created     | datetime     | NO   | MUL | NULL    |                |
-+-------------+--------------+------+-----+---------+----------------+
-| modified    | datetime     | NO   | MUL | NULL    |                |
-+-------------+--------------+------+-----+---------+----------------+
-| max_grade   | double       | YES  |     | NULL    |                |
-+-------------+--------------+------+-----+---------+----------------+
-| done        | varchar(8)   | NO   | MUL | NULL    |                |
-+-------------+--------------+------+-----+---------+----------------+
-| course_id   | varchar(255) | NO   | MUL | NULL    |                |
-+-------------+--------------+------+-----+---------+----------------+
-
-----
-id
-----
-  Primary key. Rarely used though, since most lookups on this table are searches on the three tuple of `(course_id, student_id, module_id)`.
-
--------------
-module_type
--------------
-
-  .. list-table::
-     :widths: 20 70
-     :header-rows: 1
-
-     * - Type
-       - Description
-     * - chapter
-       - The top level categories for a course. Each of these is usually labeled as a Week in the courseware, but this is just convention.
-     * - combinedopenended
-       - A module type developed for grading open ended questions via self assessment, peer assessment, and machine learning.
-     * - conditional
-       - Allows you to prevent access to certain parts of the courseware if other parts have not been completed first.
-     * - course
-       - The top level course module of which all course content is descended.
-     * - crowdsource_hinter
-       - Not currently used. **History**: This ``module_type`` was included in a single course on a test basis and then deprecated. 
-     * - lti
-       - Learning Tools Interoperability component that adds an external learning application to display content, or to display content and also require a student response. 
-     * - peergrading
-       - Indicates a problem that is graded by other students. An option for grading open ended questions.
-     * - poll_question
-       - Not currently used. **History**: This ``module_type`` was included in a single course on a test basis and then deprecated. 
-     * - problem
-       - A problem that the user can submit solutions for. EdX offers many different varieties.
-     * - problemset
-       - A collection of problems and supplementary materials, typically used for homeworks and rendered as a horizontal icon bar in the courseware. Use is inconsistent, and some courses use a ``sequential`` instead.
-     * - randomize
-       - Identifies a module in which one of several possible defined alternatives is randomly selected for display to each student. 
-     * - selfassessment
-       - Self assessment problems. Used in a single course in Fall 2012 as an early test of the open ended grading system. Deprecated in favor of ``combinedopenended``. 
-     * - sequential
-       - A collection of videos, problems, and other materials, rendered as a horizontal icon bar in the courseware.
-     * - timelimit
-       - Not currently used. **History**: This ``module_type`` was included in a single course on a test basis and then deprecated. 
-     * - video
-       - A component that makes a video file available for students to play.
-     * - videoalpha
-       - Not currently used. **History**: During the implementation of a change to the ``video`` ``module_type``, both ``video`` and ``videoalpha`` were stored. The ``videoalpha`` type was then deprecated.
-     * - videosequence
-       - A collection of videos, exercise problems, and other materials, rendered as a horizontal icon bar in the courseware. **History**: This ``module_type`` is no longer in use, courses now use ``sequential`` instead.
-     * - word_cloud
-       - A specialized problem that produces a graphic from the words that students enter.
-
------------
-module_id
------------
-  Unique ID for a distinct piece of content in a course. Each ``module_id`` is
-  recorded as a URL with the format ``{key type}:{org}+{course}+{run}@{module
-  type}+block@{module name or hash code}``. Having URLs of this form gives
-  content a canonical representation even during a transition between back-end
-  data stores.
-
-  As an example, this ``module_id``:
-
-    ``block-v1:edX+DemoX+Demo_2014+type@problem+block@303034da25524878a2e66fb57c91cf85``
-
-  contains the following parts.
-
-  .. list-table::
-     :widths: 15 20 55
-     :header-rows: 1
-
-     * - Part
-       - Example Value
-       - Definition
-     * - {key type}
-       - block-v1
-       - The type of namespace identifier, including the implementation
-         version.
-     * - {org}
-       - edX
-       - The organization part of the ID, indicating what organization created
-         this piece of content.
-     * - {course}
-       - DemoX
-       - The course that this content was created for. 
-     * - {run}
-       - Demo_2014
-       - The term or specific iteration of the course. 
-     * - type@{module type}
-       - type@problem
-       - The module type. The same value is stored in the
-         ``courseware_studentmodule.module_type`` column.
-     * - block@{module name or hash code}
-       - block@303034da25524878a2e66fb57c91cf85
-       - The name that the content creators supplied for this module. If the
-         module does not have a name, the system generates a hash code as its
-         identifier.
-
-**History**: In October 2014, identifiers for modules in some new courses began
-to use the format shown above. Other new courses, and all courses created prior
-to October 2014, use the format ``i4x://{org}/{course}/{module type}/{module
-name or hash code}``. For example,
-``i4x://MITx/3.091x/problemset/Sample_Problems``. Note that this format does
-not include course run information, so the
-``courseware_studentmodule.course_id`` column may need to be used as well.
-
-------------
-student_id
-------------
-  A reference to ``auth_user.id``, this is the student that this module state row belongs to.
-
--------
-state
--------
-  This is a JSON text field where different module types are free to store their state however they wish.
-
-  ``course``, ``chapter``, ``problemset``, ``sequential``, ``videosequence``
-
-    The state for all of these container modules is a JSON dictionary indicating the user's last known position within this container. This is 1-indexed, not 0-indexed, mostly because it was released that way and a later change would have broken saved navigation state for users.
-
-    Example: ``{"position" : 3}``
-
-    When this user last interacted with this course/chapter/etc., they clicked on the third child element. Note that the position is a simple index and not a ``module_id``, so if you rearranged the order of the contents, it would not be smart enough to accomodate the changes and would point users to the wrong place.
-
-    The hierarchy of these containers is ``course > chapter > (problemset | sequential | videosequence)``
-
-  ``combinedopenended``
-
-    The JSON document includes attributes that identify the student's ``answer``, a ``rubric_xml`` that includes the complete XML syntax for the rubric, the ``score`` earned and the ``max_score``, and the ``grader_id`` (the ``auth_user.id``) of each student who assessed the answer. 
-
-.. is a complete list of all possible attributes needed? 26 Feb 14  
-
-  ``conditional``
-
-    Conditionals don't actually store any state, so this value is always an empty JSON dictionary (`'{}'`). These entries may be removed altogether.
-
-  ``problem``
-
-    There are many kinds of problems supported by the system, and they all have different state requirements. Note that a single problem can have many different response fields. If a problem generates a random circuit and asks five questions about it, then all of that is stored in one row in ``courseware_studentmodule``.
-
-.. Include the different problem types and info about the state.
-
-  ``selfassessment``
-
-   In the course that used this module type, the JSON document included attributes for the ``student_answers``, the ``scores`` earned and ``max_score``, and any ``hints`` provided.
-
--------
-grade
--------
-  Floating point value indicating the total unweighted grade for this problem that the student has scored. Basically how many responses they got right within the problem.
-
-  Only ``problem`` and ``selfassessment`` types use this column. All other modules set this to NULL. Due to a quirk in how rendering is done, ``grade`` can also be NULL for a tenth of a second or so the first time that a user loads a problem. The initial load triggers two writes, the first of which sets the ``grade`` to NULL, and the second of which sets it to 0.
-
----------
-created
----------
-  Datetime when this row was created, which is typically when the student first accesses this piece of content.
-
-  **Note**: For a module that contains multiple child modules, a row is created for each of them when the student first accesses one of them.
-
-----------
-modified
-----------
-  Datetime when this row was last updated. Set to be equal to ``created`` at first. A change in ``modified`` implies that there was a state change, usually in response to a user action like saving or submitting a problem, or clicking on a navigational element that records its state. However it can also be triggered if the module writes multiple times on its first load, like problems do (see note in ``grade``).
-
------------
-max_grade
------------
-  Floating point value indicating the total possible unweighted grade for this problem, or basically the number of responses that are in this problem. Though in practice it's the same for every entry with the same ``module_id``, it is technically possible for it to be anything. 
-
-  Another way in which ``max_grade`` can differ between entries with the same ``module_id`` is if the problem was modified after the ``max_grade`` was written and the user never went back to the problem after it was updated. This might happen if a member of the course staff puts out a problem with five parts, realizes that the last part doesn't make sense, and decides to remove it. People who saw and answered it when it had five parts and never came back to it after the changes had been made will have a ``max_grade`` of 5, while people who saw it later will have a ``max_grade`` of 4.
-
-  Only graded module types use this column, with ``problem`` being the primary example. All other modules set this to NULL.
-
-------
-done
-------
-  Not used. The value ``na`` appears in every row.
-
------------
-course_id
------------
-  The course that this row applies to, in the format ``{key
-  type}:{org}+{course}+{run}``. For example, ``course-v1:edX+DemoX+Demo_2014``.
-
-  Because the same course content (content with the same ``module_id``) can be
-  used in different courses, student state is tracked separately for each
-  course.
-
-  **History**: In October 2014, identifiers for some new courses began to use
-  the format shown above. Other new courses, and all courses created prior to
-  October 2014, use the format ``{org}/{course}/{run}``,  for example,
-  ``MITx/6.002x/2012_Fall``.
-
-.. _Certificates:
-
-******************
-Certificate Data
-******************
-
-.. _certificates_generatedcertificate:
-
-=======================================================
-Columns in the certificates_generatedcertificate Table
-=======================================================
-
-The ``certificates_generatedcertificate`` table tracks the state of certificates and final grades for a course. The table is  populated when a script is run to grade all of the students who are enrolled in the course at that time and issue certificates. The  certificate process can be rerun and this table is updated appropriately.
-
-A sample of the heading row and two data rows in the ``certificates_generatedcertificate`` table follow.
-
-.. code-block:: sql
-
- id  user_id  download_url  grade  course_id  key  distinction  status  verify_uuid 
- download_uuid  name  created_date  modified_date error_reason  mode
-
- 26  9999999 
- https://s3.amazonaws.com/verify.edx.org/downloads/9_hash_1/Certificate.pdf  
- 0.84  BerkeleyX/CS169.1x/2012_Fall  f_hash_a   0   downloadable  2_hash_f  
- 9_hash_1  AAAAAA  2012-11-10  00:12:11  2012-11-10  00:12:13   honor
-
- 27  9999999        0.0  BerkeleyX/CS169.1x/2012_Fall    0  notpassing  AAAAAA  
- 2012-11-10  00:12:11  2012-11-26  19:06:19  honor
-
-The ``certificates_generatedcertificate`` table has the following columns:
-
-+---------------+--------------+------+-----+---------+----------------+
-| Field         | Type         | Null | Key | Default | Extra          |
-+===============+==============+======+=====+=========+================+
-| id            | int(11)      | NO   | PRI | NULL    | auto_increment |
-+---------------+--------------+------+-----+---------+----------------+
-| user_id       | int(11)      | NO   | MUL | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| download_url  | varchar(128) | NO   |     | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| grade         | varchar(5)   | NO   |     | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| course_id     | varchar(255) | NO   | MUL | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| key           | varchar(32)  | NO   |     | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| distinction   | tinyint(1)   | NO   |     | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| status        | varchar(32)  | NO   |     | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| verify_uuid   | varchar(32)  | NO   |     | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| download_uuid | varchar(32)  | NO   |     | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| name          | varchar(255) | NO   |     | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| created_date  | datetime     | NO   |     | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| modified_date | datetime     | NO   |     | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| error_reason  | varchar(512) | NO   |     | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-| mode          | varchar(32)  | NO   |     | NULL    |                |
-+---------------+--------------+------+-----+---------+----------------+
-
----------
-id
----------
-  The primary key. 
-
-----------------------
-user_id, course_id
-----------------------
-  The table is indexed by user and course.
-
---------------
-download_url
---------------
-  The ``download_url`` contains the full URL to the certificate. 
-
--------
-grade
--------
-  The grade computed the last time certificate generation ran. If the courseware, student state, or grading policy change, the value in this column can be different than the grade shown on a student's Progress page.
-
----------
-key
----------
-  Used internally only. A random string that is used to match server requests to responses sent to the LMS. 
-
------------------
-distinction
------------------
-  Not used. 
-
-  **History**: This was used for letters of distinction for 188.1x, but is not being used for any current courses.
-
---------
-status
---------
-  Status can be one of these states:
-
-  .. list-table::
-       :widths: 15 80
-       :header-rows: 1
-
-       * - Value
-         - Description
-       * - deleted 
-         - The certificate has been deleted.
-       * - deleting 
-         - A request has been made to delete a certificate.
-       * - downloadable 
-         - The student passed the course and a certificate is available for download.
-       * - error 
-         - An error ocurred during certificate generation.
-       * - generating 
-         - A request has been made to generate a certificate but it has not yet been generated.
-       * - notpassing 
-         - The student's grade is not a passing grade. 
-       * - regenerating 
-         - A request has been made to regenerate a certificate but it has not yet been generated.
-       * - restricted 
-         - No longer used. **History**: Specified when ``userprofile.allow_certificate`` was set to false: to indicate that the student was on the restricted embargo list. 
-       * - unavailable 
-         - No entry, typically because the student has not yet been graded for certificate generation.
-
-  After a course has been graded and certificates have been issued, status is one of:
-
-  * downloadable
-  * notpassing
-
--------------
-verify_uuid
--------------
-  A hash code that verifies the validity of a certificate. Included on the certificate itself as part of a URL. 
-  
--------------
-download_uuid
--------------
-  A hash code that identifies this student's certificate. Included as part of the ``download_url``. 
-
-------
-name
-------
-  This column records the name of the student that was set at the time the student was graded and the certificate was generated.
-
----------------
-created_date
----------------
-  Date this row in the database was created.
-
----------------
-modified_date
----------------
-  Date this row in the database was modified.
-
----------------
-error_reason
----------------
-  Used internally only. Logs messages that are used for debugging if the certificate generation process fails.
-
----------------
-mode
----------------
-  Contains the value found in the ``enrollment.mode`` field for a student and course at the time the certificate was generated: blank, audit, honor, or verified. This value is not updated if the student's ``enrollment.mode`` changes after certificates are generated. 
diff --git a/docs/en_us/data/source/internal_data_formats/tracking_logs.rst b/docs/en_us/data/source/internal_data_formats/tracking_logs.rst
deleted file mode 100644
index 52f4995de8..0000000000
--- a/docs/en_us/data/source/internal_data_formats/tracking_logs.rst
+++ /dev/null
@@ -1,3331 +0,0 @@
-.. _Tracking Logs:
-
-######################
-Tracking Logs
-######################
-
-This chapter provides reference information about the event data that is
-delivered in data packages. Events are emitted by the server, the browser, or
-the mobile device to capture information about interactions with the courseware
-and the Instructor Dashboard in the LMS, and are stored in JSON documents. In
-the data package, event data is delivered in a log file.
-
-The sections in this chapter describe:
-
-* A :ref:`sample_events`.
-* :ref:`common` that are included in the JSON document of every event.
-* :ref:`Student_Event_Types` for interactions with the LMS outside of the
-  Instructor Dashboard. 
-* :ref:`Instructor_Event_Types` for interactions with the Instructor Dashboard
-  in the LMS.
-
-Student and instructor events are grouped into categories in this chapter. For
-a list of events, see the :ref:`event_list`.
-
-
-.. _sample_events:
-
-*************************
-Sample Event
-*************************
-
-A sample event from an edX.log file follows. The JSON documents that include
-event data are delivered in a compact, machine-readable format that can be
-difficult to read at a glance.
-
-.. code-block:: json
-
-    {"agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) 
-    Chrome/30.0.1599.101 Safari/537.36", "context": {"course_id": "edx/AN101/2014_T1", 
-    "module": {"display_name": "Multiple Choice Questions"}, "org_id": "edx", "user_id": 
-    9999999}, "event": {"answers": {"i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_2_1": 
-    "yellow", "i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_4_1": ["choice_0", "choice_2"]}, 
-    "attempts": 1, "correct_map": {"i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_2_1": 
-    {"correctness": "incorrect", "hint": "", "hintmode": null, "msg": "", "npoints": null, 
-    "queuestate": null}, "i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_4_1": 
-    {"correctness": "correct", "hint": "", "hintmode": null, "msg": "", "npoints": null, 
-    "queuestate": null}}, "grade": 2, "max_grade": 3, "problem_id": "i4x://edx/AN101/problem/
-    a0effb954cca4759994f1ac9e9434bf4", "state": {"correct_map": {}, "done": null, "input_state": 
-    {"i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_2_1": {}, "i4x-edx-AN101-problem-
-    a0effb954cca4759994f1ac9e9434bf4_4_1": {}}, "seed": 1, "student_answers": {}}, "submission": 
-    {"i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_2_1": {"answer": "yellow", "correct": 
-    false, "input_type": "optioninput", "question": "What color is the open ocean on a sunny day?", 
-    "response_type": "optionresponse", "variant": ""}, "i4x-edx-AN101-problem-
-    a0effb954cca4759994f1ac9e9434bf4_4_1": {"answer": ["a piano", "a guitar"], "correct": true, 
-    "input_type": "checkboxgroup", "question": "Which of the following are musical instruments?", 
-    "response_type": "choiceresponse", "variant": ""}}, "success": "incorrect"}, "event_source": 
-    "server", "event_type": "problem_check", "host": "precise64", "ip": "NN.N.N.N", "page": "x_module", 
-    "time": 2014-03-03T16:19:05.584523+00:00", "username": "AAAAAAAAAA"}
-
-If you use a JSON formatter to "pretty print" this event, a version that is more readable is produced.
-
-.. code-block:: json
-
- {
-    "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36", 
-    "context": {
-        "course_id": "edx/AN101/2014_T1", 
-        "module": {
-            "display_name": "Multiple Choice Questions"
-        }, 
-        "org_id": "edx", 
-        "user_id": 9999999
-    }, 
-    "event": {
-        "answers": {
-            "i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_2_1": "yellow", 
-            "i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_4_1": [
-                "choice_0", 
-                "choice_2"
-            ]
-        }, 
-        "attempts": 1, 
-        "correct_map": {
-            "i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_2_1": {
-                "correctness": "incorrect", 
-                "hint": "", 
-                "hintmode": null, 
-                "msg": "", 
-                "npoints": null, 
-                "queuestate": null
-            }, 
-            "i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_4_1": {
-                "correctness": "correct", 
-                "hint": "", 
-                "hintmode": null, 
-                "msg": "", 
-                "npoints": null, 
-                "queuestate": null
-            }
-        }, 
-        "grade": 2, 
-        "max_grade": 3, 
-        "problem_id": "i4x://edx/AN101/problem/a0effb954cca4759994f1ac9e9434bf4", 
-        "state": {
-            "correct_map": {}, 
-            "done": null, 
-            "input_state": {
-                "i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_2_1": {}, 
-                "i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_4_1": {}
-            }, 
-            "seed": 1, 
-            "student_answers": {}
-        }, 
-        "submission": {
-            "i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_2_1": {
-                "answer": "yellow", 
-                "correct": false, 
-                "input_type": "optioninput", 
-                "question": "What color is the open ocean on a sunny day?", 
-                "response_type": "optionresponse", 
-                "variant": ""
-            },
-            "i4x-edx-AN101-problem-a0effb954cca4759994f1ac9e9434bf4_4_1": {
-                "answer": [
-                    "a piano", 
-                    "a guitar"
-                ], 
-                "correct": true, 
-                "input_type": "checkboxgroup", 
-                "question": "Which of the following are musical instruments?", 
-                "response_type": "choiceresponse", 
-                "variant": ""
-            }
-        }, 
-        "success": "incorrect"
-    }, 
-    "event_source": "server", 
-    "event_type": "problem_check", 
-    "host": "precise64", 
-    "ip": "NN.N.N.N", 
-    "page": "x_module", 
-    "time": "2014-03-03T16:19:05.584523+00:00", 
-    "username": "AAAAAAAAAA"
- }
-
-.. _common:
-
-********************
-Common Fields
-********************
-
-This section describes the JSON fields that are common to the schema
-definitions of all events.
-
-=====================
-``agent`` Field
-=====================
-
-**Type:** string
-
-**Details:** Browser agent string of the user who triggered the event. 
-
-.. _context:
-
-===================
-``context`` Field
-===================
-
-**Type:** dict
-
-**Details:** For all events, this field includes member fields that
-identify:
-
-* The ``course_id`` of the course that generated the event.
-* The ``org_id`` of the organization that lists the course. 
-* The ``user_id`` of the individual who is performing the action. 
-* The URL ``path`` that generated the event. 
-
-When included, ``course_user_tags`` contains a dictionary with the key(s) and
-value(s) from the ``user_api_usercoursetag`` table for the user. See
-:ref:`user_api_usercoursetag`.
-
-The member fields are blank if values cannot be determined. The ``context``
-field can also contain additional member fields that apply to specific events
-only: see the description for each type of event.
-
-**History**: Added 23 Oct 2013; ``user_id`` added 6 Nov 2013. Other event
-fields may duplicate this data. ``course_user_tags`` added 12 Mar 2014,
-``path`` added 07 May 2014.
-
-===================
-``event`` Field
-===================
-
-**Type:** dict
-
-**Details:** This field includes member fields that identify specifics of each
-triggered event. Different member fields are supplied for different events: see
-the description for each type of event.
-
-========================
-``event_source`` Field
-========================
-
-**Type:** string
-
-**Details:** Specifies the source of the interaction that triggered the event.
-The values in this field are:
-
-* 'browser'
-* 'mobile'
-* 'server'
-* 'task'
-
-**History**: Updated 16 Oct 2014 to identify events emitted from mobile
-devices.
-
-=====================
-``event_type`` Field
-=====================
-
-**Type:** string
-
-**Details:** The type of event triggered. Values depend on ``event_source``.
-
-The :ref:`Student_Event_Types` and :ref:`Instructor_Event_Types` sections in
-this chapter provide descriptions of each type of event that is included in
-data packages. To locate information about a specific event type, see the
-:ref:`event_list`.
-
-===================
-``host`` Field
-===================
-
-**Type:** string
-
-**Details:** The site visited by the user, for example, courses.edx.org.
-
-===================
-``ip`` Field
-===================
-
-**Type:** string
-
-**Details:** IP address of the user who triggered the event. Empty for events
-that originate on mobile devices.
-
-===================
-``page`` Field
-===================
-
-**Type:** string
-
-**Details:** The '$URL' of the page the user was visiting when the event was
-emitted. 
-
-For video events that originate on mobile devices, identifies the URL for the
-video component.
-
-===================
-``session`` Field
-===================
-
-**Type:** string
-
-**Details:** This 32-character value is a key that identifies the user's
-session. All browser events and the server :ref:`enrollment<enrollment>` events
-include a value for the session. Other server events and mobile events do not
-include a session value.
-
-===================
-``time`` Field
-===================
-
-**Type:** string
-
-**Details:** Gives the UTC time at which the event was emitted in 'YYYY-MM-
-DDThh:mm:ss.xxxxxx' format.
-
-===================
-``username`` Field
-===================
-
-**Type:** string
-
-**Details:** The username of the user who caused the event to be emitted. This
-string is empty for anonymous events, such as when the user is not logged in.
-
-.. _Student_Event_Types:
-
-****************************************
-Student Events
-****************************************
-
-This section lists the events that are logged for interactions with the LMS
-outside the Instructor Dashboard.
-
-* :ref:`enrollment`
-
-* :ref:`navigational`
-
-* :ref:`video`
-
-* :ref:`pdf`
-
-* :ref:`problem`
-
-* :ref:`forum_events`
-
-* :ref:`ora2`
-
-* :ref:`AB_Event_Types`
-
-* :ref:`student_cohort_events`
-
-* :ref:`ora`
-
-The descriptions that follow include what each event represents, the system
-component it originates from, the history of any changes made to the event over
-time, and any additional member fields that the ``context`` and ``event``
-fields contain.
-
-The value in the ``event_source`` field (see the :ref:`common` section above)
-distinguishes between events that originate in the browser (in JavaScript) and
-events that originate on the server (during the processing of a request).
-
-.. _enrollment:
-
-=========================
-Enrollment Events
-=========================
-
-.. tracked_command.py
-
-``edx.course.enrollment.activated`` and ``edx.course.enrollment.deactivated``
-------------------------------------------------------------------------------
-
-The server emits these events in response to course enrollment
-activities completed by a student.
-
-* When a student enrolls in a course, ``edx.course.enrollment.activated`` is
-  emitted. On edx.org, this is typically the result of a student clicking
-  **Register** for the course.
-
-* When a student unenrolls from a course, ``edx.course.enrollment.deactivated``
-  is emitted. On edx.org, this is typically the result of a student clicking
-  **Unregister** for the course.
-
-In addition, actions by instructors and course staff members also generate
-enrollment events. For the actions that members of the course team complete
-that result in these events, see :ref:`instructor_enrollment`.
-
-**Event Source**: Server
-
-**History**: These enrollment events were added on 03 Dec 2013.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``course_id``
-     - string
-     - **History**: Maintained for backward compatibility. 
-       
-       As of 23 Oct 2013, replaced by the ``context`` ``course_id`` field.
-
-       See the description of the :ref:`context`.
-
-   * - ``mode``
-     - string
-     - 'audit', 'honor', 'verified'
-   * - ``name``
-     - string
-     - Identifies the type of event: 'edx.course.enrollment.activated' or
-       'edx.course.enrollment.deactivated'. 
-
-       **History**: Added 07 May 2014 to replace the ``event`` ``event_type``
-       field.
-
-   * - ``session``
-     - string
-     - The Django session ID, if available. Can be used to identify events for
-       a specific user within a session. 
-
-       **History**: Added 07 May 2014.
-
-   * - ``user_id``
-     - integer
-     - Identifies the user who was enrolled or unenrolled. 
-
-Example
---------
-
-.. reviewers, is this example accurate wrt the new fields?
-
-.. code-block:: json
-
-    {
-        "username": "AAAAAAAAAA",
-        "host": "courses.edx.org",
-        "event_source": "server",
-        "event_type": "edx.course.enrollment.activated",
-        "context": {
-          "course_id": "edX\/DemoX\/Demo_Course",
-          "org_id": "edX",
-          "path": "/change_enrollment",
-          "user_id": 9999999
-        },
-        "time": "2014-01-26T00:28:28.388782+00:00",
-        "ip": "NN.NN.NNN.NNN",
-        "event": {
-          "course_id": "edX\/DemoX\/Demo_Course",
-          "user_id": 9999999,
-          "mode": "honor"
-          "name": "edx.course.enrollment.activated",
-          "session": a14j3ifhskngw0gfgn230g
-        },
-        "agent": "Mozilla\/5.0 (Windows NT 6.1; WOW64; Trident\/7.0; rv:11.0) like Gecko",
-        "page": null
-      }
-
-``edx.course.enrollment.upgrade.clicked``
------------------------------------------------
-
-Students who enroll with a ``student_courseenrollment.mode`` of 'audit' or
-'honor' in a course that has a verified certificate option see a **Challenge
-Yourself** link for the course on their dashboards. The browser emits this
-event when a student clicks this option, and the process of upgrading the
-``student_courseenrollment.mode`` for the student to 'verified' begins. See
-:ref:`student_courseenrollment`.
-
-**Event Source**: Browser
-
-**History**: Added 18 Dec 2013.
-
-``context`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details and Member Fields
-   * - ``mode``
-     - string
-     - Enrollment mode when the user clicked **Challenge Yourself**: 'audit' or
-       'honor'.
-
-``event`` **Member Fields**: None.
-       
-``edx.course.enrollment.upgrade.succeeded``
---------------------------------------------
-
-The server emits this event when the process of upgrading a student's
-``student_courseenrollment.mode`` from 'audit' or 'honor' to 'verified' is
-complete.
-
-**Event Source**: Server
-
-**History**: Added 18 Dec 2013.
-
-``context`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details and Member Fields
-   * - ``mode``
-     - string
-     - Set to 'verified'.
-
-``event`` **Member Fields**: None.
-
-.. _navigational:
-
-==============================
-Navigational Events 
-==============================
-
-.. display_spec.coffee
-
-The browser emits these events when a user selects a navigational control. 
-
-* ``seq_goto`` is emitted when a user jumps between units in a sequence. 
-
-* ``seq_next`` is emitted when a user navigates to the next unit in a sequence.
-
-* ``seq_prev`` is emitted when a user navigates to the previous unit in a
-  sequence.
-
-**Component**: Sequence 
-
-.. **Question:** what does a "sequence" correspond to in Studio? a subsection?
-
-**Event Source**: Browser
-
-``event`` **Member Fields**: 
-
-All of the navigational events add the same fields to the ``event`` dict field:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``id``
-     - integer
-     - The edX ID of the sequence. 
-   * - ``new``
-     - integer
-     - For ``seq_goto``, the index of the unit being jumped to. 
-       
-       For ``seq_next`` and ``seq_prev``, the index of the unit being navigated
-       to.
-
-   * - ``old``
-     - integer
-     - For ``seq_goto``, the index of the unit being jumped from. 
-       
-       For ``seq_next`` and ``seq_prev``, the index of the unit being navigated
-       away from.
-
-
-``page_close``
----------------
-
-An additional type of event, ``page_close``, originates from within the
-JavaScript Logger itself.
-
-.. what is the function of the Logger? what value do the events that it logs have? is event_source by any chance set to 'task' for these?
-
-**Component**: JavaScript Logger
-
-**Event Source**: Browser
-
-``event`` **Member Fields**: None
-
-.. _video:
-
-==============================
-Video Interaction Events 
-==============================
-
-.. video_player_spec.js, lms-modules.js
-
-The browser or mobile device emits these events when a user works with a video.
-
-**Component**: Video
-
-**Event Source**: Browser or mobile
-
-**History**: Updated 16 Oct 2014 to include data applicable when the
-``event_source`` is a mobile device.
-
-``play_video``, ``pause_video``
----------------------------------
-
-* The browser or mobile device emits ``play_video`` events when the user clicks
-  the video **play** control.
-
-* The browser or mobile device emits ``pause_video`` events when the user
-  clicks the video **pause** control. The browser or mobile device also emits
-  these events when the video player reaches the end of the video file and play
-  automatically stops.
-
-**History**: Updated 16 Oct 2014 to include fields that apply to events with an
-``event_source`` of mobile only.
-
-``context`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details and Member Fields
-   * - ``client``
-     - dict
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Includes member dictionaries and fields for special context data passed
-       from Segment.io.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-   * - ``received_at``
-     - float
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Indicates the time at which Segment.io received the event.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-
-``event`` **Member Fields**: These events have the same additional ``event``
-member fields.
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``code``
-     - string
-     - For YouTube videos, the ID of the video being loaded (for example,
-       OEyXaRPEzfM). 
-
-       For non-YouTube videos, 'html5'.
-
-   * - ``currentTime``
-     - float
-     - Time the video was played, in seconds. To be deprecated.
-   * - ``current_time``
-     - integer
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       **History**:
-       Added 16 Oct 2014.
-
-   * - ``id``
-     - string
-     - For events with an ``event_source`` of 'browser', the optional name
-       value that the course creators supply or the system-generated hash code
-       for the video being watched. 
-
-       For example, ``0b9e39477cf34507a7a48f74be381fdd``.
-       
-       This value is part of the ``courseware_studentmodule.module_id``. See
-       :ref:`courseware_studentmodule`.
-
-       **History**: In October 2014, identifiers for some new courses began to
-       use the format shown above. Other new courses, and all courses created
-       prior to October 2014, use an html-escaped version of the
-       ``courseware_studentmodule.module_id``. For example, 
-       ``i4x-HarvardX-PH207x-video-Simple_Random_Sample``.
-
-   * - ``module_id``
-     - string
-     - For events with an ``event_source`` of 'mobile', the full identifier for
-       the video component.
-
-       For example,
-
-       ``block-v1:edX+DemoX+Demo_2014+type@problem+block@303034da25524878a2e66fb57c91cf85``
-
-       **History**: Added 16 Oct 2014. In October 2014, identifiers for some
-       new courses began to use the format shown above. Other new courses, and
-       all courses created prior to October 2014, use the format
-       ``i4x://MITx/4.605x_2/video/8b375e7e9c6d419c92a5cdc32f47d4f2``.
-
-   * - ``name``
-     - string
-     - ``edx.video.played`` or ``edx.video.paused``
-       
-       Applies to events with an ``event_source`` of mobile only.
-
-       **History**: Added 16 Oct 2014.
-
-   * - ``speed``
-     - string
-     - Video speed in use: '0.75', '1.0', '1.25', '1.50'.
-
-
-Example 
------------
-
-.. code-block:: json
-
-    {
-       "username": "xxx",
-        "event_type": "play_video",
-        "ip": "",
-        "agent": "Dalvik\/1.6.0 (Linux; U; Android 4.4.2; SM-G900H Build\/KOT49H)",
-        "host": "mobile3.m.sandbox.edx.org",
-        "event": {
-          "current_time": 0,
-          "code": "html5",
-          "module_id": "i4x:\/\/MITx\/4.605x_2\/video\/8b375e7e9c6d419c92a5cdc32f47d4f2",
-          "currentTime": 0
-        },
-        "event_source": "mobile",
-        "name": "edx.video.played",
-        "context": {
-          "user_id": 11,
-          "org_id": "MITx",
-          "client": {
-            "network": {
-              "carrier": "",
-              "wifi": true,
-              "cellular": false,
-              "bluetooth": false
-            },
-            "locale": "en-GB",
-            "app": {
-              "name": "edX",
-              "packageName": "org.edx.mobile",
-              "version": "0.1.5 MobileN",
-              "build": "org.edx.mobile@22",
-              "versionName": "0.1.5 MobileN",
-              "versionCode": 22
-            },
-            "integrations": {
-              "all": true
-            },
-            "library": {
-              "version": 203,
-              "name": "analytics-android",
-              "versionName": "2.0.3"
-            },
-            "traits": {
-              "username": "xxx",
-              "event_source": "mobile",
-              "name": "abcd",
-              "userId": "11",
-              "anonymousId": "4483e039-77a1-44d7-a68a-d18fcde8345d",
-              "email": "abcd@gmail.com"
-            },
-            "device": {
-              "model": "SM-G900H",
-              "userId": "ae5ada65ad732397",
-              "name": "k3g",
-              "manufacturer": "samsung"
-            },
-            "userAgent": "Dalvik\/1.6.0 (Linux; U; Android 4.4.2; SM-G900H Build\/KOT49H)",
-            "os": {
-              "version": "4.4.2",
-              "name": "REL",
-              "sdk": 19
-            },
-            "screen": {
-              "densityBucket": "xxhdpi",
-              "density": 3,
-              "height": 1920,
-              "width": 1080,
-              "densityDpi": 480,
-              "scaledDensity": 3
-            }
-          },
-          "received_at": "2014-10-10T13:06:50.641000+00:00",
-          "course_id": "MITx\/4.605x_2\/3T2014",
-          "path": "\/segmentio\/event"
-        },
-        "time": "2014-10-10T13:05:00+00:00",
-        "page": "http:\/\/mobileN.m.edx.org\/courses\/MITx\/4.605x_2\/3T2014\/courseware\/37568827279b4f70884c996e8d39f3aa\/74d6463a1b2d4a88a4e954a0dfacaf87\/4"
-    }
-
-``stop_video``
---------------------
-
-The browser or mobile device emits  ``stop_video`` events when the video player
-reaches the end of the video file and play automatically stops.
-
-**History**: Added 25 June 2014. Updated 16 Oct 2014 to include fields that
-apply to events with an ``event_source`` of mobile only.
-
-``context`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details and Member Fields
-   * - ``client``
-     - dict
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Includes member dictionaries and fields for special context data passed
-       from Segment.io.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-   * - ``received_at``
-     - float
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Indicates the time at which Segment.io received the event.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``currentTime``
-     - float
-     - Time the video ended, in seconds. To be deprecated.
-   * - ``current_time``
-     - integer
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       **History**: Added 16 Oct 2014.
-
-   * - ``name``
-     - string
-     - ``edx.video.stopped``
-       
-       Applies to events with an ``event_source`` of mobile only. 
-
-       **History**: Added 16 Oct 2014.
-
-
-``seek_video``
------------------
-
-The browser or mobile device emits ``seek_video`` events when a user clicks the
-playback bar or transcript to go to a different point in the video file.
-
-**History**: Prior to 25 Jun 2014, the ``old_time`` and ``new_time`` were set
-to the same value. Updated 16 Oct 2014 to include fields that apply to events
-with an ``event_source`` of mobile only.
-
-``context`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details and Member Fields
-   * - ``client``
-     - dict
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Includes member dictionaries and fields for special context data passed
-       from Segment.io.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-   * - ``received_at``
-     - float
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Indicates the time at which Segment.io received the event.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``name``
-     - string
-     - ``edx.video.seeked``
-       
-       Applies to events with an ``event_source`` of mobile only.
-       
-       **History**: Added 16 Oct 2014.
-
-   * - ``new_time``
-     - integer
-     - The time in the video, in seconds, that the user selected as the
-       destination point.
-   * - ``old_time``
-     - integer
-     - The time in the video, in seconds, at which the user chose to go to a
-       different point in the file.
-   * - ``type``
-     - string
-     - The navigational method used to change position within the video.
-       
-       'onCaptionSeek', 'onSlideSeek', or 'onSkipSeek'.
-
-
-``speed_change_video`` 
-------------------------
-
-The browser or mobile device emits ``speed_change_video`` events when a user
-selects a different playing speed for the video.
-
-**History**: Prior to 12 Feb 2014, this event was emitted when the user
-selected either the same speed or a different speed. Updated 16 Oct 2014 to
-include fields that apply to events with an ``event_source`` of mobile only.
-
-``context`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details and Member Fields
-   * - ``client``
-     - dict
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Includes member dictionaries and fields for special context data passed
-       from Segment.io.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-   * - ``received_at``
-     - float
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Indicates the time at which Segment.io received the event.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``current_time``
-     - integer
-     - The time in the video that the user chose to change the playing speed. 
-   * - ``name``
-     - string
-     - ``edx.video.speed.changed``
-       
-       Applies to events with an ``event_source`` of mobile only. 
-
-       **History**: Added 16 Oct 2014. 
-
-   * - ``new_speed``
-     - 
-     - The speed that the user selected for the video to play. 
-   * - ``old_speed``
-     - 
-     - The speed at which the video was playing. 
-
-``load_video``
------------------
-
-The browser or mobile device emits  ``load_video`` events when the video is
-fully rendered and ready to play.
-
-**History**: Updated 16 Oct 2014 to include fields that apply to events with an
-``event_source`` of mobile only.
-
-``context`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details and Member Fields
-   * - ``client``
-     - dict
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Includes member dictionaries and fields for special context data passed
-       from Segment.io.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-   * - ``received_at``
-     - float
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Indicates the time at which Segment.io received the event.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``code``
-     - string
-     - For YouTube videos, the ID of the video being loaded (for example,
-       OEyXaRPEzfM). 
-
-       For non-YouTube videos, 'html5'.
-
-   * - ``name``
-     - string
-     - ``edx.video.loaded``
-
-       Applies to events with an ``event_source`` of mobile only.
-
-       **History**: Added 16 Oct 2014.
-
-
-``hide_transcript``
--------------------
-
-The browser or mobile device emits  ``hide_transcript`` events when the user
-clicks **CC** to suppress display of the video transcript.
-
-**History**: Updated 16 Oct 2014 to include fields that apply to events with an
-``event_source`` of mobile only.
-
-``context`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details and Member Fields
-   * - ``client``
-     - dict
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Includes member dictionaries and fields for special context data passed
-       from Segment.io.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-   * - ``received_at``
-     - float
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Indicates the time at which Segment.io received the event.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``code``
-     - string
-     - For YouTube videos, the ID of the video being loaded (for example,
-       OEyXaRPEzfM). For non-YouTube videos, 'html5'.
-   * - ``currentTime``
-     - float
-     - The point in the video file at which the transcript was hidden, in
-       seconds. To be deprecated.
-   * - ``current_time``
-     - integer
-     - Applies to events with an ``event_source`` of mobile only. **History**:
-       Added 16 Oct 2014.
-   * - ``name``
-     - string
-     - ``edx.video.transcript.hide.clicked``
-       
-       Applies to events with an ``event_source`` of mobile only.
-
-       **History**: Added 16 Oct 2014.
-
-
-``show_transcript``
---------------------
-
-The browser or mobile device emits  ``show_transcript`` events when the user
-clicks **CC** to display the video transcript.
-
-**History**: Updated 16 Oct 2014 to include fields that apply to events with an
-``event_source`` of mobile only.
-
-``context`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details and Member Fields
-   * - ``client``
-     - dict
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Includes member dictionaries and fields for special context data passed
-       from Segment.io.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-   * - ``received_at``
-     - float
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       Indicates the time at which Segment.io received the event.
-
-       The data in this field reflects a third party integration and is subject
-       to change at any time without notice.
-
-       **History**: Added 16 Oct 2014.
-
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``code``
-     - string
-     - For YouTube videos, the ID of the video being loaded (for example,
-       OEyXaRPEzfM). 
-
-       For non-YouTube videos, 'html5'.
-
-   * - ``currentTime``
-     - float
-     - The point in the video file at which the transcript was opened, in
-       seconds. To be deprecated.
-   * - ``current_time``
-     - integer
-     - Applies to events with an ``event_source`` of mobile only. 
-       
-       **History**: Added 16 Oct 2014.
-
-   * - ``name``
-     - string
-     - ``edx.video.transcript.show.clicked``
-       
-       Applies to events with an ``event_source`` of mobile only.
-       
-       **History**: Added 16 Oct 2014.
-
-
-.. _pdf:
-
-=================================
-Textbook Interaction Events   
-=================================
-
-.. pdf-analytics.js
-
-``book``
-----------
-
-The browser emits ``book`` events when a user navigates within the PDF Viewer
-or the PNG Viewer.
-
-* For textbooks in PDF format, the URL in the common ``page`` field contains
-  '/pdfbook/'.
-* For textbooks in PNG format, the URL in the common ``page`` field contains
-  '/book/'.
-
-**Component**: PDF Viewer, PNG Viewer 
-
-**Event Source**: Browser
-
-**History**: This event changed on 16 Apr 2014 to include ``event`` member
-fields ``name`` and ``chapter``.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``chapter``
-     - string
-     - The name of the PDF file. 
-       **History**: Added for events produced by the PDF Viewer on 16 Apr 2014.
-   * - ``name``
-     - string
-     -  
-       * For 'gotopage', set to ``textbook.pdf.page.loaded``.
-       * For 'prevpage', set to ``textbook.pdf.page.navigatedprevious``. 
-       * For 'nextpage', set to ``textbook.pdf.page.navigatednext``. 
-       
-       **History**: Added for events produced by the PDF Viewer on 16 Apr 2014.
-   * - ``new``
-     - integer
-     - Destination page number.
-   * - ``old``
-     - integer
-     - The original page number. Applies to 'gotopage' event types only. 
-   * - ``type``
-     - string
-     -  
-       * 'gotopage' is emitted when a page loads after the student manually
-         enters its number.
-       * 'prevpage' is emitted when the next page button is clicked.
-       * 'nextpage' is emitted when the previous page button is clicked.
-
-
-``textbook.pdf.thumbnails.toggled``
-------------------------------------
-
-The browser emits ``textbook.pdf.thumbnails.toggled`` events when a user clicks
-on the icon to show or hide page thumbnails.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``chapter``
-     -  string
-     -  The name of the PDF file.
-   * - ``name``
-     - string
-     - ``textbook.pdf.thumbnails.toggled``
-   * -  ``page``
-     -  integer
-     -  The number of the page that is open when the user clicks this icon. 
-
-``textbook.pdf.thumbnail.navigated``
-------------------------------------
-
-The browser emits ``textbook.pdf.thumbnail.navigated`` events when a user
-clicks on a thumbnail image to navigate to a page.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``chapter`` 
-     - string
-     - The name of the PDF file. 
-   * - ``name``
-     - string
-     - ``textbook.pdf.thumbnail.navigated``
-   * - ``page``
-     - integer
-     - The page number of the thumbnail clicked.
-   * - ``thumbnail_title``
-     - string
-     - The identifying name for the destination of the thumbnail. For example,
-       Page 2.
-
-``textbook.pdf.outline.toggled``
-------------------------------------
-
-The browser emits ``textbook.pdf.outline.toggled`` events when a user clicks
-the outline icon to show or hide a list of the book's chapters.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``chapter`` 
-     - string
-     - The name of the PDF file.
-   * - ``name``
-     - string
-     - ``textbook.pdf.outline.toggled``
-   * - ``page`` 
-     - integer
-     - The number of the page that is open when the user clicks this link.
-
-``textbook.pdf.chapter.navigated``
-------------------------------------
-
-The browser emits ``textbook.pdf.chapter.navigated`` events when a user clicks
-on a link in the outline to navigate to a chapter.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``chapter``
-     - string
-     - The name of the PDF file.
-   * - ``chapter_title``
-     - string
-     - The identifying name for the destination of the outline link. 
-   * - ``name``
-     - string
-     - ``textbook.pdf.chapter.navigated``
-     
-``textbook.pdf.page.navigated``
-------------------------------------
-
-The browser emits ``textbook.pdf.page.navigated`` events when a user manually
-enters a page number.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``chapter``
-     - string
-     - The name of the PDF file.
-   * - ``name``
-     - string
-     - ``textbook.pdf.page.navigated``
-   * - ``page``
-     - integer
-     - The destination page number entered by the user.
-
-``textbook.pdf.zoom.buttons.changed``
---------------------------------------
-
-The browser emits ``textbook.pdf.zoom.buttons.changed`` events when a user
-clicks either the Zoom In or Zoom Out icon.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``chapter``
-     - string
-     - The name of the PDF file.
-   * - ``direction``
-     -  string
-     -  'in', 'out'
-   * - ``name``
-     - string
-     - ``textbook.pdf.zoom.buttons.changed``
-   * - ``page``
-     - integer
-     - The number of the page that is open when the user clicks the icon.
-
-``textbook.pdf.zoom.menu.changed``
-------------------------------------
-
-The browser emits ``textbook.pdf.zoom.menu.changed`` events when a user selects
-a magnification setting.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``amount``
-     - string
-     - '1', '0.75', '1.5', 'custom', 'page_actual', 'auto', 'page_width',
-       'page_fit'.
-   * - ``chapter``
-     - string
-     - The name of the PDF file.
-   * - ``name``
-     - string
-     - ``textbook.pdf.zoom.menu.changed``
-   * - ``page``
-     - integer
-     - The number of the page that is open when the user selects this value.
-
-``textbook.pdf.display.scaled``
-------------------------------------
-
-The browser emits ``textbook.pdf.display.scaled`` events when the display
-magnification changes. These changes occur after a student selects a
-magnification setting from the zoom menu or resizes the browser window.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``amount``
-     - string
-     - The magnification setting; for example, 0.95 or 1.25.
-   * - ``chapter``
-     - string
-     - The name of the PDF file. 
-   * - ``name``
-     - string
-     - ``textbook.pdf.display.scaled``
-   * - ``page`` 
-     - integer
-     - The number of the page that is open when the scaling takes place.
-
-``textbook.pdf.display.scrolled``
-------------------------------------
-
-The browser emits ``textbook.pdf.display.scrolled`` events each time the
-displayed page changes while a user scrolls up or down.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``chapter``
-     - string
-     - The name of the PDF file. 
-   * - ``direction``
-     - string
-     - 'up', 'down' 
-   * - ``name``
-     - string
-     - ``textbook.pdf.display.scrolled``
-   * - ``page``
-     - integer
-     - The number of the page that is open when the scrolling takes place.
-
-``textbook.pdf.search.executed``
-------------------------------------
-
-The browser emits ``textbook.pdf.search.executed`` events when a user searches
-for a text value in the file. To reduce the number of events produced, instead
-of producing one event per entered character this event defines a search string
-as the set of characters that is consecutively entered in the search field
-within 500ms of each other.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-
-   * - Field
-     - Type
-     - Details
-   * - ``caseSensitive``
-     - boolean
-     - 'true' if the case sensitive option is selected. 
-       
-       'false' if this option is not selected.
-
-   * - ``chapter``
-     - string
-     - The name of the PDF file. 
-   * - ``highlightAll``
-     - boolean
-     - 'true' if the option to highlight all matches is selected. 
-       
-       'false' if this option is not selected.
-
-   * - ``name``
-     - string
-     - ``textbook.pdf.search.executed``
-   * - ``page``
-     - integer
-     - The number of the page that is open when the search takes place.
-   * - ``query``
-     - string
-     - The value in the search field.
-   * - ``status``
-     - string
-     - A "not found" status phrase for a search string that is unsuccessful.
-       
-       Blank for successful search strings.
-
-
-``textbook.pdf.search.navigatednext``
----------------------------------------------
-
-The browser emits ``textbook.pdf.search.navigatednext`` events when a user
-clicks on the Find Next or Find Previous icons for an entered search string.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``caseSensitive``
-     - boolean
-     - 'true' if the case sensitive option is selected. 
-       
-       'false' if this option is not selected.
-
-   * - ``chapter``
-     - string
-     - The name of the PDF file. 
-   * - ``findprevious``
-     - boolean
-     - 'true' if the user clicks the Find Previous icon. 
-       
-       'false' if the user clicks the Find Next icon.
-
-   * - ``highlightAll``
-     - boolean
-     - 'true' if the option to highlight all matches is selected. 
-       
-       'false' if this option is not selected.
-
-   * - ``name``
-     - string
-     - ``textbook.pdf.search.navigatednext`` 
-   * - ``page``
-     - integer
-     - The number of the page that is open when the search takes place.
-   * - ``query``
-     - string
-     - The value in the search field.
-   * - ``status``
-     -  string
-     - A "not found" status phrase for a search string that is unsuccessful.
-       
-       Blank for successful search strings.
-
-
-``textbook.pdf.search.highlight.toggled``
----------------------------------------------
-
-The browser emits ``textbook.pdf.search.highlight.toggled`` events when a user
-selects or clears the **Highlight All** option for a search.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``caseSensitive``
-     - boolean
-     - 'true' if the case sensitive option is selected. 
-       
-       'false' if this option is not selected.
-
-   * - ``chapter``
-     - string
-     - The name of the PDF file. 
-   * - ``highlightAll``
-     - boolean
-     - 'true' if the option to highlight all matches is selected. 
-       
-       'false' if this option is not selected.
-
-   * - ``name``
-     - string
-     - ``textbook.pdf.search.highlight.toggled``
-   * - ``page``
-     - integer
-     - The number of the page that is open when the search takes place.
-   * - ``query``
-     - string
-     - The value in the search field. 
-   * - ``status``
-     - string
-     - A "not found" status phrase for a search string that is unsuccessful.
-       
-       Blank for successful search strings.
-
-
-``textbook.pdf.search.casesensitivity.toggled``
-------------------------------------------------------
-
-The browser emits ``textbook.pdf.search.casesensitivity.toggled`` events when a
-user selects or clears the **Match Case** option for a search.
-
-**Component**: PDF Viewer 
-
-**Event Source**: Browser
-
-**History**: This event was added on 16 Apr 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``caseSensitive``
-     - boolean
-     - 'true' if the case sensitive option is selected. 
-       
-       'false' if this option is not selected.
-
-   * - ``chapter``
-     - string
-     - The name of the PDF file. 
-   * - ``highlightAll``
-     - boolean
-     - 'true' if the option to highlight all matches is selected.
-       
-       'false' if this option is not selected.
-
-   * - ``name``
-     - string
-     - ``textbook.pdf.search.casesensitivity.toggled``
-   * - ``page``
-     - integer
-     - The number of the page that is open when the search takes place.
-   * - ``query``
-     - string
-     - The value in the search field.
-   * - ``status``
-     -  string
-     - A "not found" status phrase for a search string that is unsuccessful.
-       
-       Blank for successful search strings.
-
-
-.. _problem:
-
-=================================
-Problem Interaction Events 
-=================================
-
-.. lms-modules.js These events are Capa Module
-
-Problem interaction events are emitted by the server or the browser to capture
-information about interactions with problems, specifically, problems defined in
-the edX Capa module.
-
-``problem_check`` (Browser)
-----------------------------
-
-.. no sample to check
-
-Both browser interactions and server requests produce ``problem_check`` events.
-The browser emits ``problem_check`` events when a user checks a problem.
-
-**Event Source**: Browser 
-
-``event`` **Member Fields**: For browser-emitted ``problem_check`` events, the
-``event`` field contains the values of all input fields from the problem being
-checked, styled as GET parameters.
-
-``problem_check`` (Server)
-----------------------------
-
-.. no sample to check
-
-Both browser interactions and server requests produce ``problem_check`` events.
-
-The server emits ``problem_check`` events when a problem is successfully
-checked.
-  
-**Event Source**: Server
-
-**History**: 
-
-* On 5 Mar 2014, the ``submission`` dictionary was added to the ``event`` field
-  and  ``module`` was added to the ``context`` field.
-
-* Prior to 15 Oct 2013, this server-emitted event was named
-  ``save_problem_check``.
-
-* Prior to 15 Jul 2013, this event was emitted twice for the same action.
-
-``context`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``module``
-     - dict
-     - Provides the specific problem component as part of the context. 
-       
-       Contains the member field ``display_name``, which is the string value
-       for the **Display Name** given to the problem component.
-
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``answers``
-     - dict
-     - The problem ID and the internal answer identifier in a name:value pair.
-       For a component with multiple problems, lists every problem and
-       answer.
-   * - ``attempts``
-     - integer
-     - The number of times the user attempted to answer the problem.
-   * - ``correct_map``
-     - dict
-     - For each problem ID value listed by ``answers``, provides:
-       
-       * ``correctness``: string; 'correct', 'incorrect'
-       * ``hint``: string; Gives optional hint. Nulls allowed. 
-       * ``hintmode``: string; None, 'on_request', 'always'. Nulls allowed. 
-       * ``msg``: string; Gives extra message response.
-       * ``npoints``: integer; Points awarded for this ``answer_id``. Nulls allowed.
-       * ``queuestate``: dict; None when not queued, else ``{key:'', time:''}``
-         where ``key`` is a secret string dump of a DateTime object in the form
-         '%Y%m%d%H%M%S'. Nulls allowed. 
-
-   * - ``grade``
-     - integer
-     - Current grade value. 
-   * - ``max_grade``
-     - integer
-     - Maximum possible grade value.
-   * - ``problem_id``
-     - string
-     - ID of the problem that was checked.
-   * - ``state``
-     - dict
-     - Current problem state.
-   * - ``submission``
-     - object
-     - Provides data about the response made. 
-       
-       For components that include multiple problems, a separate submission
-       object is provided for each one.
-
-       * ``answer``: string; The value that the student entered, or the display
-         name of the value selected.
-       * ``correct``: Boolean; 'true', 'false'
-       * ``input_type``: string; The type of value that the student supplies
-         for the ``response_type``. Based on the XML element names used in the
-         Advanced Editor. Examples include 'checkboxgroup', 'radiogroup',
-         'choicegroup', and 'textline'.
-       * ``question``: string; Provides the text of the question.
-       * ``response_type``: string; The type of problem. Based on the XML
-         element names used in the Advanced  Editor. Examples include
-         'choiceresponse', 'optionresponse', and 'multiplechoiceresponse'.
-       * ``variant``: integer; For problems that use problem randomization
-         features such as answer pools or choice shuffling, contains the unique
-         ID of the variant that was presented to this user. 
-
-   * - ``success``
-     - string
-     - 'correct', 'incorrect' 
-
-``problem_check_fail``
------------------------------
-
-.. no sample to check
-
-The server emits ``problem_check_fail`` events when a problem cannot be checked
-successfully.
-
-**Event Source**: Server
-
-**History**: Prior to 15 Oct 2013, this event was named
-``save_problem_check_fail``.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``answers`` 
-     - dict
-     - 
-   * - ``failure`` 
-     - string
-     - 'closed', 'unreset'
-   * - ``problem_id``
-     - string
-     - ID of the problem being checked.
-   * - ``state``  
-     - dict
-     - Current problem state.
-
-``problem_reset``
---------------------
-
-The browser emits ``problem_reset`` events when a user clicks **Reset** to
-reset the answer to a problem.
-
-.. return Logger.log('problem_reset', [_this.answers, response.contents], _this.id);
-
-**Event Source**: Browser
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``answers``
-     - string
-     - The value reset by the user. 
-
-``problem_rescore``
------------------------------
-
-.. no sample to check
-
-The server emits ``problem_rescore`` events when a problem is successfully
-rescored.
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``attempts``
-     - integer
-     - 
-   * - ``correct_map``
-     - dict
-     - See the fields for the ``problem_check`` server event above.
-   * - ``new_score`` 
-     - integer
-     - 
-   * - ``new_total``
-     - integer
-     - 
-   * - ``orig_score``
-     - integer
-     - 
-   * - ``orig_total``
-     - integer
-     - 
-   * - ``problem_id``
-     - string
-     - ID of the problem being rescored.
-   * - ``state``
-     - dict
-     - Current problem state.
-   * - ``success``
-     - string
-     - 'correct', 'incorrect'
-
-``problem_rescore_fail``
------------------------------
-
-.. no sample to check
-
-The server emits ``problem_rescore_fail`` events when a problem cannot be
-successfully rescored.
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``failure`` 
-     - string
-     - 'unsupported', 'unanswered', 'input_error', 'unexpected'
-   * - ``problem_id``
-     - string
-     - ID of the problem being checked.
-   * - ``state``
-     - dict
-     - Current problem state. 
-
-``problem_save``
------------------------------
-
-.. no sample to check
-
-The browser emits ``problem_save`` events when a user saves a problem.
-
-**Event Source**: Browser
-
-``event`` **Member Fields**: None
-
-``problem_show``
------------------------------
-
-.. no sample to check
-
-The browser emits ``problem_show`` events when a problem is shown.  
-
-.. %%
-
-**Event Source**: Browser
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``problem``
-     - string
-     - The optional name value that the course creators supply or the 
-       system-generated hash code for the problem being shown.
-
-       For example, ``input_303034da25524878a2e66fb57c91cf85_2_1`` or
-       ``303034da25524878a2e66fb57c91cf85_2_1``.
-       
-       This value is based on part of the
-       ``courseware_studentmodule.module_id``. See
-       :ref:`courseware_studentmodule`.
-
-       **History**: In October 2014, identifiers for some new courses began to
-       use the format shown above. Other new courses, and all courses created
-       prior to October 2014, use an html-escaped version of the
-       ``courseware_studentmodule.module_id``. For example,
-       i4x://MITx/6.00x/problem/L15:L15_Problem_2.
-
-``reset_problem``
-------------------------------------------------
-
-.. no sample to check
-
-The server emits ``reset_problem`` events when a problem has been reset
-successfully.
-
-.. %%what is the difference between reset_problem and problem_reset?
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``new_state``
-     - dict
-     - New problem state.  
-   * - ``old_state``
-     - dict
-     - The state of the problem before the reset was performed. 
-   * - ``problem_id``
-     - string
-     - ID of the problem being reset.
-
-``reset_problem_fail`` 
-------------------------------------------------
-
-.. no sample to check
-
-The server emits ``reset_problem_fail`` events when a problem cannot be reset
-successfully.
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details 
-   * - ``failure``
-     - string
-     - 'closed', 'not_done'
-   * - ``old_state``
-     - dict
-     - The state of the problem before the reset was requested.
-   * - ``problem_id``
-     - string
-     - ID of the problem being reset. 
-
-``show_answer`` 
-------------------------------------------------
-
-.. no sample to check
-
-The server emits ``show_answer`` events when the answer to a problem is shown. 
-
-**Event Source**: Server
-
-**History**: The original name for this event was ``showanswer``. 
-
-.. **Question** is this renaming info correct?
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``problem_id``
-     - string
-     - EdX ID of the problem being shown. 
-
-``save_problem_fail`` 
-------------------------------------------------
-
-.. no sample to check
-
-The server emits ``save_problem_fail``  events when a problem cannot be saved
-successfully.
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``answers`` 
-     - dict
-     - 
-   * - ``failure`` 
-     - string
-     - 'closed', 'done' 
-   * - ``problem_id``
-     - string
-     - ID of the problem being saved. 
-   * - ``state``
-     - dict
-     - Current problem state.
-
-``save_problem_success`` 
-------------------------------------------------
-
-.. no sample to check
-
-The server emits ``save_problem_success`` events when a problem is saved
-successfully.
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``answers``
-     -  dict
-     -  
-   * - ``problem_id``
-     - string
-     - ID of the problem being saved. 
-   * - ``state``
-     - dict
-     - Current problem state. 
-
-``problem_graded``
--------------------
-
-.. return Logger.log('problem_graded', [_this.answers, response.contents], _this.id);
-
-The server emits a ``problem_graded`` event each time a user clicks **Check**
-for a problem and it is graded successfully.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``[answers, contents]``
-     - array
-     - ``answers`` provides the value checked by the user. 
-       
-       ``contents`` delivers HTML using data entered for the problem in Studio,
-       including the display name, problem text, and choices or response field
-       labels.
-
-       The array includes each problem in a problem component that has multiple
-       problems.
-
-
-.. _forum_events:
-
-==========================
-Forum Events
-==========================
-
-``edx.forum.searched``
-----------------------------------
-
-After a user executes a text search in the navigation sidebar of the course
-**Discussion** page, the server emits an ``edx.forum.searched`` event.
-
-**Component**: Discussion
-
-**Event Source**: Server
-
-**History**: Added 16 May 2014.  The ``corrected_text`` field was added 5
-Jun 2014. The ``group_id`` field was added 7 October 2014.
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``corrected_text``
-     - string
-     - A re-spelling of the query, suggested by the search engine, which was
-       automatically substituted for the original one. 
-
-       This happens only when there are no results for the original query, but
-       the index contains matches for a similar term or phrase.
-
-       Otherwise, this field is null.
-
-   * - ``group_id``
-     - integer
-     - The numeric ID of the cohort group to which the user's search is
-       restricted, or ``null`` if the search is not restricted in this way. 
-
-       In a course with cohorts enabled, a student's searches will always be
-       restricted to the student's cohort group. 
-
-       Discussion admins, moderators, and Community TAs in such a course can
-       search all discussions without specifying a cohort group, which leaves
-       this field ``null``, or they can specify a single cohort group to
-       search.
-
-   * - ``page``
-     - integer
-     - Results are returned in sets of 20 per page. 
-       
-       Identifies the page of results requested by the user.
-
-   * - ``query``
-     - string
-     - The text entered into the search box by the user.
-   * - ``total_results``
-     - integer
-     - The total number of results matching the query.
-
-.. _ora2:
-
-======================================
-Open Response Assessment Events 
-======================================
-
-In an open response assessment, students review a question and then submit a
-text response and, optionally, an image file. To evaluate their own and one or
-more other students' responses to the questions, students use an instructor-
-definfed scoring rubric. For more information about open response assessments,
-see `Creating a Peer Assessment`_.
-
-**Component**: Open Response Assessments
-
-**History:** The open response assessment feature was released in August 2014;
-limited release of this feature began in April 2014.
-
-openassessmentblock.get_peer_submission
-----------------------------------------
-
-After students submit their own responses for evaluation, they use the scoring
-rubric to evaluate the responses of other course participants. The server emits
-this event when a response is delivered to a student for evaluation.
-
-**Event Source**: Server
-
-**History**: Added 3 April 2014.
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``course_id``
-     - string
-     - The identifier of the course that includes this assessment. For open
-       response assessment problems, the course ID is stated in org/course/run
-       format. 
-
-       (For courses created after mid-2014, the course ID is converted to this
-       format for open response assessment problems only.)
-
-   * - ``item_id``
-     - string
-     - The i4x:// style locator that identifies the problem in the course. 
-   * - ``requesting_student_id``
-     - string
-     - The course-specific anonymized user ID of the student who requested the
-       response.
-   * - ``submission_returned_uuid``
-     - string
-     - The unique identifer of the response that the student retrieved for
-       assessment. 
-
-       If no assessment is available, this is set to "None".
-
-       
-openassessmentblock.peer_assess and openassessmentblock.self_assess
-----------------------------------------------------------------------
-
-The server emits this event when a student either submits an assessment of a
-peer's response or submits a self-assessment of her own response.
-
-**Event Source**: Server
-
-**History**: Added 3 April 2014.
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``feedback``
-     - string
-     - The student's comments about the submitted response.
-   * - ``parts: [criterion, option, feedback]``
-     - array
-     - The ``parts`` field contains member fields for each ``criterion`` in the
-       rubric, the ``option`` that the student selected for it, and any
-       ``feedback`` comments that the student supplied. 
-
-       These member fields are repeated in an array to include all of the
-       rubric's criteria.
-
-       * ``criterion`` (object) contains ``points possible`` and ``name``
-         member fields
-       * ``option`` (string)
-       * ``feedback`` (string)
-
-       When the only criterion in the rubric is student feedback, ``points
-       possible`` is 0 and the ``option`` field is not included.
-       
-   * - ``rubric``
-     - dict
-     - This field contains the member field ``contenthash``, which identifies
-       the rubric that the student used to assess the response.
-   * - ``scored_at``
-     - datetime
-     - Timestamp for when the assessment was submitted.
-   * - ``scorer_id``
-     - string
-     - The course-specific anonymized user ID of the student who submitted this
-       assessment.
-   * - ``score_type``
-     - string
-     - "PE" for a peer evaluation, "SE" for a self evaluation.
-   * - ``submission_uuid``
-     - string
-     - The unique identifier for the submitted response.
-
-openassessmentblock.submit_feedback_on_assessments
-----------------------------------------------------
-
-The server emits this event when a student submits a suggestion, opinion, or
-other feedback about the assessment process.
-
-**Event Source**: Server
-
-**History**: Added 3 April 2014.
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``feedback_text``
-     - string
-     - The student's comments about the assessment process.
-   * - ``options``
-     - array
-     - The label of each check box option that the student selected to evaluate
-       the assessment process.
-   * - ``submission_uuid``
-     - string
-     - The unique identifier of the feedback.
-
-openassessment.create_submission
---------------------------------
-
-The server emits this event when a student submits a response. The same event
-is emitted when a student submits a response for peer assessment or for self
-assessment.
-
-**Event Source**: Server
-
-**History**: Added 3 April 2014.
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``answer``
-     - dict
-     - This field contains a ``text`` (string) member field for the response. 
-       
-       For responses that also include an image file, this field contains a
-       ``file_upload_key`` (string) member field with the AWS S3 key that
-       identifies the location of the image file on the Amazon S3 storage
-       service. This key is provided for reference only.
-
-   * - ``attempt_number``
-     - int
-     - This value is currently always set to 1.
-   * - ``created_at``
-     - datetime
-     - Timestamp for when the student submitted the response.
-   * - ``submitted_at``
-     - datetime
-     - Timestamp for when the student submitted the response. This value is
-       currently always the same as ``created_at``.
-   * - ``submission_uuid``
-     - string
-     - The unique identifier of the response.
-
-openassessment.save_submission
--------------------------------
-
-The server emits this event when a student saves a response. Students
-save responses before they submit them for assessment.
-
-**Event Source**: Server
-
-**History**: Added 3 April 2014.
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``saved_response``
-     - dict
-     - This field contains a ``text`` (string) member field for the response. 
-       
-       For responses that also include an image file, this field contains a
-       ``file_upload_key`` (string) member field with the AWS S3 key that
-       identifies the location of the image file on the Amazon S3 storage
-       service.
-
-
-openassessment.student_training_assess_example
------------------------------------------------
-
-The server emits this event when a student submits an assessment for an
-example response. To assess the example, the student uses a scoring rubric
-provided by the instructor. These events record the options the student
-selected to assess the example and identifies any criteria that the student
-scored differently than the instructor.
-
-**Event Source**: Server
-
-**History**: Added 6 August 2014.
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``corrections``
-     - object
-     - A set of name/value pairs that identify criteria for which the student
-       selected a different option than the instructor, in the format
-       ``criterion_name: instructor-defined_option_name``.
-   * - ``options_selected``
-     - object
-     - A set of name/value pairs that identify the option that the student
-       selected for each criterion in the rubric, in the format
-       ``'criterion_name': 'option_name'``.
-   * - ``submission_uuid``
-     - string
-     - The unique identifier of the response. Identifies the student who
-       is undergoing training.
-
-openassessment.upload_file 
------------------------------
-
-The browser emits this event when a student successfully uploads an image file
-as part of a response. Students complete the upload process before they submit
-the response.
-
-**Event Source**: Browser
-
-**History**: Added 6 August 2014.
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``fileName``
-     - string
-     - The name of the uploaded file, as stored on the student's client
-       machine.
-   * - ``fileSize``
-     - int
-     - The size of the uploaded file in bytes. Reported by the student's
-       browser.
-   * - ``fileType``
-     - string
-     - The MIME type of the uploaded file. Reported by the student's browser.
-
-.. _AB_Event_Types:
-
-==========================
-A/B Testing Events
-==========================
-
-Course authors can configure course content to present modules that contain
-other modules. For example, a parent module can include two child modules with
-content that differs in some way for comparison testing. When a student
-navigates to a module that is set up for A/B testing in this way, the student
-is randomly assigned to a group and shown only one of the child modules.
-
-* Internally, a *partition* defines the type of experiment: comparing the
-  effectiveness of video alone to text alone, for example. A course can include
-  any number of modules with the same partition, or experiment type.
-
-* For each partition, students are randomly assigned to a *group*. The group
-  determines which content, either video or text in this example, is shown by
-  every module with that partitioning.
-
-The events that follow apply to modules that are set up to randomly assign
-students to groups so that different content can be shown to the different
-groups.
-
-**History**: These events were added on 12 Mar 2014.
-
-``assigned_user_to_partition``
-----------------------------------
-
-When a student views a module that is set up to test different child modules,
-the server checks the ``user_api_usercoursetag`` table for the student's
-assignment to the relevant partition, and to a group for that partition. 
-
-* The partition ID is the ``user_api_usercoursetag.key``.
-
-* The group ID is the ``user_api_usercoursetag.value``.
-
-If the student does not yet have an assignment, the server emits an
-``assigned_user_to_partition`` event and adds a row to the
-``user_api_usercoursetag`` table for the student. See
-:ref:`user_api_usercoursetag`.
-
-.. note:: After this event is emitted, the common ``context`` field in all 
- subsequent events includes a ``course_user_tags`` member field with the
- student's assigned partition and group.
-
-**Component**: Split Test
-
-**Event Source**: Browser
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``group_id``
-     - integer
-     - Identifier of the group.
-   * - ``group_name``
-     - string
-     - Name of the group. 
-   * - ``partition_id``
-     - integer
-     - Identifier for the partition, in the format
-       ``xblock.partition_service.partition_ID`` where ID is an integer.
-   * - ``partition_name``
-     - string
-     - Name of the partition.
-
-``child_render``
-----------------------------------
-
-When a student views a module that is set up to test different content using
-child modules, the server emits a ``child_render`` event to identify
-the child module that was shown to the student.
-
-**Component**: Split Test
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``child_id``
-     - string
-     - ID of the module that displays to the student. 
-       
-       **History**: Renamed on 16 Oct 2014 from ``child-id`` to ``child_id``.
-       
-
-.. _student_cohort_events:
-
-==========================
-Student Cohort Events
-==========================
-
-``edx.cohort.created``
-----------------------------------
-
-When a cohort group is created, the server emits an ``edx.cohort.created``
-event. A member of the course staff can create a cohort group manually via the
-Instructor Dashboard (see :ref:`instructor_cohort_events`). The system
-automatically creates the default cohort group and cohort groups included in
-the course's ``auto_cohort_groups`` setting as they are needed (e.g. when a
-student is assigned to one).
-
-**Event Source**: Server
-
-**History** Added 7 Oct 2014.
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``cohort_id``
-     - integer
-     - The numeric ID of the cohort group.
-   * - ``cohort_name``
-     - string
-     - The display name of the cohort group.
-
-``edx.cohort.user_added``
-----------------------------------
-
-When a user is added to a cohort group, the server emits an
-``edx.cohort.user_added`` event. A member of the course staff can add a user to
-a cohort group manually via the Instructor Dashboard (see
-:ref:`instructor_cohort_events`). The system automatically adds a user to the 
-default cohort group or a cohort group included in the course's 
-``auto_cohort_groups`` setting if the user accesses a discussion but has not 
-yet been assigned to a cohort group.
-
-**Event Source**: Server
-
-**History** Added 7 Oct 2014.
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``cohort_id``
-     - integer
-     - The numeric ID of the cohort group.
-   * - ``cohort_name``
-     - string
-     - The display name of the cohort group.
-   * - ``user_id``
-     - integer
-     - The numeric ID (from auth_user.id) of the added user.
-
-``edx.cohort.user_removed``
-----------------------------------
-
-When a user is removed from a cohort group (by being assigned to a different
-cohort group via the Instructor Dashboard), the server emits an
-``edx.cohort.user_removed`` event.
-
-**Event Source**: Server
-
-**History** Added 7 Oct 2014.
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``cohort_id``
-     - integer
-     - The numeric ID of the cohort group.
-   * - ``cohort_name``
-     - string
-     - The display name of the cohort group.
-   * - ``user_id``
-     - integer
-     - The numeric ID (from auth_user.id) of the removed user.
-
-.. _ora:
-
-============================================
-Open Response Assessment Events (Deprecated)
-============================================
-
-**History**: The events in this section recorded interactions with the
-prototype implementation of open response assessment (ORA) problem types. As of
-May 2014, new courses no longer used this implementation for open response
-assessments.
-
-``oe_hide_question`` and ``oe_show_question``
----------------------------------------------------------------------------
-
-The browser emits ``oe_hide_question`` and ``oe_show_question`` events when the
-user hides or redisplays a combined open-ended problem.
-
-**History**: These events were previously named ``oe_hide_problem`` and
-``oe_show_problem``.
-
-**Component**: Combined Open-Ended
-
-**Event Source**: Browser
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``location``
-     - string
-     - The location of the question whose prompt is being shown or hidden.
-
-``rubric_select`` 
-----------------------
-
-**Component**: Combined Open-Ended
-
-**Event Source**: Browser
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``category``
-     - integer
-     - Rubric category selected.
-   * - ``location``
-     - string
-     - The location of the question whose rubric is being selected. 
-   * - ``selection``
-     - integer
-     - Value selected on rubric. 
-
-``oe_show_full_feedback`` and ``oe_show_respond_to_feedback``
-------------------------------------------------------------------
-
-**Component**: Combined Open-Ended
-
-**Event Source**: Browser
-
-``event`` **Member Fields**: None.
-
-``oe_feedback_response_selected`` 
---------------------------------------------
-
-**Component**: Combined Open-Ended
-
-**Event Source**: Browser
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``value``
-     - integer
-     - Value selected in the feedback response form.
-
-``peer_grading_hide_question`` and ``peer_grading_show_question``
----------------------------------------------------------------------
-
-.. I couldn't find these names in any js file. peer_grading_problem.js includes oe_hide or show_question.
-
-The browser emits ``peer_grading_hide_question`` and
-``peer_grading_show_question`` events when the user hides or redisplays a
-problem that is peer graded.
-
-**History**: These events were previously named ``peer_grading_hide_problem``
-and ``peer_grading_show_problem``.
-
-**Component**: Peer Grading
-
-**Event Source**: Browser
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``location``
-     - string
-     - The location of the question whose prompt is being shown or hidden.
-
-``staff_grading_hide_question`` and ``staff_grading_show_question``
------------------------------------------------------------------------
-
-.. staff_grading.js
-
-The browser emits ``staff_grading_hide_question`` and
-``staff_grading_show_question`` events when the user hides or redisplays a
-problem that is staff graded.
-
-**History**: These events were previously named ``staff_grading_hide_problem``
-and ``staff_grading_show_problem``.
-
-**Component**: Staff Grading
-
-**Event Source**: Browser
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``location``
-     - string
-     - The location of the question whose prompt is being shown or hidden.
-
-.. _Instructor_Event_Types:
-
-*************************
-Instructor Events
-*************************
-
-This section lists the events that the server emits as a result of course team
-interaction with the Instructor Dashboard in the LMS.
-
-The schema definitions of each of these events include only the JSON fields
-that are common to all events. See :ref:`common`.
-
-* ``dump-answer-dist-csv``
-* ``dump-graded-assignments-config``
-* ``dump-grades``
-* ``dump-grades-csv``
-* ``dump-grades-csv-raw``
-* ``dump-grades-raw``
-* ``list-beta-testers``
-* ``list-instructors``
-* ``list-staff``
-* ``list-students``
-
-.. _rescore_all:
-
-======================================================
-``rescore-all-submissions`` and ``reset-all-attempts``
-======================================================
-
-**Component**: Instructor Dashboard
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 40 40
-   :header-rows: 1
-
-   * - Field
-     - Type
-   * - ``course``
-     - string
-   * - ``problem`` 
-     - string
-
-.. _rescore_student:
-
-===================================================================
- ``delete-student-module-state`` and ``rescore-student-submission``
-===================================================================
-
-.. previously a comma-separated list; "Rows identical after the second column" (which means the name and description columns) were combined
-
-**Component**: Instructor Dashboard
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 40 40
-   :header-rows: 1
-
-   * - Field
-     - Type
-   * - ``course``
-     - string
-   * - ``problem``
-     - string
-   * - ``student``
-     - string
-
-.. _reset_attempts:
-
-======================================================
-``reset-student-attempts``
-======================================================
-
-**Component**: Instructor Dashboard
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 40 40
-   :header-rows: 1
-
-   * - Field
-     - Type
-   * - ``course``
-     - string
-   * - ``old_attempts``
-     - string
-   * - ``problem``
-     - string 
-   * - ``student``
-     - string
-
-.. _progress:
-
-======================================================
-``get-student-progress-page`` 
-======================================================
-
-**Component**: Instructor Dashboard
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 40 40
-   :header-rows: 1
-
-   * - Field
-     - Type
-   * - ``course``
-     - string
-   * - ``instructor``
-     - string
-   * - ``student``
-     - string
-
-======================================================
-``add_instructor`` and ``remove_instructor`` 
-======================================================
-
-.. previously a comma-separated list; "Rows identical after the second column" (which means the name and description columns) were combined
-
-**Component**: Instructor Dashboard
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 40 40
-   :header-rows: 1
-
-   * - Field
-     - Type
-   * - ``instructor``
-     - string
-
-.. _list_forum:
-
-======================================================
-List Discussion Staff Events
-======================================================
-
-.. previously a comma-separated list; "Rows identical after the second column" (which means the name and description columns) were combined
-
-* ``list-forum-admins``
-
-* ``list-forum-mods``
-
-* ``list-forum-community-TAs``
-
-**Component**: Instructor Dashboard
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 40 40
-   :header-rows: 1
-
-   * - Field
-     - Type
-   * - ``course``
-     - string
-
-.. _forum:
-
-======================================================
-Manage Discussion Staff Events   
-======================================================
-
-.. previously a comma-separated list; "Rows identical after the second column" (which means the name and description columns) were combined
-
-* ``add-forum-admin``
-
-* ``remove-forum-admin``
-
-* ``add-forum-mod``
-
-* ``remove-forum-mod``
-
-* ``add-forum-community-TA``
-
-* ``remove-forum-community-TA``
-
-**Component**: Instructor Dashboard
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 40 40
-   :header-rows: 1
-
-   * - Field
-     - Type
-   * - ``course``
-     - string
-   * - ``username``
-     - string
-
-.. _histogram:
-
-======================================================
-``psychometrics-histogram-generation``
-======================================================
-
-**Component**: Instructor Dashboard
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 40 40
-   :header-rows: 1
-
-   * - Field
-     - Type
-   * - ``problem``
-     - string
-
-.. _user_group:
-
-======================================================
-``add-or-remove-user-group``   
-======================================================
-
-**Component**: Instructor Dashboard
-
-**Event Source**: Server
-
-``event`` **Member Fields**: 
-
-.. list-table::
-   :widths: 40 40
-   :header-rows: 1
-
-   * - Field
-     - Type
-   * - ``event``
-     - string
-   * - ``event_name``
-     - string
-   * - ``user``
-     - string
-
-.. _instructor_enrollment:
-
-=============================
-Instructor Enrollment Events
-=============================
-
-In addition to the enrollment events that are generated when students 
-enroll in or unenroll from a course, actions by instructors and course staff
-members also generate enrollment events.
-
-* When a course author creates a course, his or her user account is enrolled in
-  the course and the server emits an ``edx.course.enrollment.activated`` event.
-
-* When a user with the Instructor or Course Staff role enrolls in a course, the
-  server emits ``edx.course.enrollment.activated``. The server emits
-  ``edx.course.enrollment.deactivated`` events when these users unenroll from a
-  course.
-
-* When a user with the Instructor or Course Staff role uses the **Batch
-  Enrollment** feature to enroll students or other staff members in a course,
-  the server emits an ``edx.course.enrollment.activated`` event for each
-  enrollment. When this feature is used to unenroll students from a course, the
-  server emits a ``edx.course.enrollment.deactivated`` for each unenrollment.
-
-For details about the enrollment events, see :ref:`enrollment`.
-
-.. _instructor_cohort_events:
-
-=============================
-Instructor Cohort Events
-=============================
-
-In addition to the cohort events that are generated when students are assigned
-to cohort groups (which can happen automatically or manually via the Instructor
-Dashboard; see :ref:`student_cohort_events`), actions by instructors and course
-staff members generate additional events.
-
-``edx.cohort.creation_requested``
-----------------------------------
-
-When an instructor or course staff member manually creates a cohort group via
-the Instructor Dashboard, the server emits an ``edx.cohort.creation_requested``
-event.
-
-**Event Source**: Server
-
-**History** Added 7 Oct 2014.
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``cohort_id``
-     - integer
-     - The numeric ID of the cohort group.
-   * - ``cohort_name``
-     - string
-     - The display name of the cohort group.
-
-``edx.cohort.user_add_requested``
-----------------------------------
-
-When an instructor or course staff member adds a student to a cohort group via
-the Instructor Dashboard, the server emits an ``edx.cohort.user_add_requested``
-event.
-
-**Event Source**: Server
-
-**History** Added 7 Oct 2014.
-
-``event`` **Member Fields**:
-
-.. list-table::
-   :widths: 15 15 60
-   :header-rows: 1
-
-   * - Field
-     - Type
-     - Details
-   * - ``cohort_id``
-     - integer
-     - The numeric ID of the cohort group.
-   * - ``cohort_name``
-     - string
-     - The display name of the cohort group.
-   * - ``previous_cohort_id``
-     - integer
-     - The numeric ID of the cohort group that the user was previously assigned
-       to (or null if the user was not previously assigned to a cohort group).
-   * - ``previous_cohort_name``
-     - string
-     - The display name of the cohort group that the user was previously
-       assigned to (or null if the user was not previously assigned to a cohort
-       group).
-   * - ``user_id``
-     - integer
-     - The numeric ID (from auth_user.id) of the added user.
-
-
-.. _Creating a Peer Assessment: http://edx.readthedocs.org/projects/edx-open-response-assessments/en/latest/
diff --git a/docs/en_us/data/source/internal_data_formats/wiki_data.rst b/docs/en_us/data/source/internal_data_formats/wiki_data.rst
deleted file mode 100644
index 7f872f7882..0000000000
--- a/docs/en_us/data/source/internal_data_formats/wiki_data.rst
+++ /dev/null
@@ -1,238 +0,0 @@
-.. _Wiki_Data:
-
-##############################
-Wiki Data
-##############################
-
-The following sections detail how edX stores wiki data internally, and is useful for developers and researchers who are examining database exports. 
-
-EdX currently uses an external application called django-wiki for wiki functionality within courses. 
-
-In the data package, wiki data is delivered in two SQL files: 
-
-* The wiki_article file is a container for each article that is added to the wiki. The full name of this file also includes the organization and course, and indicates a source of either prod (edX) or edge, in this format: edX-*organization*-*course*-wiki_article-*source*-analytics.sql. 
-
-* The wiki_articlerevision file stores data about the articles, including data about changes and deletions. The full name of this file is in this format: edX-*organization*-*course*-wiki_articlerevision-*source*-analytics.sql.
-
-.. _wiki_article:
-
-***********************************
-Fields in the wiki_article file
-***********************************
-
-The header row of the wiki_article SQL file, and a row of sample data, follow.
-
-.. code-block:: json
-
-    id  current_revision_id created modified  owner_id  group_id  group_read  group_write 
-    other_read  other_write
-
-    1437  29819 2013-07-17 21:53:57 2014-01-26 14:48:02 NULL  NULL  1 1 1 1 
-
-The table that follows provides a reference to each field in this file. A description of each field follows the table.
-
-+-----------------------+--------------------+--------------+--------------+
-| Field                 | Type               | Null         | Key          |
-+=======================+====================+==============+==============+
-| id                    | int(11)            | NO           | PRI          |
-+-----------------------+--------------------+--------------+--------------+
-| current_revision_id   | int(11)            | NO           | UNI          |
-+-----------------------+--------------------+--------------+--------------+
-| created               | datetime           | NO           |              |
-+-----------------------+--------------------+--------------+--------------+
-| modified              | datetime           | NO           |              |
-+-----------------------+--------------------+--------------+--------------+
-| owner_id              | int(11)            | YES          | MUL          |
-+-----------------------+--------------------+--------------+--------------+
-| group_id              | int(11)            | YES          | MUL          |
-+-----------------------+--------------------+--------------+--------------+
-| group_read            | tinyint(1)         | NO           |              |
-+-----------------------+--------------------+--------------+--------------+
-| group_write           | tinyint(1)         | NO           |              |
-+-----------------------+--------------------+--------------+--------------+
-| other_read            | tinyint(1)         | NO           |              |
-+-----------------------+--------------------+--------------+--------------+
-| other_write           | tinyint(1)         | NO           |              |
-+-----------------------+--------------------+--------------+--------------+
-
-id
-----
-  The primary key. 
-  
-current_revision_id
-------------------------------
-   The ID of the revision that displays for this article.
-
-created
-------------
-    The date the article was created.
-
-modified
-------------
-    The date the article properties were last modified.
-    
-owner_id
-------------
-    The owner of the article, usually the creator. The owner always has both read and write access.
-    
-group_id
-------------
-    As in a UNIX file system, permissions can be given to a user according to group membership. 
-    Groups are handled through the Django authentication system.
-    
-group_read
-------------
-    Defines whether the group has read access to the article. 1 if so, 0 if not.
-
-group_write
---------------
-    Defines whether the group has write access to the article. 1 if so, 0 if not.
-
-other_read
-------------
-    Defines whether others have read access to the article. 1 if so, 0 if not.
-
-other_write
-----------------------
-    Defines whether others have write access to the article. 1 if so, 0 if not.
-
-.. _wiki_articlerevision:
-
-******************************************************
-Fields in the wiki_articlerevision file 
-******************************************************
-
-The header row of the wiki_articlerevision SQL file, and a row of sample data, follow.
-
-.. code-block:: json
-
-    id  revision_number user_message  automatic_log ip_address  user_id modified  created 
-    previous_revision_id  deleted locked  article_id  content title
-    
-    17553 1 Course page automatically created.    NULL  NULL  2013-07-17 21:53:57 2013-07-17 
-    21:53:57 NULL  0 0 1437  This is the wiki for edX's edX Demonstration Course.  DemoX
-
-The table that follows provides a reference to the characteristics of each field in this file. Descriptions of the fields follow the table. 
-
-.. list-table::
-     :widths: 15 15 10 10
-     :header-rows: 1
-
-     * - Field
-       - Type
-       - Null
-       - Key
-     * - id
-       - int(11) 
-       - NO
-       - PRI
-     * - revision_number
-       - int(11)
-       - NO
-       - 
-     * - user_message
-       - longtext
-       - NO
-       -
-     * - automatic_log
-       - longtext
-       - NO
-       -
-     * - ip_address
-       - char(15)
-       - YES
-       - 
-     * - user_id
-       - int(11)
-       - YES
-       - MUL
-     * - modified
-       - datetime
-       - NO
-       - 
-     * - created
-       - datetime
-       - NO
-       - 
-     * - previous_revision_id
-       - int(11)
-       - YES
-       - MUL
-     * - deleted
-       - tinyint(1)
-       - NO
-       - 
-     * - locked
-       - tinyint(1)
-       - NO
-       - 
-     * - article_id
-       - int(11)
-       - NO
-       - MUL
-     * - content
-       - longtext
-       - NO
-       - 
-     * - title
-       - varchar(512)
-       - NO
-       - 
-     
-id
-----
-   The primary key. 
-
-revision_number
---------------------
-    The ID of the revision.
-
-user_message
-----------------------
-    The message the user added when saving the revision.
-
-automatic_log
-----------------------
-    Some changes to wiki pages are logged to make the revision history for an article available in the user interface.
-
-ip_address
-----------------------
-    The IP address of the device where the revision was made.
-
-user_id
-------------
-    The ID of the user who made the revision.
-
-modified
-------------
-    The date the article was last modified.
-    
-created
-------------
-    The date the article was created.
-
-previous_revision_id
-----------------------
-    The ID of the revision previous to this one.
-
-deleted
-------------
-    Defines whether the revision was deleted.
-
-locked
-------------
-    Defines whether the revision is locked.
-    
-article_id
---------------------
-   The ID of the revision that displays data for this article.
-
-content
-------------
-    The content of the article revision.
-    
-title
-----------
-   The title of the article revision.
-
-
diff --git a/docs/en_us/data/source/preface.rst b/docs/en_us/data/source/preface.rst
deleted file mode 100644
index 53895c8473..0000000000
--- a/docs/en_us/data/source/preface.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../shared/preface.rst
\ No newline at end of file
diff --git a/docs/en_us/data/source/read_me.rst b/docs/en_us/data/source/read_me.rst
deleted file mode 100644
index df40a0a466..0000000000
--- a/docs/en_us/data/source/read_me.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-*******
-Read Me
-*******
-
-The *edX Research Guide* is created using RST_ files and Sphinx_. You, the
-user community, can help update and revise this documentation project on
-GitHub::
-
-  https://github.com/edx/edx-platform/docs/en_us/data/source
-
-To suggest a revision, fork the project, make changes in your fork, and submit
-a pull request back to the original project: this is known as the `GitHub Flow`_.
-All pull requests need approval from edX. For more information, contact edX at `docs@edx.org`_.
-
-.. _docs@edx.org: docs@edx.org
-.. _Sphinx: http://sphinx-doc.org/
-.. _LaTeX: http://www.latex-project.org/
-.. _`GitHub Flow`: https://github.com/blog/1557-github-flow-in-the-browser
-.. _RST: http://docutils.sourceforge.net/rst.html
\ No newline at end of file
diff --git a/docs/en_us/developers/source/analytics.rst b/docs/en_us/developers/source/analytics.rst
index 84ccede99b..f9502fe571 100644
--- a/docs/en_us/developers/source/analytics.rst
+++ b/docs/en_us/developers/source/analytics.rst
@@ -70,13 +70,13 @@ file. This file can be useful for validation and debugging.
 Documenting Events
 *******************
 
-The *edX Platform Developer Documentation* provides guidelines for `Contributing
-to Open edX
-<http://edx.readthedocs.org/projects/userdocs/en/latest/process/index.html>`_`.
-As part of your effort to add events to the platform, consider including
-comments that identify the purpose of the events and the fields emitted for
-them. A description can assure that researchers and other members of the open
-edX community understand your intent and use the event correctly.
+The *edX Platform Developer's Guide* provides guidelines for `Contributing to
+Open edX <http://edx.readthedocs.org/projects/edx-developer-
+guide/en/latest/process/index.html>`_. As part of your effort to add events to
+the platform, consider including comments that identify the purpose of the
+events and the fields emitted for them. A description can assure that
+researchers and other members of the open edX community understand your intent
+and use the event correctly.
 
 The `edX Research Guide
 <http://edx.readthedocs.org/projects/devdata/en/latest/>`_ includes reference
@@ -85,7 +85,10 @@ information for emitted events that are included in tracking logs.
 Request Context Middleware
 **********************************
 
-The platform includes a middleware class that enriches all events emitted during the processing of a given request with details about the request that greatly simplify downstream processing. This is called the ``TrackMiddleware`` and can be found in ``edx-platform/common/djangoapps/track/middleware.py``.
+The platform includes a middleware class that enriches all events emitted
+during the processing of a given request with details about the request that
+greatly simplify downstream processing. This is called the ``TrackMiddleware``
+and can be found in ``edx-platform/common/djangoapps/track/middleware.py``.
 
 Legacy Application Event Processor
 **********************************
diff --git a/docs/en_us/developers/source/change_log.rst b/docs/en_us/developers/source/change_log.rst
index 1528599dfc..9e45337be8 100644
--- a/docs/en_us/developers/source/change_log.rst
+++ b/docs/en_us/developers/source/change_log.rst
@@ -10,6 +10,9 @@ Change Log
 
    * - Date
      - Change
+   * - 11/07/14
+     - Created the :ref:`edX Modulestores` section and added the :ref:`Split
+       Mongo Modulestore` chapter.
    * - 06/23/14
      - Added a :ref:`Preface` with resources for course teams, developers, researchers, and students. 
    * - 05/20/14
diff --git a/docs/en_us/developers/source/index.rst b/docs/en_us/developers/source/index.rst
index 212b84b051..2ecae648c3 100644
--- a/docs/en_us/developers/source/index.rst
+++ b/docs/en_us/developers/source/index.rst
@@ -19,6 +19,7 @@ Contents:
     browsers.rst
     overview.rst
     extending_platform/index
+    modulestores/index
     xblocks.rst
     pavelib.rst
     public_sandboxes.rst
diff --git a/docs/en_us/developers/source/modulestores/index.rst b/docs/en_us/developers/source/modulestores/index.rst
new file mode 100644
index 0000000000..a16c92d84b
--- /dev/null
+++ b/docs/en_us/developers/source/modulestores/index.rst
@@ -0,0 +1,12 @@
+.. _edX Modulestores:
+
+###########################
+edX Modulestores
+###########################
+
+.. toctree::
+    :maxdepth: 2
+
+    overview
+    mixedmodulestore
+    split-mongo
\ No newline at end of file
diff --git a/docs/en_us/developers/source/modulestores/mixedmodulestore.rst b/docs/en_us/developers/source/modulestores/mixedmodulestore.rst
new file mode 100644
index 0000000000..3a8d84c9f8
--- /dev/null
+++ b/docs/en_us/developers/source/modulestores/mixedmodulestore.rst
@@ -0,0 +1,12 @@
+#################
+MixedModuleStore
+#################
+
+MixedModuleStore provides a common API for all modulestore functions.
+
+In addition, MixedModuleStore allows you to select which modulestore a
+specific course is stored in (XMLModuleStore, DraftModuleStore, Split Mongo)
+and routes requests for that course to the correct modulestore.
+
+MixedModuleStore can also handle some conversions from one modulestore to
+another.
\ No newline at end of file
diff --git a/docs/en_us/developers/source/modulestores/overview.rst b/docs/en_us/developers/source/modulestores/overview.rst
new file mode 100644
index 0000000000..5ffa719d62
--- /dev/null
+++ b/docs/en_us/developers/source/modulestores/overview.rst
@@ -0,0 +1,43 @@
+#################################
+Overview of the edX Modulestores
+#################################
+
+The edX Platform uses several different modulestores to store course data. Each
+of these modulestores is in use on edx.org.
+
+See:
+
+* `XMLModuleStore`_
+* `DraftModuleStore`_
+* :ref:`Split Mongo Modulestore`
+
+***************
+XMLModuleStore
+***************
+
+The XMLModuleStore was the first modulestore used for the edX Platform.
+
+XMLModuleStore uses a file system that stores XML-based courses.  When the LMS
+server starts, XMLModuleStore loads every block for every course into memory.
+
+XMLModuleStore is read-only and does not enable users to change a course
+without restarting the server.
+
+*****************
+DraftModuleStore
+*****************
+
+DraftModuleStore was the next generation modulestore and provides greater
+scalability by allowing random access to course blocks and loading blocks on
+requests.
+
+DraftModuleStore allows editing of courses without restarting the server.
+
+In addition, DraftModuleStore stores a draft version of some types of blocks.
+
+*****************
+Split Mongo
+*****************
+
+Split Mongo is the newest modulestore.  See the :ref:`Split Mongo Modulestore`
+chapter for more information.
\ No newline at end of file
diff --git a/docs/en_us/developers/source/modulestores/split-mongo.rst b/docs/en_us/developers/source/modulestores/split-mongo.rst
new file mode 100644
index 0000000000..d512b644d1
--- /dev/null
+++ b/docs/en_us/developers/source/modulestores/split-mongo.rst
@@ -0,0 +1,164 @@
+.. _Split Mongo Modulestore:
+
+############################
+Split Mongo Modulestore
+############################
+
+See:
+
+* `Overview`_
+* `Split Mongo Data Model`_
+* `Split Mongo Capabilities`_
+
+
+************************
+Overview
+************************
+
+*Split Mongo* is the term used for the new edX modulestore. Split Mongo is
+built on mongoDB. For information about mongoDB, see the `mongoDB website`_. 
+
+The "split" in Split Mongo refers to how a course is split into three types of
+information:
+
+* The course identity, referred to as the `course index <Course Index>`_.
+* The `course structure <Course Structures>`_.
+* The course content, referred to as `XBlock definitions <XBlock Definitions>`_.
+
+This separation of identity, structure, and content enables course authors to
+use more advanced capabilities when developing and managing courses.
+
+.. _mongoDB website: http://www.mongodb.org
+
+************************
+Split Mongo Data Model
+************************
+
+In the Split Mongo data model, edX courses are split into three collections:
+
+* `Course Index`_
+* `Course Structures`_
+* `XBlock Definitions`_
+
+=============
+Course Index
+=============
+
+The course index is a dictionary that stores course IDs. Each course ID points
+to a course structure.
+
+The course index supports multiple branches of a course.  The index can store
+multiple entries for a course ID, with each entry pointing to a different
+course structure that corresponds to a different branch.
+
+As currently implemented, for each course, there is a branch for both the
+published and draft versions of the course. The published and draft branches of
+the course point to different structures.
+
+In the edX Platform:
+
+*  Students using the LMS see and interact with the published version of the
+   course.
+
+*  Course staff using edX Studio make changes to the draft version of the
+   course. 
+
+   *  When the user changes a the course outline, display names, the course
+      about page, course updates, other course pages, sections or subsections,
+      the draft branch is automatically published; that is, it becomes the
+      published branch.
+   
+   *  For units and components, changes are saved in the draft branch. The user
+      must publish the unit to change the draft branch to the published branch.
+      When the user begins another set of changes, the draft branch is updated.
+
+Course Reruns
+**************
+
+The edX Platform enables you to rerun a course.  When you rerun a course, a new
+course index is created. The new course index points to the same course
+structure as the original course index.
+
+==========================
+Course Structures
+==========================
+
+The course structure defines, or outlines, the content of a course.
+
+A course structure is made up of blocks in a tree data structure. Blocks are
+objects in a course, such as the course itself, sections, subsections, and
+units.  A block can reference other blocks; for example, a section references
+one or more subsections. Each block has a unique ID that is generated by the
+edX Platform.
+
+Each block in the course structure points to an XBlock definition. Different
+blocks, in the same or in different structures, can point to the same
+definition.
+
+Course structures, and each block within a structure, are versioned. That is,
+when a course author changes a course, or a block in the course, a new course
+structure is saved; the previous course structure, and previous versions of
+blocks within the structure, remain in the database and are not modified. 
+
+==========================
+XBlock Definitions
+==========================
+
+XBlock definitions contain the content of each block. For some blocks, such as
+sections and subsections, the definition consists of the block's display name.
+For components, such as HTML or problem components, the definition also
+contains the content of the object. A definition can be referenced by multiple
+blocks.
+
+XBlock definitions are versioned. That is, when a course author changes
+content, a new XBlock definition for that object is saved; the previous
+definition remains in the database and is not modified.
+
+************************
+Split Mongo Capabilities
+************************
+
+The Split Mongo data model enables the edX Platform to implement advanced
+content management functionality. Specifically, Split Mongo is designed to
+enable:
+
+* `Multiple Course Branches`_
+* `Versioning`_
+* `Content Reuse`_
+  
+While these capabilities are not fully implemented in the edX Platform, Split
+Mongo is designed to allow future enhancements that enable these content
+management capabilities.
+
+========================
+Multiple Course Branches
+========================
+
+Split Mongo enables multiple branches of a course. The `course index <Course
+Index`>_ can have multiple entries for a course ID, each of which points to a
+different structure.
+
+The edX Platform currently uses a draft and a published branch for a course.
+Future enhancements may use other branches.
+
+============
+Versioning
+============
+
+In Split Mongo, every change to a course or a block within the course is saved,
+with the time and user recorded.
+
+Versioning enables future enhancements such as allowing course authors to
+revert a course or block to a previous version.
+
+==============
+Content Reuse
+==============
+
+By using pointers to reference XBlock definitions from `course structures
+<Course Structures>`_, Split Mongo enables content reuse. A single `XBlock
+definition <XBlock Definition>`_ can be referenced from multiple course
+structures.
+
+Future enhancements to the edX Platform can allow course authors to reuse an
+XBlock in multiple contexts, streamlining course development and maintenance.
\ No newline at end of file
diff --git a/docs/en_us/developers/source/process/overview.rst b/docs/en_us/developers/source/process/overview.rst
index 96e76cc2c7..9569865424 100644
--- a/docs/en_us/developers/source/process/overview.rst
+++ b/docs/en_us/developers/source/process/overview.rst
@@ -45,12 +45,13 @@ Overview
 .. image:: pr-process.png
    :align: center
    :alt: A visualization of the pull request process
+   :target: ../_images/pr-process.png
 
 If you are a :doc:`contributor <contributor>` submitting a pull request, expect that it will
 take a few weeks before it can be merged. The earlier you can start talking
 with the rest of the Open edX community about the changes you want to make,
 before you even start changing code, the better the whole process
-will go. 
+will go.
 
 Follow the guidelines in this document for a high-quality pull request: include a detailed
 description of your pull request when you open it on Github (we recommend using a
@@ -72,7 +73,7 @@ If you are a :doc:`core committer <core-committer>`, allocate some time
 in every two-week sprint to review pull requests from other contributors.
 The community managers will make sure that these pull requests meet a
 basic standard for quality before asking you spend time reviewing them.
-More details are in the :doc:`core committer guidelines <code-committer>`.
+More details are in the :doc:`core committer guidelines <core-committer>`.
 
 Feel free to read the other documentation specific to each individual role in the
 process, but you don’t need to read everything to get started! If you're not
diff --git a/docs/en_us/developers/source/xblocks.rst b/docs/en_us/developers/source/xblocks.rst
index 84cc914ef4..554aac3d0b 100644
--- a/docs/en_us/developers/source/xblocks.rst
+++ b/docs/en_us/developers/source/xblocks.rst
@@ -78,14 +78,11 @@ Studio
 Class Features
 ~~~~~~~~~~~~~~
 
-* studio_view (XBlock.view): The view used to render an editor in Studio. The editor rendering can
-be completely different from the LMS student_view, and it is only shown when the author selects "Edit".
-* author_view (XBlock.view): An optional view of the XBlock similar to student_view, but with possible inline
-editing capabilities. This view differs from studio_view in that it should be as similar to student_view
-as possible. When previewing XBlocks within Studio, Studio will prefer author_view to student_view.
+* studio_view (XBlock.view): The view used to render an editor in Studio. The editor rendering can be completely different from the LMS student_view, and it is only shown when the author selects "Edit".
 
-* non_editable_metadata_fields (property): A list of :class:`~xblock.fields.Field` objects that
-  shouldn't be displayed in the default editing view for Studio.
+* author_view (XBlock.view): An optional view of the XBlock similar to student_view, but with possible inline editing capabilities. This view differs from studio_view in that it should be as similar to student_view as possible. When previewing XBlocks within Studio, Studio will prefer author_view to student_view.
+
+* non_editable_metadata_fields (property): A list of ``xblock.fields.Field`` objects that shouldn't be displayed in the default editing view for Studio.
 
 Restrictions
 ~~~~~~~~~~~~
diff --git a/docs/en_us/install_operations/Makefile b/docs/en_us/install_operations/Makefile
deleted file mode 100644
index 7a4baa06c4..0000000000
--- a/docs/en_us/install_operations/Makefile
+++ /dev/null
@@ -1,183 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-PAPER         ?=
-BUILDDIR      ?= build
-
-# User-friendly check for sphinx-build
-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
-endif
-
-Q_FLAG        =
-
-ifeq ($(quiet), true)
-Q_FLAG = -Q
-endif
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = $(Q_FLAG) -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  xml        to make Docutils-native XML files"
-	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/getting_started.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/getting_started.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/getting_started"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/getting_started"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-latexpdfja:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through platex and dvipdfmx..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-xml:
-	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
-	@echo
-	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
-
-pseudoxml:
-	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
-	@echo
-	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/docs/en_us/install_operations/source/browsers.rst b/docs/en_us/install_operations/source/browsers.rst
deleted file mode 100644
index c98836b8f7..0000000000
--- a/docs/en_us/install_operations/source/browsers.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../shared/browsers.rst
\ No newline at end of file
diff --git a/docs/en_us/install_operations/source/change_log.rst b/docs/en_us/install_operations/source/change_log.rst
deleted file mode 100644
index e0a8980769..0000000000
--- a/docs/en_us/install_operations/source/change_log.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-############
-Change Log
-############
-
-************
-May, 2014
-************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 06/07/2014
-     - Addition of the section :ref:`Installing the edX Production Stack`
-   * - 05/21/2014
-     - The initial release of this guide, with the sections :ref:`Installing the
-       edX Developer Stack` and :ref:`Running the edX Developer Stack`.
-   
\ No newline at end of file
diff --git a/docs/en_us/install_operations/source/conf.py b/docs/en_us/install_operations/source/conf.py
deleted file mode 100644
index b807ea84a7..0000000000
--- a/docs/en_us/install_operations/source/conf.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-import sys, os
-
-# on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-
-
-
-
-
-
-
-sys.path.append(os.path.abspath('../../../'))
-sys.path.append(os.path.abspath('../../'))
-
-#from docs.shared.conf import *
-
-sys.path.insert(0, os.path.abspath('.'))
-
-master_doc = 'index'
-
-# Add any paths that contain templates here, relative to this directory.
-#templates_path.append('source/_templates')
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path.append('source/_static')
-
-
-# General information about the project.
-project = u'Installing, Configuring, and Running the edX Platform'
-copyright = u'2014, edX'
-
-# The short X.Y version.
-version = ''
-# The full version, including alpha/beta/rc tags.
-release = ''
diff --git a/docs/en_us/install_operations/source/devstack/install_devstack.rst b/docs/en_us/install_operations/source/devstack/install_devstack.rst
deleted file mode 100644
index 2d27f8c1f6..0000000000
--- a/docs/en_us/install_operations/source/devstack/install_devstack.rst
+++ /dev/null
@@ -1,141 +0,0 @@
-.. include:: ../links.rst
-
-.. _Installing the edX Developer Stack:
-
-####################################
-Installing the edX Developer Stack
-####################################
-
-This chapter is intended for those who are installing and running the edX Developer Stack.
-
-See the following sections:
-
-* `Overview`_
-* `Components`_
-* `Knowledge Prerequisites`_
-* `Software Prerequisites`_
-* `Install DevStack`_
-* `Install DevStack using the Torrent file`_
-
-
-**********
-Overview
-**********
-
-The edX Developer Stack, known as **Devstack**, is a Vagrant instance designed
-for local development.
-
-Devstack:
-
-* Uses the same system requirements as production. This allows you to
-  discover and fix system configuration issues early in development.
-
-* Simplifies certain production settings to make development more convenient.
-  For example, `nginx`_ and `gunicorn`_ are disabled in Devstack; Devstack uses
-  Django's runserver instead.
-
-See the `Vagrant documentation`_ for more information.
-
-********************
-Components
-********************
-
-Devstack includes the following edX components:
-
-* The Learning Management System (LMS)
-* edX Studio
-* Discussion Forums
-* Open Response Assessor (ORA)
-  
-Devstack also includes a demo edX course.
-
-**************************
-Knowledge Prerequisites
-**************************
-
-To use Devstack, you should:
-
-* Understand basic terminal usage. If you are using a Mac computer, see
-  `Introduction to the Mac OS X Command Line`_. If you are using a Windows
-  computer, see `Windows Command Line Reference`_.
-
-* Understand Vagrant commands. See the `Vagrant Getting Started`_ guide for more
-  information.
-
-
-**************************
-Software Prerequisites
-**************************
-
-To install and run Devstack, you must first install:
-
-* `VirtualBox`_ 4.3.10 or higher
-
-* `Vagrant`_ 1.5.3 or higher
-
-* An NFS client, if your operating system does not include one. Devstack uses
-  VirtualBox Guest Editions to share folders through NFS.
-  
-
-**************************
-Install DevStack
-**************************
-
-To install Devstack directly from the command line, follow the instructions
-below. You can also install DevStack using a Torrent file, as explained in the
-next section.
-
-Before beginning the installation, ensure that you have your local computer's administrator's password.
-
-#. Ensure the ``nfsd`` client is running.
-
-#. Create the ``devstack`` directory and navigate to it in the command prompt.
-   
-   .. code-block:: bash
-
-     mkdir devstack
-     cd devstack
-
-#. Download the Devstack Vagrant file.
-   
-   .. code-block:: bash
-
-     curl -L https://raw.github.com/edx/configuration/master/vagrant/release/devstack/Vagrantfile > Vagrantfile
-
-#. Install the Vagrant vbguest plugin.
-   
-   .. code-block:: bash
-
-     vagrant plugin install vagrant-vbguest
-
-#. Create the Devstack virtual machine.
-
-   .. code-block:: bash
-
-     vagrant up
-
-   The first time you create the Devstack virtual machine, Vagrant downloads the
-   base box, which is about 4GB. If you destroy and recreate the virtual
-   machine, Vagrant re-uses the box it downloaded. See `Vagrant's documentation on boxes`_ for more information.
-
-#. When prompted, enter your local computer's administrator's password.
-   
-   Your password is needed so that NFS can be set up to allow users to access
-   code directories directly from your computer.
-
-When you have completed these steps, see :ref:`Running the edX Developer Stack`
-to begin using Devstack.
-
-
-*****************************************
-Install Devstack using the Torrent file
-*****************************************
-
-#. Download the Devstack `Torrent`_ file. 
-
-#. When you have the file on your computer, add the Virtual machine using the
-   command:
-
-    .. code-block:: bash
-  
-     vagrant box add box-name path-to-box-file
diff --git a/docs/en_us/install_operations/source/devstack/run_devstack.rst b/docs/en_us/install_operations/source/devstack/run_devstack.rst
deleted file mode 100644
index 89af489740..0000000000
--- a/docs/en_us/install_operations/source/devstack/run_devstack.rst
+++ /dev/null
@@ -1,196 +0,0 @@
-.. include:: ../links.rst
-
-.. _Running the edX Developer Stack:
-
-####################################
-Running the edX Developer Stack
-####################################
-
-See the following sections:
-
-* `Connect to the Devstack Virtual Machine`_
-* `Set Up Ability to Preview Units (Mac/Linux Only)`_
-* `Customize the Source Code Location`_
-* `Run the LMS on Devstack`_
-* `Run Studio on Devstack`_
-* `Run Discussion Forums on Devstack`_
-* `Default Accounts on Devstack`_
-
-
-****************************************
-Connect to the Devstack Virtual Machine
-****************************************
-
-#. To connect to the Devstack virtual machine, use the SSH command from the
-   `devstack` directory.
-
-  .. code-block:: bash
-
-   vagrant ssh
-
-2. To use Devstack and perform any of the tasks described in this section, you
-   must connect as the user **edxapp**.
-
-   .. code-block:: bash
-
-    sudo su edxapp
-
-   This command loads the edxapp environment from the file
-   ``/edx/app/edxapp/edxapp_env``. This puts ``venv python`` and ``rbenv ruby``
-   in your search path.
-
-   This command also sets the current working directory to the edx-platform
-   repository (``/edx/app/edxapp/edx-platform``).
-
-
-****************************************************
-Set Up Ability to Preview Units (Mac/Linux Only)
-****************************************************
-
-If you are installing Devstack on a Linux or Macintosh computer, in order to use
-the preview feature in edX Studio, you must add the following line to the
-``etc/hosts`` file:
-
-  .. code-block:: bash
-
-    192.168.33.10 preview.localhost
-
-
-************************************
-Customize the Source Code Location
-************************************
-
-You can customize the location of the edX source code that gets cloned when you
-provision Devstack. You may want to do this to have Devstack work with source
-code that already exists on your computer.
-
-By default, the source code location is the directory in which you run ``vagrant
-up``.  To change this location, set the ``VAGRANT_MOUNT_BASE`` environment
-variable to set the base directory for the edx-platform and cs_comments_service
-source code directories.
-
-.. WHERE IS VARIABLE?
-
-************************************
-Run the LMS on Devstack
-************************************
-
-When you run the LMS on Devstack, the command updates requirements and
-compiles assets, unless you use the ``fast`` option.
-
-The command uses the file ``lms/envs/devstack.py``. This file
-overrides production settings for the LMS.
-
-To run the LMS on Devstack:
-
-#. `Connect to the Devstack Virtual Machine`_.
-#. Run the following command:
-   
-   .. code-block:: bash
-
-    paver lms
-
-   Or, to start the LMS without updating requirements and compiling assets, use the ``fast`` option:
-   
-   .. code-block:: bash
-
-    paver lms --fast 
-
-   The LMS starts. 
-
-#. Open the LMS in your browser at ``http://localhost:8000/``. 
-
-   Vagrant forwards port 8000 to the LMS server running in the virtual machine.
-
-
-************************************
-Run Studio on Devstack
-************************************
-
-When you run Studio on Devstack, the command updates requirements and compiles
-assets, unless you use the ``fast`` option.
-
-You run Studio on Devstack with the file ``cms/envs/devstack.py``. This file
-overrides production settings for Studio.
-
-To run Studio on Devstack:
-
-#. `Connect to the Devstack Virtual Machine`_.
-#. Run the following command:
-   
-   .. code-block:: bash
-
-    paver studio
-
-   Or, to start Studio without updating requirements and compiling assets, use
-   the ``fast`` option:
-   
-   .. code-block:: bash
-
-    paver studio --fast 
-
-   Studio starts. 
-
-#. Open the LMS in your browser at ``http://localhost:8001/``. 
- 
-   Vagrant forwards port 8001 to the Studio server running in the virtual
-   machine.
-
-************************************
-Run Discussion Forums on Devstack
-************************************
-
-To run discussion forums on Devstack:
-
-#. `Connect to the Devstack Virtual Machine`_.
-#. Switch to the discussion forum account:
-   
-   .. code-block:: bash
-
-    sudo su forum
-
-#. Update Ruby requirements. 
-
-   .. code-block:: bash
-
-    bundle install
-
-   .. note:: 
-     If you get a message for entering a password to install the bundled
-     RubyGems to the system, you can safely exit by entering ``control+c`` on a
-     Macintosh or ``Ctrl+C`` on Windows. The RubyGems will still be installed
-     correctly for the forum user.
-
-#. Start the discussion forums server.
-   
-   .. code-block:: bash
-
-    ruby app.rb -p 18080
-
-The discussions forum server starts. You can access the discussion forums API at
-``http://localhost:18080/``.
-
-************************************
-Default Accounts on Devstack
-************************************
-
-When you install Devstack, the following accounts are created:
-
-  .. list-table::
-   :widths: 20 60
-   :header-rows: 1
-
-   * - Account
-     - Description
-   * - staff@example.com
-     - An LMS and Studio user with course creation and editing permissions. This
-       user is a course staff member with rights to work with the demonstration
-       course in Studio.
-   * - verified@example.com
-     - A student account that you can use to access the LMS for testing verified certificates.
-   * - audit@example.com
-     - A student account that you can use the access the LMS for testing course auditing.
-   * - honor@example.com
-     - A student account that you can use the access the LMS for testing honor code certificates.
-
-The password for all of these accounts is ``edx``.
diff --git a/docs/en_us/install_operations/source/index.rst b/docs/en_us/install_operations/source/index.rst
deleted file mode 100755
index 0669ad21f1..0000000000
--- a/docs/en_us/install_operations/source/index.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. Getting_Started documentation master file, created by
-   sphinx-quickstart on Tue Apr 16 11:19:12 2013.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-######################################################
-Installing, Configuring, and Running the edX Platform
-######################################################
-
-.. toctree::
-   :numbered:
-   :maxdepth: 2
-
-   read_me
-   change_log
-   browsers
-   install_options
-   devstack/install_devstack
-   devstack/run_devstack
-   prodstack/install_prodstack
diff --git a/docs/en_us/install_operations/source/install_options.rst b/docs/en_us/install_operations/source/install_options.rst
deleted file mode 100644
index c07e1b0a22..0000000000
--- a/docs/en_us/install_operations/source/install_options.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-.. include:: links.rst
-
-########################################
-Open edX Platform Installation Options
-########################################
-
-You can install the Open edX Platform in one of the following three ways.
-
-**********
-Devstack
-**********
-
-The edX Developer Stack, known as **Devstack**, is a Vagrant instance designed
-for local development.
-
-Devstack is in the `edx configuration repository`_ on GitHub.
-
-This guide includes the following sections about Devstack:
-
-* :ref:`Installing the edX Developer Stack`
-
-* :ref:`Running the edX Developer Stack`
-  
-Additional sections are planned for future versions of this guide.
-
-See the `edx configuration repository wiki`_ for information from
-edX and the Open edX community about Devstack and other installation and
-configuration options. This wiki contains two pages with more information about Devstack:
-
-* `Devstack wiki`_
-* `Developing on Devstack`_
-
-
-*********************
-edX Production Stack
-*********************
-
-The edX Production Stack, known as **Fullstack**, is a Vagrant instance designed
-for deploying all edX services on a single server.
-
-Fullstack is in the `edx configuration repository`_ on GitHub.
-  
-This guide includes :ref:`Installing the edX Production Stack`.
-
-See the `edx configuration repository wiki`_ for information from edX and the
-Open edX community on Fullstack and other installation and configuration
-options.
-
-==================
-Ubuntu 12.04 64 
-==================
-
-You can install the edX Production Stack on a single Ubuntu 12.04 64-bit server.
-
-Ubuntu information is planned for future versions of this guide.
-
-You can see the `edx configuration repository wiki`_ for information from edX
-and the Open edX community about Ubuntu and other installation and configuration
-options.
\ No newline at end of file
diff --git a/docs/en_us/install_operations/source/links.rst b/docs/en_us/install_operations/source/links.rst
deleted file mode 100644
index f5bb67bcab..0000000000
--- a/docs/en_us/install_operations/source/links.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-.. _nginx: http://nginx.com
-.. _gunicorn: http://gunicorn.org
-.. _Introduction to the Mac OS X Command Line: http://blog.teamtreehouse.com/introduction-to-the-mac-os-x-command-line
-.. _Windows Command Line Reference: http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/ntcmds.mspx?mfr=true
-.. _Vagrant Getting Started: http://docs.vagrantup.com/v2/getting-started/index.html
-.. _VirtualBox: https://www.virtualbox.org/wiki/Downloads
-.. _Vagrant: http://www.vagrantup.com/downloads.html
-.. _Torrent: https://s3.amazonaws.com/edx-static/vagrant-images/20140418-injera-devstack.box?torrent
-.. _edx configuration repository: https://github.com/edx/configuration
-.. _edx configuration repository wiki: https://github.com/edx/configuration/wiki
-.. _Devstack wiki: https://github.com/edx/configuration/wiki/edX-Developer-Stack
-.. _Developing on Devstack: https://github.com/edx/edx-platform/wiki/Developing-on-the-edX-Developer-Stack
-.. _RabbitMQ: http://www.rabbitmq.com/
-.. _Discern: http://code.edx.org/discern/
-.. _Ease: https://github.com/edx/ease
-.. _VirtualBox Guest Editions: http://www.virtualbox.org/manual/ch04.html
-.. _Vagrant documentation: http://docs.vagrantup.com/v2/
-.. _Vagrant's documentation on boxes: http://docs.vagrantup.com/v2/boxes.html
\ No newline at end of file
diff --git a/docs/en_us/install_operations/source/prodstack/install_prodstack.rst b/docs/en_us/install_operations/source/prodstack/install_prodstack.rst
deleted file mode 100644
index c404da6800..0000000000
--- a/docs/en_us/install_operations/source/prodstack/install_prodstack.rst
+++ /dev/null
@@ -1,125 +0,0 @@
-.. include:: ../links.rst
-
-.. _Installing the edX Production Stack:
-
-####################################
-Installing the edX Production Stack
-####################################
-
-This chapter is intended for those who are installing and running the edX Production Stack.
-
-See the following sections:
-
-* `Overview`_
-* `Components`_
-* `Knowledge Prerequisites`_
-* `Software Prerequisites`_
-* `Install the edX Production Stack`_
-
-
-**********
-Overview
-**********
-
-The edX Production Stack, known as **Fullstack**, is a Vagrant instance designed
-for deploying all edX services on a single server.
-
-See the `Vagrant documentation`_ for more information.
-
-
-********************
-Components
-********************
-
-Fullstack includes the following edX components:
-
-* The Learning Management System (LMS)
-* edX Studio
-* XQueue, the queuing server that uses `RabbitMQ`_ for external graders
-* Discussion Forums
-* Open Response Assessor (ORA)
-* `Discern`_, the machine-learning-based automated textual classification API
-  service.
-* `Ease`_, a library for the classification of textual content.
-  
-
-**************************
-Knowledge Prerequisites
-**************************
-
-To use Fullstack, you should:
-
-* Understand basic terminal usage. If you are using a Mac computer, see
-  `Introduction to the Mac OS X Command Line`_. If you are using a Windows
-  computer, see `Windows Command Line Reference`_.
-
-* Understand Vagrant commands. See the `Vagrant Getting Started`_ guide for more
-  information.
-
-
-**************************
-Software Prerequisites
-**************************
-
-To install and run Fullstack, you must first install:
-
-* `VirtualBox`_ 4.3.10 or higher
-
-* `Vagrant`_ 1.5.3 or higher
-
-* An NFS client, if your operating system does not include one. Fullstack uses
-  `VirtualBox Guest Editions`_ to share folders through NFS.
-  
-
-*********************************
-Install the edX Production Stack
-*********************************
-
-To install Fullstack directly from the command line, follow the instructions
-below.
-
-Before beginning the installation, ensure that you have your local computer's administrator's password.
-
-#. Ensure the ``nfsd`` client is running.
-
-#. Create the ``fullstack`` directory and navigate to it in the command prompt.
-   
-   .. code-block:: bash
-
-     mkdir fullstack
-     cd fullstack
-
-#. Download the fullstack Vagrant file.
-   
-   .. code-block:: bash
-
-     curl -L https://raw.githubusercontent.com/edx/configuration/master/vagrant/release/fullstack/Vagrantfile > Vagrantfile
-
-#. Install the Vagrant hostsupdater plugin.
-   
-   .. code-block:: bash
-
-     vagrant plugin install vagrant-hostsupdater
-
-#. Create the Fullstack virtual machine.
-
-   .. code-block:: bash
-
-     vagrant up
-
-   The first time you create the Fullstack virtual machine, Vagrant downloads the
-   base box, which is about 4GB. If you destroy and recreate the virtual
-   machine, Vagrant re-uses the box it downloaded. See `Vagrant's documentation on boxes`_ for more information.
-
-#. When prompted, enter your local computer's administrator's password.
-   
-   Your password is needed so that NFS can be set up to allow users to access
-   code directories directly from your computer.
-
-**********************************************
-Browser Login To Your New edX Production Stack
-**********************************************
-
-#. Go to preview.localhost in your browser, which is an alias entry for 192.168.33.10 that was created in your /etc/hosts file.
-
-   When prompted, enter **edx** for both username and password.
diff --git a/docs/en_us/install_operations/source/read_me.rst b/docs/en_us/install_operations/source/read_me.rst
deleted file mode 100644
index 076b276e49..0000000000
--- a/docs/en_us/install_operations/source/read_me.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-#########
-Read Me
-#########
-
-The edX *Installing and Configuring the edX Platform* documentation is created
-using RST_ files and Sphinx_. You, the user community, can help update and revise this documentation project on GitHub:
-
-  https://github.com/edx/edx-platform/tree/master/docs/install_operations/source
-
-To suggest a revision, fork the project, make changes in your fork, and submit
-a pull request back to the original project: this is known as the `GitHub Flow`_.
-
-.. _Sphinx: http://sphinx-doc.org/
-.. _LaTeX: http://www.latex-project.org/
-.. _`GitHub Flow`: https://github.com/blog/1557-github-flow-in-the-browser
-.. _RST: http://docutils.sourceforge.net/rst.html
\ No newline at end of file
diff --git a/docs/en_us/internal/testing.md b/docs/en_us/internal/testing.md
index a278186a7f..7d05c5f46f 100644
--- a/docs/en_us/internal/testing.md
+++ b/docs/en_us/internal/testing.md
@@ -254,7 +254,7 @@ option to skip those tasks. This option can also be used with any of the test sp
 
 To run a single test, specify the name of the test file. For example:
 
-    paver test_bokchoy -t test_lms.py
+    paver test_bokchoy -t lms/test_lms.py
 
 Notice the test file location is relative to common/test/acceptance/tests. For example:
 
@@ -271,7 +271,7 @@ To test only a certain feature, specify the file and the testcase class:
 To execute only a certain test case, specify the file name, class, and
 test case method:
 
-    paver test_bokchoy -t test_lms.py:RegistrationTest.test_register
+    paver test_bokchoy -t lms/test_lms.py:RegistrationTest.test_register
 
 During acceptance test execution, log files and also screenshots of failed tests
 are captured in test_root/log.
diff --git a/docs/en_us/mobile/Makefile b/docs/en_us/mobile/Makefile
deleted file mode 100644
index 7a4baa06c4..0000000000
--- a/docs/en_us/mobile/Makefile
+++ /dev/null
@@ -1,183 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-PAPER         ?=
-BUILDDIR      ?= build
-
-# User-friendly check for sphinx-build
-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
-endif
-
-Q_FLAG        =
-
-ifeq ($(quiet), true)
-Q_FLAG = -Q
-endif
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = $(Q_FLAG) -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  xml        to make Docutils-native XML files"
-	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/getting_started.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/getting_started.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/getting_started"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/getting_started"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-latexpdfja:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through platex and dvipdfmx..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-xml:
-	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
-	@echo
-	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
-
-pseudoxml:
-	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
-	@echo
-	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/docs/en_us/mobile/__init__.py b/docs/en_us/mobile/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docs/en_us/mobile/source/Images/ClosedCaptions.png b/docs/en_us/mobile/source/Images/ClosedCaptions.png
deleted file mode 100755
index bc716d54bb..0000000000
Binary files a/docs/en_us/mobile/source/Images/ClosedCaptions.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_CCwithLanguages-old.png b/docs/en_us/mobile/source/Images/Mob_CCwithLanguages-old.png
deleted file mode 100644
index 307370bc37..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_CCwithLanguages-old.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_CCwithLanguages.png b/docs/en_us/mobile/source/Images/Mob_CCwithLanguages.png
deleted file mode 100644
index c0f209e1e7..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_CCwithLanguages.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_Circles.png b/docs/en_us/mobile/source/Images/Mob_Circles.png
deleted file mode 100755
index 112fb16c4d..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_Circles.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_ClosedCaptionLanguages.png b/docs/en_us/mobile/source/Images/Mob_ClosedCaptionLanguages.png
deleted file mode 100644
index eee98c5749..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_ClosedCaptionLanguages.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_ClosedCaptions.png b/docs/en_us/mobile/source/Images/Mob_ClosedCaptions.png
deleted file mode 100755
index 285c1e0711..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_ClosedCaptions.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_DownloadIcon.png b/docs/en_us/mobile/source/Images/Mob_DownloadIcon.png
deleted file mode 100644
index fe5bdecae2..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_DownloadIcon.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_FullScreenIcon.png b/docs/en_us/mobile/source/Images/Mob_FullScreenIcon.png
deleted file mode 100755
index 45c09238e4..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_FullScreenIcon.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_FullScreenIcon2.png b/docs/en_us/mobile/source/Images/Mob_FullScreenIcon2.png
deleted file mode 100644
index cd69d2d696..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_FullScreenIcon2.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_GearIcon.png b/docs/en_us/mobile/source/Images/Mob_GearIcon.png
deleted file mode 100755
index c5f29b5eb9..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_GearIcon.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_HomePage.png b/docs/en_us/mobile/source/Images/Mob_HomePage.png
deleted file mode 100644
index fee5999349..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_HomePage.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_HomePage_Fixed.png b/docs/en_us/mobile/source/Images/Mob_HomePage_Fixed.png
deleted file mode 100644
index 95d5831ee3..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_HomePage_Fixed.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_Menu.png b/docs/en_us/mobile/source/Images/Mob_Menu.png
deleted file mode 100644
index e4a41d9421..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_Menu.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_Menu_Fixed.png b/docs/en_us/mobile/source/Images/Mob_Menu_Fixed.png
deleted file mode 100644
index 0b34da5f45..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_Menu_Fixed.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_Menu_Misaligned.png b/docs/en_us/mobile/source/Images/Mob_Menu_Misaligned.png
deleted file mode 100644
index a81f6d4478..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_Menu_Misaligned.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_NumberVideos.png b/docs/en_us/mobile/source/Images/Mob_NumberVideos.png
deleted file mode 100644
index 59b03c4829..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_NumberVideos.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_SectionList.png b/docs/en_us/mobile/source/Images/Mob_SectionList.png
deleted file mode 100644
index 74ac818c5d..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_SectionList.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_WiFiOnly.png b/docs/en_us/mobile/source/Images/Mob_WiFiOnly.png
deleted file mode 100644
index cee8467f35..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_WiFiOnly.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mob_WiFiSetting.png b/docs/en_us/mobile/source/Images/Mob_WiFiSetting.png
deleted file mode 100644
index f34eafa74b..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mob_WiFiSetting.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Mobile_ number of videos.png b/docs/en_us/mobile/source/Images/Mobile_ number of videos.png
deleted file mode 100755
index 62c31cf428..0000000000
Binary files a/docs/en_us/mobile/source/Images/Mobile_ number of videos.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/Images/Video_Landscape.png b/docs/en_us/mobile/source/Images/Video_Landscape.png
deleted file mode 100644
index 6fa128d173..0000000000
Binary files a/docs/en_us/mobile/source/Images/Video_Landscape.png and /dev/null differ
diff --git a/docs/en_us/mobile/source/SFD_mobileFAQ.rst b/docs/en_us/mobile/source/SFD_mobileFAQ.rst
deleted file mode 100644
index 2b48bd4d95..0000000000
--- a/docs/en_us/mobile/source/SFD_mobileFAQ.rst
+++ /dev/null
@@ -1,270 +0,0 @@
-.. _SFD Mobile FAQ:
-
-########################
-edX Mobile App FAQ
-########################
-
-.. _General Questions:
-
-*************************
-General Questions
-*************************
-
-================================
-How do I get the mobile app?
-================================
-
-This beta version of the mobile app is only available for a few select courses.
-If you're registered for a course that's available on the mobile app, the
-instructor for the course will send or post a link that you can use to join the
-**edX Android Beta Testers** Google group. You can then install the edX mobile
-app by using either your mobile device or your computer.
-
-Install the edX Mobile App Using Your Mobile Device
-************************************************************
-
-#. Click the link that you've received from your instructor to access the **edX
-   Android Beta Testers** Google group.
-#. On the **EdX Android Beta Testers** Google group page, tap **Join Group**.
-#. In the dialog box that opens, select the options that you want, and then tap
-   **Join this group**.
-#. On the group's home page, tap the **Announcing edX beta app for Android
-   smartphone** post.
-#. On the **Announcing edX beta app for Android smartphone** page, tap the link
-   to the app in the Google Play store.
-#. On the app's page in the Google Play store, tap **Become a Tester**.
-#. Tap the link under **Get the test version** to download the app from the
-   Google Play store.
-#. On the app's page in the Google Play store, tap **Install**, and then tap
-   **Accept** to allow the app to access your device.
-#. When the app finishes installing, click **Open**.
-
-
-Install the edX Mobile App Using Your Computer
-***************************************************
-
-#. Click the link that you've received from your instructor to access the **edX
-   Android Beta Testers** Google group.
-#. On the **EdX Android Beta Testers** Google group page, click **Join Group**.
-#. In the dialog box that opens, select the options that you want, and then
-   click **Join this group**.
-#. On the group's home page, click the link to the app in the Google Play store.
-#. On the app's page in the Google Play store, click **Become a Tester**.
-#. Click the link under **Get the test version** to download the app from the
-   Google Play store.
-#. Click **Install**. In the dialog box that opens, select the devices that you
-   want to install the app on, and then click **OK**.
-#. When you a see a message saying that the app has been installed, go to your
-   device. Check the app list on your device for the edX app.
-
-
-================================
-How much does the app cost?
-================================
-
-The app is free. You don't have to pay or buy anything to download or use it.
-
-========================================
-What platforms does the app run on?
-========================================
-
-Our current beta app is available for Android smartphones. We're also working to
-make it available on Android tablets, iPhones, and iPads.
-
-================================================
-Which courses are available in the mobile app?
-================================================
-
-The following courses are currently available for the mobile beta. We'll be
-adding more courses over the next few weeks, so check the **EdX Android Beta
-Testers** Google group page for updates.
-
-* `edX - DemoX <https://www.edx.org/course/edx/edx-
-  demox-1-demox-4116#.VCGNfytdUZY>`_: A fun and interactive course designed to
-  help you get to know the edX learning experience. Perfect to take before you
-  start another course.
-
-* `MITx 6.002x - Circuits and Electronics
-  <https://www.edx.org/course/mitx/mitx-6-002x-circuits-
-  electronics-2606#.VDKwoSldV58>`_: A course that teaches the fundamentals of
-  circuit and electronic analysis.
-
-* `MITx 4.605x - A Global History of Architecture — Part 1
-  <https://www.edx.org/course/mitx/mitx-4-605x-global-history-
-  architecture-2721#.VDKwoildV58>`_: A history of architecture from a global
-  perspective.
-
-* `DelftX ET.3034TU - Solar Energy <https://www.edx.org/course/delftx/delftx-et-
-  3034tu-solar-energy-1996#.VDKwpCldV58>`_: A course that allows students to
-  discover the power of solar energy and design a complete photovoltaic system.
-
-========================================================
-Can I take a course entirely on my mobile device?
-========================================================
-
-This beta version of our mobile app is a companion app that you can use to watch
-course videos and see announcements and handouts. To complete readings, homework
-problems, and exams, you can tap **View on Web** in the bottom right corner of
-any screen to access the content in your browser, or you can complete
-assignments on your computer.
-
-========================================================
-How do I post questions on the discussion board?
-========================================================
-
-Right now, you can't participate in discussions by using the app. However, when
-you tap **View on Web** in the bottom right corner of any screen, the course
-opens in your browser. You can then tap the **Discussion** tab in your course to
-participate in discussions.
-
-========================================
-How do I change my download settings?
-========================================
-
-#. In the upper left corner of your **My Courses** page, tap the menu icon.
-
-   .. image:: /Images/Mob_Menu.png
-      :width: 300
-      :alt: Mobile "My Courses" page with an arrow pointing to the menu in the upper left corner
-
-#. In the list that appears, locate **SETTINGS: Download only on Wi-Fi**, and
-   then tap the option's current setting to change it.
-
-.. note:: By default, the app is set so that it will only download content, 
-  including videos, if you're on a Wi-Fi network. If you change this setting, 
-  you may exceed the data allowance for your cellular plan.
-
-========================================
-How do I un-enroll from a course?
-========================================
-
-To un-enroll from a course, visit the edX website on your mobile browser or on
-your computer.
-
-================================================
-How can I send questions or comments to edX?
-================================================
-
-We'd love to receive your feedback on this beta version of our mobile app. In
-the app home page, tap the menu in the upper left corner, and then tap **Submit
-Feedback**.
-
-
-.. _Video Questions:
-
-*************************
-Video Questions
-*************************
-
-================================
-How do I download videos?
-================================
-
-To download videos, tap the download icon that appears to the right of each
-section, subsection, or video name. If you tap the download icon for a video,
-you'll download just that video. If you tap the download icon for a section or
-subsection, you'll download all of the videos in that section or subsection.
-
-.. image:: /Images/Mob_DownloadIcon.png
-   :width: 300
-   :alt: List of sections with the download icon circled
-
-================================================
-How much data will the videos in this app use?
-================================================
-
-Course videos are optimized for mobile playback, but watching or downloading any
-video can result in heavy data use. We recommend using a Wi-Fi connection if you
-intend to watch or download a lot of videos. The edX app has a **Download only
-on Wi-Fi** setting that's enabled by default to help you avoid using your
-cellular network accidentally.
-
-========================================================================
-What are the numbers to the right of section and subsection names?
-========================================================================
-
-The number to the right of a section or subsection name is the number of videos
-in that section or subsection.
-
-.. image:: /Images/Mob_NumberVideos.png
-   :width: 300
-   :alt: List of sections with the number of videos circled
-
-========================================================
-What are the circles to the left of the video name?
-========================================================
-
-The circle indicates whether you've watched a video. A blue circle means that
-you haven't started watching the video. A half-filled circle means that you've
-watched part of the video. A gray circle means that you've watched the entire
-video.
-
-========================================
-How can I make the video full screen?
-========================================
-
-Tilt your phone until the video changes to landscape, or tap the full screen
-icon in the bottom right corner of the video screen.
-
-.. image:: /Images/Mob_FullScreenIcon.png
-   :width: 300
-   :alt: Video in windowed mode with full screen icon circled
-
-==================================
-How can I see captions?
-==================================
-
-When you're playing a video, tap the gear icon in the lower right corner, and
-then tap **Closed Captions**. If the video has captions, a list of available
-languages for the captions appears. Tap the language that you want in the list.
-Some captions are available in just one language, and others are available in
-several languages.
-
-.. image:: /Images/Mob_CCwithLanguages.png
-   :width: 500
-   :alt: Video with closed caption language menu visible
-
-========================================================================================================================================
-If I watch a course video in the mobile app, and then I access the course on a computer, will I be in the same place in the course?
-========================================================================================================================================
-
-Right now, your course activity on the mobile app doesn't affect your course
-activity on your computer. That is, if you use your computer to access the
-course, and then you watch a few videos on your mobile device, the next time you
-access the course with your computer you'll return to the last page that you
-viewed on your computer. You won't go to the last video that you watched on your
-mobile device.
-
-==================================
-Can I speed up the videos?
-==================================
-
-Currently, the videos only run in their original speeds. We're currently working
-on the ability to change video speeds.
-
-==================================
-How do I delete downloaded videos?
-==================================
-
-#. In the upper left corner of your home page, tap the menu icon, and then tap
-   **My Videos**.
-#. Tap the course that has the video that you want to delete.
-#. At the bottom of the screen, tap **Edit**.
-#. Tap to select the box that appears to the right of the video name, and then
-   tap **Delete** at the bottom of the screen.
-#. In the **Confirm Delete** dialog box, tap **Delete**.
-
-
-.. _Troubleshooting:
-
-*************************
-Troubleshooting
-*************************
-
-======================================================================================================
-I get a "This video is not available" screen when I try to watch a video. What can I do?
-======================================================================================================
-
-If you run into problems, make sure you have an Internet connection. If problems
-persist, let us know: go to your **My Courses** page on the app, tap the menu
-icon in the upper left corner, and then tap **Submit Feedback**.
diff --git a/docs/en_us/mobile/source/conf.py b/docs/en_us/mobile/source/conf.py
deleted file mode 100644
index 833a833a2e..0000000000
--- a/docs/en_us/mobile/source/conf.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-import sys, os
-
-# on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-
-
-
-
-
-
-
-sys.path.append(os.path.abspath('../../../'))
-sys.path.append(os.path.abspath('../../'))
-
-#from docs.shared.conf import *
-
-sys.path.insert(0, os.path.abspath('.'))
-
-master_doc = 'index'
-
-# Add any paths that contain templates here, relative to this directory.
-#templates_path.append('source/_templates')
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path.append('source/_static')
-
-
-# General information about the project.
-project = u'edX Mobile for Students'
-copyright = u'2014, edX'
-
-# The short X.Y version.
-version = ''
-# The full version, including alpha/beta/rc tags.
-release = ''
diff --git a/docs/en_us/mobile/source/index.rst b/docs/en_us/mobile/source/index.rst
deleted file mode 100644
index 1b3c54f796..0000000000
--- a/docs/en_us/mobile/source/index.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. Getting_Started documentation master file, created by
-   sphinx-quickstart on Tue Apr 16 11:19:12 2013.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-
-Mobile FAQ for Students
-========================================
-
-.. toctree::
-   :numbered:
-   :maxdepth: 2
-
-   SFD_mobileFAQ
\ No newline at end of file
diff --git a/docs/en_us/mobile/source/latex/Makefile b/docs/en_us/mobile/source/latex/Makefile
deleted file mode 100644
index 6b87ad8814..0000000000
--- a/docs/en_us/mobile/source/latex/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# Makefile for Sphinx LaTeX output
-
-ALLDOCS = $(basename $(wildcard *.tex))
-ALLPDF = $(addsuffix .pdf,$(ALLDOCS))
-ALLDVI = $(addsuffix .dvi,$(ALLDOCS))
-
-# Prefix for archive names
-ARCHIVEPRREFIX =
-# Additional LaTeX options
-LATEXOPTS =
-
-all: $(ALLPDF)
-all-pdf: $(ALLPDF)
-all-dvi: $(ALLDVI)
-all-ps: all-dvi
-	for f in *.dvi; do dvips $$f; done
-
-all-pdf-ja:
-	for f in *.pdf *.png *.gif *.jpg *.jpeg; do extractbb $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	-for f in *.idx; do mendex -U -f -d "`basename $$f .idx`.dic" -s python.ist $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.dvi; do dvipdfmx $$f; done
-
-zip: all-$(FMT)
-	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
-	cp $(ALLPDF) $(ARCHIVEPREFIX)docs-$(FMT)
-	zip -q -r -9 $(ARCHIVEPREFIX)docs-$(FMT).zip $(ARCHIVEPREFIX)docs-$(FMT)
-	rm -r $(ARCHIVEPREFIX)docs-$(FMT)
-
-tar: all-$(FMT)
-	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
-	cp $(ALLPDF) $(ARCHIVEPREFIX)docs-$(FMT)
-	tar cf $(ARCHIVEPREFIX)docs-$(FMT).tar $(ARCHIVEPREFIX)docs-$(FMT)
-	rm -r $(ARCHIVEPREFIX)docs-$(FMT)
-
-bz2: tar
-	bzip2 -9 -k $(ARCHIVEPREFIX)docs-$(FMT).tar
-
-# The number of LaTeX runs is quite conservative, but I don't expect it
-# to get run often, so the little extra time won't hurt.
-%.dvi: %.tex
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-	-makeindex -s python.ist '$(basename $<).idx'
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-
-%.pdf: %.tex
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-	-makeindex -s python.ist '$(basename $<).idx'
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-
-clean:
-	rm -f *.dvi *.log *.ind *.aux *.toc *.syn *.idx *.out *.ilg *.pla
-
-.PHONY: all all-pdf all-dvi all-ps clean
-.PHONY: all-pdf-ja
-
diff --git a/docs/en_us/olx/Makefile b/docs/en_us/olx/Makefile
deleted file mode 100644
index 7a930576ed..0000000000
--- a/docs/en_us/olx/Makefile
+++ /dev/null
@@ -1,164 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-PAPER         ?=
-BUILDDIR      ?= build
-
-# User-friendly check for sphinx-build
-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
-endif
-
-Q_FLAG        =
-
-ifeq ($(quiet), true)
-Q_FLAG = -Q
-endif
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = $(Q_FLAG) -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/edXDocs.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/edXDocs.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/edXDocs"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/edXDocs"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/docs/en_us/olx/__init__.py b/docs/en_us/olx/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docs/en_us/olx/source/Images/AI_ScoredResponse.png b/docs/en_us/olx/source/Images/AI_ScoredResponse.png
deleted file mode 120000
index 7e85bde657..0000000000
--- a/docs/en_us/olx/source/Images/AI_ScoredResponse.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/AI_ScoredResponse.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/AdditionalFeedback.png b/docs/en_us/olx/source/Images/AdditionalFeedback.png
deleted file mode 120000
index 1b91062fac..0000000000
--- a/docs/en_us/olx/source/Images/AdditionalFeedback.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/AdditionalFeedback.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/AdvancedComponent.png b/docs/en_us/olx/source/Images/AdvancedComponent.png
deleted file mode 120000
index db84ae2dc2..0000000000
--- a/docs/en_us/olx/source/Images/AdvancedComponent.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/AdvancedComponent.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/AnnotationExample.png b/docs/en_us/olx/source/Images/AnnotationExample.png
deleted file mode 120000
index 43e69b1ecd..0000000000
--- a/docs/en_us/olx/source/Images/AnnotationExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/AnnotationExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/CITL_AssmtTypes.png b/docs/en_us/olx/source/Images/CITL_AssmtTypes.png
deleted file mode 120000
index 9abebb7b3f..0000000000
--- a/docs/en_us/olx/source/Images/CITL_AssmtTypes.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/CITL_AssmtTypes.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/CITL_SA_Rubric.png b/docs/en_us/olx/source/Images/CITL_SA_Rubric.png
deleted file mode 120000
index 630b4fb44c..0000000000
--- a/docs/en_us/olx/source/Images/CITL_SA_Rubric.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/CITL_SA_Rubric.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/CITLsample.png b/docs/en_us/olx/source/Images/CITLsample.png
deleted file mode 120000
index 29bd2eae13..0000000000
--- a/docs/en_us/olx/source/Images/CITLsample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/CITLsample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/CheckboxExample.png b/docs/en_us/olx/source/Images/CheckboxExample.png
deleted file mode 120000
index 352a7b8e61..0000000000
--- a/docs/en_us/olx/source/Images/CheckboxExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/CheckboxExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ChemicalEquationExample.png b/docs/en_us/olx/source/Images/ChemicalEquationExample.png
deleted file mode 120000
index 94e43b2c0a..0000000000
--- a/docs/en_us/olx/source/Images/ChemicalEquationExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ChemicalEquationExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/CircuitSchematicExample.png b/docs/en_us/olx/source/Images/CircuitSchematicExample.png
deleted file mode 120000
index 7d9af7ba1e..0000000000
--- a/docs/en_us/olx/source/Images/CircuitSchematicExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/CircuitSchematicExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/CustomPythonExample.png b/docs/en_us/olx/source/Images/CustomPythonExample.png
deleted file mode 120000
index 3ebfe7cd76..0000000000
--- a/docs/en_us/olx/source/Images/CustomPythonExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/CustomPythonExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/DragAndDropProblem.png b/docs/en_us/olx/source/Images/DragAndDropProblem.png
deleted file mode 120000
index 80dcdd994d..0000000000
--- a/docs/en_us/olx/source/Images/DragAndDropProblem.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/DragAndDropProblem.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/DropdownExample.png b/docs/en_us/olx/source/Images/DropdownExample.png
deleted file mode 120000
index 251a103af3..0000000000
--- a/docs/en_us/olx/source/Images/DropdownExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/DropdownExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/FeedbackNotAvailable.png b/docs/en_us/olx/source/Images/FeedbackNotAvailable.png
deleted file mode 120000
index 82193b1338..0000000000
--- a/docs/en_us/olx/source/Images/FeedbackNotAvailable.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/FeedbackNotAvailable.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/FetchingNextSubmission.png b/docs/en_us/olx/source/Images/FetchingNextSubmission.png
deleted file mode 120000
index cb0bec58a7..0000000000
--- a/docs/en_us/olx/source/Images/FetchingNextSubmission.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/FetchingNextSubmission.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/GeneExplorer.png b/docs/en_us/olx/source/Images/GeneExplorer.png
deleted file mode 120000
index 8ce875dece..0000000000
--- a/docs/en_us/olx/source/Images/GeneExplorer.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/GeneExplorer.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/GoogleHangout_WithPeople.png b/docs/en_us/olx/source/Images/GoogleHangout_WithPeople.png
deleted file mode 120000
index b99f1e5c81..0000000000
--- a/docs/en_us/olx/source/Images/GoogleHangout_WithPeople.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/GoogleHangout_WithPeople.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/IFrame_1.png b/docs/en_us/olx/source/Images/IFrame_1.png
deleted file mode 120000
index 3f36210cc3..0000000000
--- a/docs/en_us/olx/source/Images/IFrame_1.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/IFrame_1.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/IFrame_2.png b/docs/en_us/olx/source/Images/IFrame_2.png
deleted file mode 120000
index 09fb885e57..0000000000
--- a/docs/en_us/olx/source/Images/IFrame_2.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/markhoeber/Documents/edx/edx-platform/docs/en_us/course_authors/source/Images/IFrame_2.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/IFrame_3.png b/docs/en_us/olx/source/Images/IFrame_3.png
deleted file mode 120000
index ad9f528783..0000000000
--- a/docs/en_us/olx/source/Images/IFrame_3.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/markhoeber/Documents/edx/edx-platform/docs/en_us/course_authors/source/Images/IFrame_3.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/IFrame_4.png b/docs/en_us/olx/source/Images/IFrame_4.png
deleted file mode 120000
index f8859a2c74..0000000000
--- a/docs/en_us/olx/source/Images/IFrame_4.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/markhoeber/Documents/edx/edx-platform/docs/en_us/course_authors/source/Images/IFrame_4.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ImageMappedInputExample.png b/docs/en_us/olx/source/Images/ImageMappedInputExample.png
deleted file mode 120000
index 5e93963820..0000000000
--- a/docs/en_us/olx/source/Images/ImageMappedInputExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ImageMappedInputExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/JavaScriptInputExample.png b/docs/en_us/olx/source/Images/JavaScriptInputExample.png
deleted file mode 120000
index 1d3ce28ec2..0000000000
--- a/docs/en_us/olx/source/Images/JavaScriptInputExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/JavaScriptInputExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/LTIExample.png b/docs/en_us/olx/source/Images/LTIExample.png
deleted file mode 120000
index eb972fca90..0000000000
--- a/docs/en_us/olx/source/Images/LTIExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/LTIExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/LTIPolicyKey.png b/docs/en_us/olx/source/Images/LTIPolicyKey.png
deleted file mode 120000
index d9e0797c41..0000000000
--- a/docs/en_us/olx/source/Images/LTIPolicyKey.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/LTIPolicyKey.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/Math5.png b/docs/en_us/olx/source/Images/Math5.png
deleted file mode 120000
index a1eef6e1ad..0000000000
--- a/docs/en_us/olx/source/Images/Math5.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/Math5.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/MathExpressionInputExample.png b/docs/en_us/olx/source/Images/MathExpressionInputExample.png
deleted file mode 120000
index 154eb6183a..0000000000
--- a/docs/en_us/olx/source/Images/MathExpressionInputExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/MathExpressionInputExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/MathJax_HTML.png b/docs/en_us/olx/source/Images/MathJax_HTML.png
deleted file mode 120000
index f22131ecc9..0000000000
--- a/docs/en_us/olx/source/Images/MathJax_HTML.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/MathJax_HTML.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/MathJax_Problem.png b/docs/en_us/olx/source/Images/MathJax_Problem.png
deleted file mode 120000
index b818451232..0000000000
--- a/docs/en_us/olx/source/Images/MathJax_Problem.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/MathJax_Problem.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/Molecule_Editor.png b/docs/en_us/olx/source/Images/Molecule_Editor.png
deleted file mode 120000
index 73bf1cdc71..0000000000
--- a/docs/en_us/olx/source/Images/Molecule_Editor.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/Molecule_Editor.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/MultimpleChoiceExample.png b/docs/en_us/olx/source/Images/MultimpleChoiceExample.png
deleted file mode 120000
index 6928291a47..0000000000
--- a/docs/en_us/olx/source/Images/MultimpleChoiceExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/MultimpleChoiceExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/MultimpleChoice_NumericalInput.png b/docs/en_us/olx/source/Images/MultimpleChoice_NumericalInput.png
deleted file mode 120000
index 8e0b2ec53b..0000000000
--- a/docs/en_us/olx/source/Images/MultimpleChoice_NumericalInput.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/MultimpleChoice_NumericalInput.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/MultipleChoiceExample.png b/docs/en_us/olx/source/Images/MultipleChoiceExample.png
deleted file mode 120000
index e655428f4b..0000000000
--- a/docs/en_us/olx/source/Images/MultipleChoiceExample.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/markhoeber/Documents/edx/edx-platform/docs/en_us/course_authors/source/Images/MultipleChoiceExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/MultipleChoice_NumericalInput.png b/docs/en_us/olx/source/Images/MultipleChoice_NumericalInput.png
deleted file mode 120000
index d96009145b..0000000000
--- a/docs/en_us/olx/source/Images/MultipleChoice_NumericalInput.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/markhoeber/Documents/edx/edx-platform/docs/en_us/course_authors/source/Images/MultipleChoice_NumericalInput.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/NoMoreSubmissions.png b/docs/en_us/olx/source/Images/NoMoreSubmissions.png
deleted file mode 120000
index 9650680e70..0000000000
--- a/docs/en_us/olx/source/Images/NoMoreSubmissions.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/NoMoreSubmissions.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/NumbericalInput_Complex.png b/docs/en_us/olx/source/Images/NumbericalInput_Complex.png
deleted file mode 120000
index 56251df9f9..0000000000
--- a/docs/en_us/olx/source/Images/NumbericalInput_Complex.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/NumbericalInput_Complex.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/NumericalInput_Complex.png b/docs/en_us/olx/source/Images/NumericalInput_Complex.png
deleted file mode 120000
index d7d3908aa6..0000000000
--- a/docs/en_us/olx/source/Images/NumericalInput_Complex.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/markhoeber/Documents/edx/edx-platform/docs/en_us/course_authors/source/Images/NumericalInput_Complex.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ORAComponentEditor.png b/docs/en_us/olx/source/Images/ORAComponentEditor.png
deleted file mode 120000
index b9cf0501ab..0000000000
--- a/docs/en_us/olx/source/Images/ORAComponentEditor.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ORAComponentEditor.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ORA_Component.png b/docs/en_us/olx/source/Images/ORA_Component.png
deleted file mode 120000
index 9c93e429be..0000000000
--- a/docs/en_us/olx/source/Images/ORA_Component.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ORA_Component.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ORA_DuplicateWarning.png b/docs/en_us/olx/source/Images/ORA_DuplicateWarning.png
deleted file mode 120000
index 2831a23668..0000000000
--- a/docs/en_us/olx/source/Images/ORA_DuplicateWarning.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ORA_DuplicateWarning.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ORA_ProblemName1.png b/docs/en_us/olx/source/Images/ORA_ProblemName1.png
deleted file mode 120000
index 9ef3b0a334..0000000000
--- a/docs/en_us/olx/source/Images/ORA_ProblemName1.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ORA_ProblemName1.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ORA_Prompt.png b/docs/en_us/olx/source/Images/ORA_Prompt.png
deleted file mode 120000
index fb2ffa2b25..0000000000
--- a/docs/en_us/olx/source/Images/ORA_Prompt.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ORA_Prompt.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ORA_Rubric.png b/docs/en_us/olx/source/Images/ORA_Rubric.png
deleted file mode 120000
index 2868dfd69c..0000000000
--- a/docs/en_us/olx/source/Images/ORA_Rubric.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ORA_Rubric.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ORA_Settings.png b/docs/en_us/olx/source/Images/ORA_Settings.png
deleted file mode 120000
index 71e2fc9b6f..0000000000
--- a/docs/en_us/olx/source/Images/ORA_Settings.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/markhoeber/Documents/edx/edx-platform/docs/en_us/course_authors/source/Images/ORA_Settings.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ORA_Tasks.png b/docs/en_us/olx/source/Images/ORA_Tasks.png
deleted file mode 120000
index df41e8d303..0000000000
--- a/docs/en_us/olx/source/Images/ORA_Tasks.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ORA_Tasks.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/OpenEndedConsole_NewSubmissions.png b/docs/en_us/olx/source/Images/OpenEndedConsole_NewSubmissions.png
deleted file mode 120000
index 97c858bdd3..0000000000
--- a/docs/en_us/olx/source/Images/OpenEndedConsole_NewSubmissions.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/OpenEndedConsole_NewSubmissions.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/OpenEndedPanel.png b/docs/en_us/olx/source/Images/OpenEndedPanel.png
deleted file mode 120000
index 77fb957005..0000000000
--- a/docs/en_us/olx/source/Images/OpenEndedPanel.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/OpenEndedPanel.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/PA_StaffDebug_Location.png b/docs/en_us/olx/source/Images/PA_StaffDebug_Location.png
deleted file mode 120000
index 3cfc4578cd..0000000000
--- a/docs/en_us/olx/source/Images/PA_StaffDebug_Location.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/PA_StaffDebug_Location.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/PGI_CompEditor_Settings.png b/docs/en_us/olx/source/Images/PGI_CompEditor_Settings.png
deleted file mode 120000
index 76a541ab61..0000000000
--- a/docs/en_us/olx/source/Images/PGI_CompEditor_Settings.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/PGI_CompEditor_Settings.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/PGI_Single.png b/docs/en_us/olx/source/Images/PGI_Single.png
deleted file mode 120000
index bb06966b42..0000000000
--- a/docs/en_us/olx/source/Images/PGI_Single.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/PGI_Single.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/Peer_ScoredResponse.png b/docs/en_us/olx/source/Images/Peer_ScoredResponse.png
deleted file mode 120000
index cdbb9aa4ff..0000000000
--- a/docs/en_us/olx/source/Images/Peer_ScoredResponse.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/Peer_ScoredResponse.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/Periodic_Table.png b/docs/en_us/olx/source/Images/Periodic_Table.png
deleted file mode 120000
index 4d7ae0f747..0000000000
--- a/docs/en_us/olx/source/Images/Periodic_Table.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/Periodic_Table.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/PollExample.png b/docs/en_us/olx/source/Images/PollExample.png
deleted file mode 120000
index 56d4b46f94..0000000000
--- a/docs/en_us/olx/source/Images/PollExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/PollExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ProbCompButton_Dropdown.png b/docs/en_us/olx/source/Images/ProbCompButton_Dropdown.png
deleted file mode 120000
index 02f06d77ca..0000000000
--- a/docs/en_us/olx/source/Images/ProbCompButton_Dropdown.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ProbCompButton_Dropdown.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ProbCompButton_Explanation.png b/docs/en_us/olx/source/Images/ProbCompButton_Explanation.png
deleted file mode 120000
index fa4890460f..0000000000
--- a/docs/en_us/olx/source/Images/ProbCompButton_Explanation.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ProbCompButton_Explanation.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ProbCompButton_MultChoice.png b/docs/en_us/olx/source/Images/ProbCompButton_MultChoice.png
deleted file mode 120000
index d0786abae4..0000000000
--- a/docs/en_us/olx/source/Images/ProbCompButton_MultChoice.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/markhoeber/Documents/edx/edx-platform/docs/en_us/course_authors/source/Images/ProbCompButton_MultChoice.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ProbCompButton_MultipleChoice.png b/docs/en_us/olx/source/Images/ProbCompButton_MultipleChoice.png
deleted file mode 120000
index c96af50da3..0000000000
--- a/docs/en_us/olx/source/Images/ProbCompButton_MultipleChoice.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ProbCompButton_MultipleChoice.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ProbCompButton_NumInput.png b/docs/en_us/olx/source/Images/ProbCompButton_NumInput.png
deleted file mode 120000
index f28efe5078..0000000000
--- a/docs/en_us/olx/source/Images/ProbCompButton_NumInput.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ProbCompButton_NumInput.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ProbCompButton_TextInput.png b/docs/en_us/olx/source/Images/ProbCompButton_TextInput.png
deleted file mode 120000
index e0df70c322..0000000000
--- a/docs/en_us/olx/source/Images/ProbCompButton_TextInput.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ProbCompButton_TextInput.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ProbComponent_CheckboxIcon.png b/docs/en_us/olx/source/Images/ProbComponent_CheckboxIcon.png
deleted file mode 120000
index ca2db6b540..0000000000
--- a/docs/en_us/olx/source/Images/ProbComponent_CheckboxIcon.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ProbComponent_Checkboxicon.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ProblemList-DemoCourse.png b/docs/en_us/olx/source/Images/ProblemList-DemoCourse.png
deleted file mode 120000
index 4034f5a9a2..0000000000
--- a/docs/en_us/olx/source/Images/ProblemList-DemoCourse.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ProblemList-DemoCourse.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ProblemWithAdaptiveHintExample.png b/docs/en_us/olx/source/Images/ProblemWithAdaptiveHintExample.png
deleted file mode 120000
index d4a3c7fe27..0000000000
--- a/docs/en_us/olx/source/Images/ProblemWithAdaptiveHintExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ProblemWithAdaptiveHintExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ProblemWrittenInLaTex.png b/docs/en_us/olx/source/Images/ProblemWrittenInLaTex.png
deleted file mode 120000
index adaf2ebf2e..0000000000
--- a/docs/en_us/olx/source/Images/ProblemWrittenInLaTex.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ProblemWrittenInLaTex.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ProblemsYouHaveSubmitted.png b/docs/en_us/olx/source/Images/ProblemsYouHaveSubmitted.png
deleted file mode 120000
index a5c2720bfa..0000000000
--- a/docs/en_us/olx/source/Images/ProblemsYouHaveSubmitted.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ProblemsYouHaveSubmitted.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ProteinBuilder.png b/docs/en_us/olx/source/Images/ProteinBuilder.png
deleted file mode 120000
index 994ec23505..0000000000
--- a/docs/en_us/olx/source/Images/ProteinBuilder.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/markhoeber/Documents/edx/edx-platform/docs/en_us/course_authors/source/Images/ProteinBuilder.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ResponseToGrade.png b/docs/en_us/olx/source/Images/ResponseToGrade.png
deleted file mode 120000
index 49f03e09a1..0000000000
--- a/docs/en_us/olx/source/Images/ResponseToGrade.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ResponseToGrade.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/TextInputExample.png b/docs/en_us/olx/source/Images/TextInputExample.png
deleted file mode 120000
index 5c09a879c0..0000000000
--- a/docs/en_us/olx/source/Images/TextInputExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/TextInputExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ThreeAssmts_NoResponse.png b/docs/en_us/olx/source/Images/ThreeAssmts_NoResponse.png
deleted file mode 120000
index b47f515e32..0000000000
--- a/docs/en_us/olx/source/Images/ThreeAssmts_NoResponse.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ThreeAssmts_NoResponse.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/VitalSource.png b/docs/en_us/olx/source/Images/VitalSource.png
deleted file mode 120000
index e9ca786b04..0000000000
--- a/docs/en_us/olx/source/Images/VitalSource.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/VitalSource.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/WordCloudExample.png b/docs/en_us/olx/source/Images/WordCloudExample.png
deleted file mode 120000
index 6ef1d5985b..0000000000
--- a/docs/en_us/olx/source/Images/WordCloudExample.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/WordCloudExample.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/ZoomingImage_Modified.png b/docs/en_us/olx/source/Images/ZoomingImage_Modified.png
deleted file mode 120000
index afa4822735..0000000000
--- a/docs/en_us/olx/source/Images/ZoomingImage_Modified.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/ZoomingImage_Modified.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/Zooming_Image.png b/docs/en_us/olx/source/Images/Zooming_Image.png
deleted file mode 120000
index 0e2767663f..0000000000
--- a/docs/en_us/olx/source/Images/Zooming_Image.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/Zooming_Image.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/external-grader-correct.png b/docs/en_us/olx/source/Images/external-grader-correct.png
deleted file mode 120000
index 2e790d3694..0000000000
--- a/docs/en_us/olx/source/Images/external-grader-correct.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/external-grader-correct.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/external-grader-incorrect.png b/docs/en_us/olx/source/Images/external-grader-incorrect.png
deleted file mode 120000
index 06c65d72d9..0000000000
--- a/docs/en_us/olx/source/Images/external-grader-incorrect.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/external-grader-incorrect.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/google_login.png b/docs/en_us/olx/source/Images/google_login.png
deleted file mode 120000
index 0520057969..0000000000
--- a/docs/en_us/olx/source/Images/google_login.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/google_login.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/hangout_static_page.png b/docs/en_us/olx/source/Images/hangout_static_page.png
deleted file mode 120000
index 778d4de6fe..0000000000
--- a/docs/en_us/olx/source/Images/hangout_static_page.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/hangout_static_page.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/hangout_unit.png b/docs/en_us/olx/source/Images/hangout_unit.png
deleted file mode 120000
index dd0d365962..0000000000
--- a/docs/en_us/olx/source/Images/hangout_unit.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/hangout_unit.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/image-modal-window.png b/docs/en_us/olx/source/Images/image-modal-window.png
deleted file mode 120000
index 342aa4e968..0000000000
--- a/docs/en_us/olx/source/Images/image-modal-window.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/image-modal-window.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/image-modal-zoomed.png b/docs/en_us/olx/source/Images/image-modal-zoomed.png
deleted file mode 120000
index 06f9b96bbd..0000000000
--- a/docs/en_us/olx/source/Images/image-modal-zoomed.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/image-modal-zoomed.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/image-modal.png b/docs/en_us/olx/source/Images/image-modal.png
deleted file mode 120000
index 8b44ba3236..0000000000
--- a/docs/en_us/olx/source/Images/image-modal.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/image-modal.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/image-modeal-zoomed.png b/docs/en_us/olx/source/Images/image-modeal-zoomed.png
deleted file mode 120000
index 747de44016..0000000000
--- a/docs/en_us/olx/source/Images/image-modeal-zoomed.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/markhoeber/Documents/edx/edx-platform/docs/en_us/course_authors/source/Images/image-modeal-zoomed.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/image292.png b/docs/en_us/olx/source/Images/image292.png
deleted file mode 120000
index 9d81b5ef6e..0000000000
--- a/docs/en_us/olx/source/Images/image292.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../course_authors/source/Images/image292.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/multiple-choice-shuffle-1.png b/docs/en_us/olx/source/Images/multiple-choice-shuffle-1.png
deleted file mode 120000
index f77562ece7..0000000000
--- a/docs/en_us/olx/source/Images/multiple-choice-shuffle-1.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/markhoeber/Documents/edx/edx-platform/docs/en_us/course_authors/source/Images/multiple-choice-shuffle-1.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/Images/multiple-choice-shuffle-2.png b/docs/en_us/olx/source/Images/multiple-choice-shuffle-2.png
deleted file mode 120000
index 158a771b3b..0000000000
--- a/docs/en_us/olx/source/Images/multiple-choice-shuffle-2.png
+++ /dev/null
@@ -1 +0,0 @@
-/Users/markhoeber/Documents/edx/edx-platform/docs/en_us/course_authors/source/Images/multiple-choice-shuffle-2.png
\ No newline at end of file
diff --git a/docs/en_us/olx/source/about/index.rst b/docs/en_us/olx/source/about/index.rst
deleted file mode 100644
index 885e797970..0000000000
--- a/docs/en_us/olx/source/about/index.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. _The Course About Pages:
-
-#################################
-The Course About Pages
-#################################
-
-Use the chapters in this section to create the information prospective students
-will see about your course.
-
-.. toctree::
-   :maxdepth: 2
-
-   overview
-   short-description
\ No newline at end of file
diff --git a/docs/en_us/olx/source/about/overview.rst b/docs/en_us/olx/source/about/overview.rst
deleted file mode 100644
index 0db5cc4ec4..0000000000
--- a/docs/en_us/olx/source/about/overview.rst
+++ /dev/null
@@ -1,90 +0,0 @@
-.. _Course Overview:
-
-#################################
-Course Overview
-#################################
-
-Each course must have an overview page. Students see the overview page when
-searching and registering for the course.
-
-*********************************************
-Create the Overview File
-*********************************************
-
-You create an HTML file called ``overview.html`` in the ``overview`` directory.
-
-*********************************************
-Overview Sections
-*********************************************
-
-The ``overview.html`` must contain specific sections. 
-
-Each section is wrapped in ``section`` tags. The value of the ``class``
-attribute specifies what the section is for and how it is displayed to
-students. Within the ``section`` tags, you use valid HTML.
-
-The overview must contain sections named the following:
-
-* ``about``
-* ``prerequisites``
-* ``course-staff``
-* ``teacher``
-* ``faq``
-
-
-.. _A Template For Course Overview:
-
-************************************************
- A Template For Your Course Overview
-************************************************
-  
-Replace the placeholders in the following template with your information.
-
-.. code-block:: html
-
-  <section class="about">
-    <h2>About This Course</h2>
-    <p>Include your long course description here. The long course description
-      should contain 150-400 words.</p>
-    <p>This is paragraph 2 of the long course description. Add more paragraphs
-      as needed. Make sure to enclose them in paragraph tags.</p>
-  <section>
-  <section class="prerequisites">
-    <h2>Prerequisites</h2>
-    <p>Add information about class prerequisites here.</p>
-  </section>
-  <section class="course-staff">
-    <h2>Course Staff</h2>
-    <article class="teacher">
-      <div class="teacher-image">
-        <!-- Replace the path below with the path to your faculty image. -->
-        <img src="/c4x/edX/edX101/asset/Placeholder_FacultyImage.jpg"
-          align="left" style="margin:0 20 px 0"/>
-      </div>
-      <h3>Staff Member</h3>
-      <p>Biography of instructor/staff member</p>
-    </article>
-    <article class="teacher">
-      <div class="teacher-image">
-        <img src="/c4x/edX/edX101/asset/Placeholder_FalcutyImage.jpg"/>
-      </div>
-      <h3>Staff Member Name</h3>
-      <p>Biography of instructor/staff member</p>
-    </article>
-  </section>
-  <section class="faq">
-    <section class="responses">
-      <h2>Frequently Asked Questions</h2>
-      <article class="response">
-        <h3>Do I need to buy a textbook?</h3>
-        <p>No, a free online version of Chemistry: Principles, Patterns, and
-          Applications, First Edition by Bruce Averill and Patricia Eldredge
-          will be available, though you can purchase a printed version
-          (published by FlatWorld Knowledge) if you'd like.</p>
-      </article>
-      <article class="response">
-        <h3>Question 2?</h3>
-        <p>Answer 2.</p>
-      </article>
-    </section>
-  </section>
diff --git a/docs/en_us/olx/source/about/short-description.rst b/docs/en_us/olx/source/about/short-description.rst
deleted file mode 100644
index 0371c0470d..0000000000
--- a/docs/en_us/olx/source/about/short-description.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-.. _Short Description:
-
-#################################
-Short Description
-#################################
-
-Optionally, you can define a short description for your course.
-
-Students see the short description when they move their cursors over the course
-image in the catalog.
-
-*********************************************
-Create the Short Description File
-*********************************************
-
-You create an HTML file called ``short_description.html`` in the ``overview``
-directory.
-
-The short description is limited to 150 characters.
-
-Within that limit, you can add any text and HTML markup to the short
-description file within that.
\ No newline at end of file
diff --git a/docs/en_us/olx/source/assets/assets.rst b/docs/en_us/olx/source/assets/assets.rst
deleted file mode 100644
index fd3d9f79ab..0000000000
--- a/docs/en_us/olx/source/assets/assets.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-.. _Course Assets:
-
-#################################
-Course Assets
-#################################
-
-You must put all assets, or files that support your course, in the ``static``
-directory. Assets include any image files, textbooks, handouts, and supporting
-JavaScript files.
-
-You must also define the asset in the assets policy file.  See :ref:`Course
-Asset Policy` for more information.
\ No newline at end of file
diff --git a/docs/en_us/olx/source/change_log.rst b/docs/en_us/olx/source/change_log.rst
deleted file mode 100644
index 6d01d2735e..0000000000
--- a/docs/en_us/olx/source/change_log.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-############
-Change Log
-############
-
-
-*****************
-October, 2014
-*****************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 10/23/14
-     - Fixed the code sample in :ref:`Script Tag Format` in the :ref:`Write
-       Your Own Grader` chapter.
-   * - 
-     - Fixed a bug in the :ref:`Text Input Problem XML`.
-   * - 10/17/14
-     - Provided more explanation to the introduction to :ref:`Problems and
-       Tools`.
-   * - 
-     - Reorganized the :ref:`Problems and Tools` and :ref:`Course Components`
-       sections to properly categorize these types of objects.
-   * - 
-     - Updated the :ref:`ODL Directory Structure` chapter to accurately reflect
-       how an OLX course is organized.
-   * - 
-     - Updated the :ref:`HTML Components`, :ref:`Discussion Components`, and
-       :ref:`Video Components` chapters to explain the option to embed content
-       in container objects.
-   * - 10/07/14
-     - Added pages for the :ref:`Graphical Slider Tool` and 
-       :ref:`Symbolic Response` to the :ref:`Problems and Tools` section.
-       
-*****************
-September, 2014
-*****************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 09/30/14
-     - Release of the *Alpha* version of this document.
-
diff --git a/docs/en_us/olx/source/components/annotation.rst b/docs/en_us/olx/source/components/annotation.rst
deleted file mode 100644
index 8f16d4d17a..0000000000
--- a/docs/en_us/olx/source/components/annotation.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/annotation.rst
-
diff --git a/docs/en_us/olx/source/components/conditional_module.rst b/docs/en_us/olx/source/components/conditional_module.rst
deleted file mode 100644
index d7b194b76c..0000000000
--- a/docs/en_us/olx/source/components/conditional_module.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/conditional_module.rst
-
diff --git a/docs/en_us/olx/source/components/discussion-components.rst b/docs/en_us/olx/source/components/discussion-components.rst
deleted file mode 100644
index 9c4bcc7d3b..0000000000
--- a/docs/en_us/olx/source/components/discussion-components.rst
+++ /dev/null
@@ -1,106 +0,0 @@
-.. _Discussion Components:
-
-#################################
-Discussion Components
-#################################
-
-You can add inline discussion components to any container in your
-course.
-
-See:
-
-* `Create the XML File for a Discussion Component`_
-* `Discussion Component XML File Elements`_
-* `discussion Element Attributes`_
-* `Example Discussion Component XML File`_
-
-**********************************************
-Create the XML File for a Discussion Component
-**********************************************
-
-You create an XML file in the ``discussion`` directory for each inline
-discussion component in your course.
-
-The name of the XML file must match the value of the @url_name attribute of the
-``discussion`` element in the vertical XML file.
-
-In-line, you can create, if the vertical XML file contains:
-
-.. code-block:: xml
-  
-   <vertical display_name="Lesson_1_Unit_1">
-      <discussion 
-          discussion_category="Essays" 
-          discussion_id="peer_grading_component" 
-          discussion_target="Peer Grading" 
-          display_name="Peer Grading"
-	  url_name="peer_grading_discussion"
-       /> 
-  </vertical>
-
-If you prefer to create the discussion in its own file, you can create: 
-
-.. code-block:: xml
-
-   <vertical display_name="Lesson_1_Unit_1">
-      <discussion 
-	  url_name="Introduce_Yourself"
-       /> 
-  </vertical>
-
-You create the file ``discussion/Introduce_Yourself.xml`` to define the inline
-discussion component.
-
-***************************************
-Discussion Component XML File Elements
-***************************************
-
-The root element of the XML file for the HTML component is file is
-``discussion``.
-
-The ``discussion`` element contains not children.
-
-*************************************
-``discussion`` Element Attributes
-*************************************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Attribute
-     - Meaning
-   * - ``display_name``
-     - The value that is displayed to students as the name of the discussion
-       component.
-   * - ``discussion_category``
-     - The name of the category for the inline discussion as shown in the main
-       **Discussion** tab of the course.
-   * - ``for``
-     - A string that describes the discussion for students.
-   * - ``id``
-     - The unique identifier that the discussion forum service uses to refer to
-       this inline discussion component. This value must be unique across all
-       courses in the edX deployment. Therefore it is recommended that you use
-       the standard *<course_name>_<course_run>_<descriptor>* as in the above
-       example. Do not use a period (.) in the ID value.
-   * - ``discussion_id``
-     - ???
-   * - ``discussion_target``
-     - ???
-
-
-*************************************
-Example Discussion Component XML File
-*************************************
-
-The following example shows an XML file for a discussion component:
-
-.. code-block:: xml
-  
-  <discussion 
-      discussion_category="Essays" 
-      discussion_id="6e51dd8f181b44ffa6d91303a287ed3f" 
-      discussion_target="Peer Grading" 
-      display_name="Peer Grading"
-   /> 
diff --git a/docs/en_us/olx/source/components/full_screen_image.rst b/docs/en_us/olx/source/components/full_screen_image.rst
deleted file mode 100644
index 493b72221b..0000000000
--- a/docs/en_us/olx/source/components/full_screen_image.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/full_screen_image.rst
-
diff --git a/docs/en_us/olx/source/components/google_hangout.rst b/docs/en_us/olx/source/components/google_hangout.rst
deleted file mode 100644
index 715047feb2..0000000000
--- a/docs/en_us/olx/source/components/google_hangout.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/google_hangouts.rst
-
diff --git a/docs/en_us/olx/source/components/graphical_slider_tool.rst b/docs/en_us/olx/source/components/graphical_slider_tool.rst
deleted file mode 100644
index 0d86e1ce10..0000000000
--- a/docs/en_us/olx/source/components/graphical_slider_tool.rst
+++ /dev/null
@@ -1,565 +0,0 @@
-.. _Graphical Slider Tool:
-
-*********************************************
-Graphical Slider Tool
-*********************************************
-
-.. module:: xml_format_gst
-
-
-Format description
-==================
-
-Graphical slider tool (GST) main tag is::
-
-    <graphical_slider_tool> BODY </graphical_slider_tool>
-
-``graphical_slider_tool`` tag must have two children tags: ``render``
-and ``configuration``.
-
-
-Render tag
-----------
-
-Render tag can contain usual html tags mixed with some GST specific tags::
-
-    <slider/> - represents jQuery slider for changing a parameter's value
-    <textbox/> - represents a text input field for changing a parameter's value
-    <plot/> - represents Flot JS plot element
-
-Also GST will track all elements inside ``<render></render>`` where ``id``
-attribute is set, and a corresponding parameter referencing that ``id`` is present
-in the configuration section below. These will be referred to as dynamic elements.
-
-The contents of the <render> section will be shown to the user after
-all occurrences of::
-
-    <slider var="{parameter name}" [style="{CSS statements}"] />
-    <textbox var="{parameter name}" [style="{CSS statements}"] />
-    <plot [style="{CSS statements}"] />
-
-have been converted to actual sliders, text inputs, and a plot graph.
-Everything in square brackets is optional. After initialization, all
-text input fields, sliders, and dynamic elements will be set to the initial
-values of the parameters that they are assigned to.
-
-``{parameter name}`` specifies the parameter to which the slider or text
-input will be attached to.
-
-[style="{CSS statements}"] specifies valid CSS styling. It will be passed
-directly to the browser without any parsing.
-
-There is a one-to-one relationship between a slider and a parameter.
-I.e. for one parameter you can put only one ``<slider>`` in the
-``<render>`` section. However, you don't have to specify a slider - they
-are optional.
-
-There is a many-to-one relationship between text inputs and a
-parameter. I.e. for one parameter you can put many '<textbox>' elements in
-the ``<render>`` section. However, you don't have to specify a text
-input - they are optional.
-
-You can put only one ``<plot>`` in the ``<render>`` section. It is not
-required.
-
-
-Slider tag
-..........
-
-Slider tag must have ``var`` attribute and optional ``style`` attribute::
-
-    <slider var='a' style="width:400px;float:left;" />
-
-After processing, slider tags will be replaced by jQuery UI sliders with applied
-``style`` attribute.
-
-``var`` attribute must correspond to a parameter. Parameters can be used in any
-of the ``function`` tags in ``functions`` tag. By moving slider, value of
-parameter ``a`` will change, and so result of function, that depends on parameter
-``a``, will also change.
-
-
-Textbox tag
-...........
-
-Texbox tag must have ``var`` attribute and optional ``style`` attribute::
-
-    <textbox var="b" style="width:50px; float:left; margin-left:10px;" />
-
-After processing, textbox tags will be replaced by html text inputs with applied
-``style`` attribute. If you want a readonly text input, then you should use a
-dynamic element instead (see section below "HTML tagsd with ID").
-
-``var`` attribute must correspond to a parameter. Parameters can be used in any
-of the ``function`` tags in ``functions`` tag. By changing the value on the text input,
-value of parameter ``a`` will change, and so result of function, that depends on
-parameter ``a``, will also change.
-
-
-Plot tag
-........
-
-Plot tag may have optional ``style`` attribute::
-
-    <plot style="width:50px; float:left; margin-left:10px;" />
-
-After processing plot tags will be replaced by Flot JS plot with applied
-``style`` attribute.
-
-
-HTML tags with ID (dynamic elements)
-....................................
-
-Any HTML tag with ID, e.g. ``<span id="answer_span_1">`` can be used as a
-place where result of function can be inserted. To insert function result to
-an element, element ID must be included in ``function`` tag as ``el_id`` attribute
-and ``output`` value must be ``"element"``::
-
-    <function output="element" el_id="answer_span_1">
-                    function add(a, b, precision) {
-                        var x = Math.pow(10, precision || 2);
-                        return (Math.round(a * x) + Math.round(b * x)) / x;
-                    }
-
-                    return add(a, b, 5);
-    </function>
-
-
-Configuration tag
------------------
-
-The configuration tag contains parameter settings, graph
-settings, and function definitions which are to be plotted on the
-graph and that use specified parameters.
-
-Configuration tag contains two mandatory tag ``functions`` and ``parameters`` and
-may contain another ``plot`` tag.
-
-
-Parameters tag
-..............
-
-``Parameters`` tag contains ``parameter`` tags. Each ``parameter`` tag must have
-``var``, ``max``, ``min``, ``step`` and ``initial`` attributes::
-
-        <parameters>
-                <param var="a" min="-10.0" max="10.0" step="0.1" initial="0" />
-                <param var="b" min="-10.0" max="10.0" step="0.1" initial="0" />
-        </parameters>
-
-``var`` attribute links min, max, step and initial values to parameter name.
-
-``min`` attribute is the minimal value that a parameter can take. Slider and input
-values can not go below it.
-
-``max`` attribute is the maximal value that a parameter can take. Slider and input
-values can not go over it.
-
-``step`` attribute is value of slider step. When a slider increase or decreases
-the specified parameter, it will do so by the amount specified with 'step'
-
-``initial`` attribute is the initial value that the specified parameter should be
-set to. Sliders and inputs will initially show this value.
-
-The parameter's name is specified by the ``var`` property. All occurrences
-of sliders and/or text inputs that specify a ``var`` property, will be
-connected to this parameter - i.e. they will reflect the current
-value of the parameter, and will be updated when the parameter
-changes.
-
-If at lest one of these attributes is not set, then the parameter
-will not be used, slider's and/or text input elements that specify
-this parameter will not be activated, and the specified functions
-which use this parameter will not return a numeric value. This means
-that neglecting to specify at least one of the attributes for some
-parameter will have the result of the whole GST instance not working
-properly.
-
-
-Functions tag
-.............
-
-For the GST to do something, you must defined at least one
-function, which can use any of the specified parameter values. The
-function expects to take the ``x`` value, do some calculations, and
-return the ``y`` value. I.e. this is a 2D plot in Cartesian
-coordinates. This is how the default function is meant to be used for
-the graph.
-
-There are other special cases of functions. They are used mainly for
-outputting to elements, plot labels, or for custom output. Because
-the return a single value, and that value is meant for a single element,
-these function are invoked only with the set of all of the parameters.
-I.e. no ``x`` value is available inside them. They are useful for
-showing the current value of a parameter, showing complex static
-formulas where some parameter's value must change, and other useful
-things.
-
-The different style of function is specified by the ``output`` attribute.
-
-Each function must be defined inside ``function`` tag in  ``functions`` tag::
-
-    <functions>
-        <function output="element" el_id="answer_span_1">
-            function add(a, b, precision) {
-                var x = Math.pow(10, precision || 2);
-                return (Math.round(a * x) + Math.round(b * x)) / x;
-            }
-
-            return add(a, b, 5);
-        </function>
-    </functions>
-
-The parameter names (along with their values, as provided from text
-inputs and/or sliders), will be available inside all defined
-functions. A defined function body string will be parsed internally
-by the browser's JavaScript engine and converted to a true JS
-function.
-
-The function's parameter list will automatically be created and
-populated, and will include the ``x`` (when ``output`` is not specified or
-is set to ``"graph"``), and all of the specified parameter values (from sliders
-and text inputs). This means that each of the defined functions will have
-access to all of the parameter values. You don't have to use them, but
-they will be there.
-
-Examples::
-
-    <function>
-        return x;
-    </function>
-
-    <function dot="true" label="\(y_2\)">
-        return (x + a) * Math.sin(x * b);
-    </function>
-
-    <function color="green">
-        function helperFunc(c1) {
-            return c1 * c1 - a;
-        }
-        return helperFunc(x + 10 * a * b) + Math.sin(a - x);
-    </function>
-
-Required parameters::
-
-    function body:
-
-    A string composing a normal JavaScript function
-    except that there is no function declaration
-    (along with parameters), and no closing bracket.
-
-    So if you normally would have written your
-    JavaScript function like this:
-
-        function myFunc(x, a, b) {
-            return x * a + b;
-        }
-
-    here you must specify just the function body
-    (everything that goes between '{' and '}'). So,
-    you would specify the above function like so (the
-    bare-bone minimum):
-
-        <function>return x * a + b;</function>
-
-    VERY IMPORTANT: Because the function will be passed
-    to the browser as a single string, depending on implementation
-    specifics, the end-of-line characters can be stripped. This
-    means that single line JavaScript comments (starting with "//")
-    can lead to the effect that everything after the first such comment
-    will be treated as a comment. Therefore, it is absolutely
-    necessary that such single line comments are not used when
-    defining functions for GST. You can safely use the alternative
-    multiple line JavaScript comments (such comments start with "/*"
-    and end with "*/).
-
-    VERY IMPORTANT: If you have a large function body, and decide to
-    split it into several lines, than you must wrap it in "CDATA" like
-    so:
-
-        <function>
-        <![CDATA[
-            var dNew;
-
-            dNew = 0.3;
-
-            return x * a + b - dNew;
-        ]]>
-        </function>
-
-Optional parameters::
-
-
-    color:  Color name ('red', 'green', etc.) or in the form of
-            '#FFFF00'. If not specified, a default color (different
-            one for each graphed function) will be given by Flot JS.
-    line:   A string - 'true' or 'false'. Should the data points be
-            connected by a line on the graph? Default is 'true'.
-    dot:    A string - 'true' or 'false'. Should points be shown for
-            each data point on the graph? Default is 'false'.
-    bar:    A string - 'true' or 'false'. When set to 'true', points
-            will be plotted as bars.
-    label:  A string. If provided, will be shown in the legend, along
-            with the color that was used to plot the function.
-    output: 'element', 'none', 'plot_label', or 'graph'. If not defined,
-            function will be plotted (same as setting 'output' to 'graph').
-            If defined, and other than 'graph', function will not be
-            plotted, but it's output will be inserted into the element
-            with ID specified by 'el_id' attribute.
-    el_id:  Id of HTML element, defined in '<render>' section. Value of
-            function will be inserted as content of this element.
-    disable_auto_return: By default, if JavaScript function string is written
-                         without a "return" statement, the "return" will be
-                         prepended to it. Set to "true" to disable this
-                         functionality. This is done so that simple functions
-                         can be defined in an easy fashion (for example, "a",
-                         which will be translated into "return a").
-    update_on: A string - 'change', or 'slide'. Default (if not set) is
-               'slide'. This defines the event on which a given function is
-               called, and its result is inserted into an element. This
-               setting is relevant only when "output" is other than "graph".
-
-When specifying ``el_id``, it is essential to set "output" to one of
-    element - GST will invoke the function, and the return of it will be
-              inserted into a HTML element with id specified by ``el_id``.
-    none    - GST will simply inoke the function. It is left to the instructor
-              who writes the JavaScript function body to update all necesary
-              HTML elements inside the function, before it exits. This is done
-              so that extra steps can be preformed after an HTML element has
-              been updated with a value. Note, that because the return value
-              from this function is not actually used, it will be tempting to
-              omit the "return" statement. However, in this case, the attribute
-              "disable_auto_return" must be set to "true" in order to prevent
-              GST from inserting a "return" statement automatically.
-    plot_label - GST will process all plot labels (which are strings), and
-                 will replace the all instances of substrings specified by
-                 ``el_id`` with the returned value of the function. This is
-                 necessary if you want a label in the graph to have some changing
-                 number. Because of the nature of Flot JS, it is impossible to
-                 achieve the same effect by setting the "output" attribute
-                 to "element", and including a HTML element in the label.
-
-The above values for "output" will tell GST that the function is meant for an
-HTML element (not for graph), and that it should not get an 'x' parameter (along
-with some value).
-
-
-[Note on MathJax and labels]
-............................
-
-Independently of this module, will render all TeX code
-within the ``<render>`` section into nice mathematical formulas. Just
-remember to wrap it in one of::
-
-    \(  and  \)  -  for inline formulas (formulas surrounded by
-                  standard text)
-    \[  and  \]  -  if you want the formula to be a separate line
-
-It is possible to define a label in standard TeX notation. The JS
-library MathJax will work on these labels also because they are
-inserted on top of the plot as standard HTML (text within a DIV).
-
-If the label is dynamic, i.e. it will contain some text (numeric, or other)
-that has to be updated on a parameter's change, then one can define
-a special function to handle this. The "output" of such a function must be
-set to "none", and the JavaScript code inside this function must update the
-MathJax element by itself. Before exiting, MathJax typeset function should
-be called so that the new text will be re-rendered by MathJax. For example::
-
-    <render>
-        ...
-        <span id="dynamic_mathjax"></span>
-    </render>
-    ...
-    <function output="none" el_id="dynamic_mathjax">
-    <![CDATA[
-        var out_text;
-
-        out_text = "\\[\\mathrm{Percent \\space of \\space treated \\space with \\space YSS=\\frac{"
-          +(treated_men*10)+"\\space men *"
-          +(your_m_tx_yss/100)+"\\space prev. +\\space "
-          +((100-treated_men)*10)+"\\space women *"
-          +(your_f_tx_yss/100)+"\\space prev.}"
-          +"{1000\\space total\\space treated\\space patients}"
-          +"="+drummond_combined[0][1]+"\\%}\\]";
-          mathjax_for_prevalence_calcs+="\\[\\mathrm{Percent \\space of \\space untreated \\space with \\space YSS=\\frac{"
-          +(untreated_men*10)+"\\space men *"
-          +(your_m_utx_yss/100)+"\\space prev. +\\space "
-          +((100-untreated_men)*10)+"\\space women *"
-          +(your_f_utx_yss/100)+"\\space prev.}"
-          +"{1000\\space total\\space untreated\\space patients}"
-          +"="+drummond_combined[1][1]+"\\%}\\]";
-
-        $("#dynamic_mathjax").html(out_text);
-
-        MathJax.Hub.Queue(["Typeset",MathJax.Hub,"dynamic_mathjax"]);
-    ]]>
-    </function>
-    ...
-
-
-Plot tag
-........
-
-``Plot`` tag inside ``configuration`` tag defines settings for plot output.
-
-Required parameters::
-
-    xrange: 2 functions that must return value. Value is constant (3.1415)
-            or depend on parameter from parameters section:
-                <xrange>
-                    <min>return 0;</min>
-                    <max>return 30;</max>
-                </xrange>
-                                        or
-                <xrange>
-                    <min>return -a;</min>
-                    <max>return a;</max>
-                </xrange>
-
-            All functions will be calculated over domain between xrange:min
-            and xrange:max. Xrange depending on parameter is extremely
-            useful when domain(s) of your function(s) depends on parameter
-            (like circle, when parameter is radius and you want to allow
-            to change it).
-
-Optional parameters::
-
-    num_points: Number of data points to generated for the plot. If
-                this is not set, the number of points will be
-                calculated as width / 5.
-
-    bar_width: If functions are present which are to be plotted as bars,
-               then this parameter specifies the width of the bars. A
-               numeric value for this parameter is expected.
-
-    bar_align: If functions are present which are to be plotted as bars,
-               then this parameter specifies how to align the bars relative
-               to the tick. Available values are "left" and "center".
-
-    xticks,
-    yticks:    3 floating point numbers separated by commas. This
-               specifies how many ticks are created, what number they
-               start at, and what number they end at. This is different
-               from the 'xrange' setting in that it has nothing to do
-               with the data points - it control what area of the
-               Cartesian space you will see. The first number is the
-               first tick's value, the second number is the step
-               between each tick, the third number is the value of the
-               last tick. If these configurations are not specified,
-               Flot will chose them for you based on the data points
-               set that he is currently plotting. Usually, this results
-               in a nice graph, however, sometimes you need to fine
-               grain the controls. For example, when you want to show
-               a fixed area of the Cartesian space, even when the data
-               set changes. On it's own, Flot will recalculate the
-               ticks, which will result in a different graph each time.
-               By specifying the xticks, yticks configurations, only
-               the plotted data will change - the axes (ticks) will
-               remain as you have defined them.
-
-    xticks_names, yticks_names:
-              A JSON string which represents a mapping of xticks, yticks
-              values to some defined strings. If specified, the graph will
-              not have any xticks, yticks except those for which a string
-              value has been defined in the JSON string. Note that the
-              matching will be string-based and not numeric. I.e. if a tick
-              value was "3.70" before, then inside the JSON there should be
-              a mapping like {..., "3.70": "Some string", ...}. Example:
-
-                  <xticks_names>
-                  <![CDATA[
-                  {
-                      "1": "Treated", "2": "Not Treated",
-                      "4": "Treated", "5": "Not Treated",
-                      "7": "Treated", "8": "Not Treated"
-                  }
-                  ]]>
-                  </xticks_names>
-
-                  <yticks_names>
-                  <![CDATA[
-                      {"0": "0%", "10": "10%", "20": "20%", "30": "30%", "40": "40%", "50": "50%"}
-                  ]]>
-                  </yticks_names>
-
-    xunits,
-    yunits:   Units values to be set on axes. Use MathJax. Example:
-                <xunits>\(cm\)</xunits>
-                <yunits>\(m\)</yunits>
-
-    moving_label:
-              A way to specify a label that should be positioned dynamically,
-              based on the values of some parameters, or some other factors.
-              It is similar to a <function>, but it is only valid for a plot
-              because it is drawn relative to the plot coordinate system.
-
-              Multiple "moving_label" configurations can be provided, each one
-              with a unique text and a unique set of functions that determine
-              it's dynamic positioning.
-
-              Each "moving_label" can have a "color" attribute (CSS color notation),
-              and a "weight" attribute. "weight" can be one of "normal" or "bold",
-              and determines the styling of moving label's text.
-
-              Each "moving_label" function should return an object with a 'x'
-              and 'y properties. Within those functions, all of the parameter
-              names along with their value are available.
-
-              Example (note that "return" statement is missing; it will be automatically
-              inserted by GST):
-
-                  <moving_label text="Co" weight="bold" color="red>
-                  <![CDATA[  {'x': -50, 'y': c0};]]>
-                  </moving_label>
-
-    asymptote:
-              Add a vertical or horizontal asymptote to the graph which will
-              be dynamically repositioned based on the specified function.
-
-              It is similar to the function in that it provides a JavaScript body function
-              string. This function will be used to calculate the position of the asymptote
-              relative to the axis specified by the "type" parameter.
-
-              Required parameters:
-                  type:
-                        Which axis should the asymptote be plotted against. Available values
-                        are "x" and "y".
-
-              Optional parameters:
-                  color:
-                        The color of the line. A valid CSS color string is expected.
-
-
-Example
-=======
-
-
-Plotting, sliders and inputs
-----------------------------
-
-.. literalinclude:: gst_example_with_documentation.xml
-
-
-Update of html elements, no plotting
-------------------------------------
-
-.. literalinclude:: gst_example_html_element_output.xml
-
-
-Circle with dynamic radius
---------------------------
-
-.. literalinclude:: gst_example_dynamic_range.xml
-
-
-Example of a bar graph
-----------------------
-
-.. literalinclude:: gst_example_bars.xml
-
-
-Example of moving labels of graph
----------------------------------
-
-.. literalinclude:: gst_example_dynamic_labels.xml
diff --git a/docs/en_us/olx/source/components/gst_example_bars.xml b/docs/en_us/olx/source/components/gst_example_bars.xml
deleted file mode 100644
index f0a197bb79..0000000000
--- a/docs/en_us/olx/source/components/gst_example_bars.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<vertical>
-    <graphical_slider_tool>
-      <render>
-        <h2>Graphic slider tool: Bar graph example.</h2>
-
-        <p>We can request the API to plot us a bar graph.</p>
-        <div style="clear:both">
-          <p style="width:60px;float:left;">a</p>
-          <slider var='a' style="width:400px;float:left;"/>
-          <textbox var='a' style="width:50px;float:left;margin-left:15px;"/>
-          <br /><br /><br />
-          <p style="width:60px;float:left;">b</p>
-          <slider var='b' style="width:400px;float:left;"/>
-          <textbox var='b' style="width:50px;float:left;margin-left:15px;"/>
-        </div>
-          <plot style="clear:left;"/>
-      </render>
-      <configuration>
-        <parameters>
-            <param var="a" min="-100" max="100" step="5" initial="25" />
-            <param var="b" min="-100" max="100" step="5" initial="50" />
-        </parameters>
-        <functions>
-          <function bar="true" color="blue" label="Men">
-            <![CDATA[if (((x>0.9) && (x<1.1)) || ((x>4.9) && (x<5.1))) { return Math.sin(a * 0.01 * Math.PI + 2.952 * x); }
-            else {return undefined;}]]>
-          </function>
-          <function bar="true" color="red" label="Women">
-            <![CDATA[if (((x>1.9) && (x<2.1)) || ((x>3.9) && (x<4.1))) { return Math.cos(b * 0.01 * Math.PI + 3.432 * x); }
-            else {return undefined;}]]>
-          </function>
-          <function bar="true" color="green" label="Other 1">
-            <![CDATA[if (((x>1.9) && (x<2.1)) || ((x>3.9) && (x<4.1))) { return Math.cos((b - 10 * a) * 0.01 * Math.PI + 3.432 * x); }
-            else {return undefined;}]]>
-          </function>
-          <function bar="true" color="yellow" label="Other 2">
-            <![CDATA[if (((x>1.9) && (x<2.1)) || ((x>3.9) && (x<4.1))) { return Math.cos((b + 7 * a) * 0.01 * Math.PI + 3.432 * x); }
-            else {return undefined;}]]>
-          </function>
-        </functions>
-        <plot>
-          <xrange><min>1</min><max>5</max></xrange>
-          <num_points>5</num_points>
-          <xticks>0, 0.5, 6</xticks>
-          <yticks>-1.5, 0.1, 1.5</yticks>
-          <xticks_names>
-          <![CDATA[
-              {
-                  "1.5": "Single", "4.5": "Married"
-              }
-          ]]>
-          </xticks_names>
-          <yticks_names>
-          <![CDATA[
-              {
-                  "-1.0": "-100%", "-0.5": "-50%", "0.0": "0%", "0.5": "50%", "1.0": "100%"
-              }
-          ]]>
-          </yticks_names>
-          <bar_width>0.4</bar_width>
-        </plot>
-      </configuration>
-    </graphical_slider_tool>
-</vertical>
diff --git a/docs/en_us/olx/source/components/gst_example_dynamic_labels.xml b/docs/en_us/olx/source/components/gst_example_dynamic_labels.xml
deleted file mode 100644
index 05cbe407fb..0000000000
--- a/docs/en_us/olx/source/components/gst_example_dynamic_labels.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<vertical>
- <graphical_slider_tool>
-      <render>
-        <h1>Graphic slider tool: Dynamic labels.</h1>
-        <p>There are two kinds of dynamic lables.
-        1) Dynamic changing values in graph legends.
-        2) Dynamic labels, which coordinates depend on parameters </p>
-         <p>a: <slider var="a"/></p>
-          <br/>
-          <p>b: <slider var="b"/></p>
-          <br/><br/>
-          <plot style="width:400px; height:400px;"/>
-      </render>
-
-      <configuration>
-        <parameters>
-            <param var="a" min="-10" max="10" step="1" initial="0" />
-            <param var="b" min="0" max="10" step="0.5" initial="5" />
-        </parameters>
-        <functions>
-          <function label="Value of a is: dyn_val_1">a * x + b</function>
-         <!-- dynamic values in legend -->
-         <function output="plot_label" el_id="dyn_val_1">a</function>
-        </functions>
-        <plot>
-          <xrange><min>0</min><max>30</max></xrange>
-          <num_points>10</num_points>
-          <xticks>0, 6, 30</xticks>
-          <yticks>-9, 1, 9</yticks>
-          <!-- custom labels with coordinates as any function of parameter -->
-          <moving_label text="Dynam_lbl 1" weight="bold">
-          <![CDATA[  {'x': 10, 'y': a};]]>
-          </moving_label>
-          <moving_label text="Dynam lbl 2" weight="bold">
-          <![CDATA[  {'x': -6, 'y': b};]]>
-          </moving_label>
-        </plot>
-      </configuration>
-    </graphical_slider_tool>
-</vertical>
\ No newline at end of file
diff --git a/docs/en_us/olx/source/components/gst_example_dynamic_range.xml b/docs/en_us/olx/source/components/gst_example_dynamic_range.xml
deleted file mode 100644
index 0ce4263d62..0000000000
--- a/docs/en_us/olx/source/components/gst_example_dynamic_range.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<vertical>
-    <graphical_slider_tool>
-      <render>
-        <h2>Graphic slider tool: Dynamic range and implicit functions.</h2>
-
-        <p>You can make x range (not ticks of x axis) of functions to depend on
-          parameter value. This can be useful when function domain depends
-          on parameter.</p>
-        <p>Also implicit functons like circle can be plotted as 2 separate
-            functions of same color.</p>
-         <div style="height:50px;">
-         <slider var='a' style="width:400px;float:left;"/>
-         <textbox var='a' style="float:left;width:60px;margin-left:15px;"/>
-       </div>
-        <plot style="margin-top:15px;margin-bottom:15px;"/>
-      </render>
-      <configuration>
-        <parameters>
-            <param var="a" min="5" max="25" step="0.5" initial="12.5" />
-        </parameters>
-        <functions>
-          <function color="red">Math.sqrt(a * a - x * x)</function>
-          <function color="red">-Math.sqrt(a * a - x * x)</function>
-        </functions>
-        <plot>
-          <xrange>
-            <!-- dynamic range -->
-              <min>-a</min>
-              <max>a</max>
-          </xrange>
-          <num_points>1000</num_points>
-          <xticks>-30, 6, 30</xticks>
-          <yticks>-30, 6, 30</yticks>
-        </plot>
-      </configuration>
-    </graphical_slider_tool>
-</vertical>
diff --git a/docs/en_us/olx/source/components/gst_example_html_element_output.xml b/docs/en_us/olx/source/components/gst_example_html_element_output.xml
deleted file mode 100644
index 340783871a..0000000000
--- a/docs/en_us/olx/source/components/gst_example_html_element_output.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<vertical>
-    <graphical_slider_tool>
-        <render>
-            <h2>Graphic slider tool: Output to DOM element.</h2>
-
-            <p>a + b = <span id="answer_span_1"></span></p>
-
-            <div style="clear:both">
-                <p style="float:left;margin-right:10px;">a</p>
-                <slider var='a' style="width:400px;float:left;"/>
-                <textbox var='a' style="width:50px;float:left;margin-left:15px;"/>
-            </div>
-
-            <div style="clear:both">
-                <p style="float:left;margin-right:10px;">b</p>
-                <slider var='b' style="width:400px;float:left;"/>
-                <textbox var='b' style="width:50px;float:left;margin-left:15px;"/>
-            </div>
-            <br/><br/><br/>
-            <plot/>
-        </render>
-        <configuration>
-            <parameters>
-                <param var="a" min="-10.0" max="10.0" step="0.1" initial="0" />
-                <param var="b" min="-10.0" max="10.0" step="0.1" initial="0" />
-            </parameters>
-
-            <functions>
-                <function output="element" el_id="answer_span_1">
-                    function add(a, b, precision) {
-                        var x = Math.pow(10, precision || 2);
-                        return (Math.round(a * x) + Math.round(b * x)) / x;
-                    }
-
-                    return add(a, b, 5);
-                </function>
-            </functions>
-        </configuration>
-    </graphical_slider_tool>
-</vertical>
diff --git a/docs/en_us/olx/source/components/gst_example_with_documentation.xml b/docs/en_us/olx/source/components/gst_example_with_documentation.xml
deleted file mode 100644
index addada5b10..0000000000
--- a/docs/en_us/olx/source/components/gst_example_with_documentation.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<vertical>
-    <graphical_slider_tool>
-      <render>
-
-          <h2>Graphic slider tool: full example.</h2>
-            <p>
-                A simple equation
-                    \(
-                        y_1 = 10 \times b \times \frac{sin(a \times x) \times sin(b \times x)}{cos(b \times x) + 10}
-                    \)
-                can be plotted.
-            </p>
-
-            <!-- make text and input or slider at the same line -->
-            <div>
-              <p style="float:left;"> Currently \(a\) is</p>
-              <!-- readonly input for a -->
-              <span id="a_readonly" style="width:50px; float:left; margin-left:10px;"/>
-            </div>
-            <!-- clear:left will make next text to begin from new line -->
-            <p style="clear:left">   This one
-                  \(
-                      y_2 = sin(a \times x)
-                  \)
-              will be overlayed on top.
-            </p>
-            <div>
-              <p style="float:left;">Currently \(b\) is </p>
-              <textbox var="b" style="width:50px; float:left; margin-left:10px;"/>
-            </div>
-            <div style="clear:left;">
-              <p style="float:left;">To change \(a\) use:</p>
-              <slider var="a" style="width:400px;float:left;margin-left:10px;"/>
-            </div>
-            <div style="clear:left;">
-              <p style="float:left;">To change \(b\) use:</p>
-              <slider var="b" style="width:400px;float:left;margin-left:10px;"/>
-            </div>
-            <plot style='clear:left;width:600px;padding-top:15px;padding-bottom:20px;'/>
-            <div style="clear:left;height:50px;">
-             <p style="float:left;">Second input for b:</p>
-             <!-- editable input for b -->
-              <textbox var="b" style="color:red;width:60px;float:left;margin-left:10px;"/>
-            </div >
-      </render>
-
-      <configuration>
-
-        <parameters>
-            <param var="a" min="90" max="120" step="10" initial="100" />
-            <param var="b" min="120" max="200" step="2.3" initial="120" />
-        </parameters>
-
-        <functions>
-
-          <function color="#0000FF" line="false" dot="true" label="\(y_1\)">
-            return 10.0 * b * Math.sin(a * x) * Math.sin(b * x) / (Math.cos(b * x) + 10);
-          </function>
-          <function color="red" line="true" dot="false" label="\(y_2\)">
-            <!-- works w/o return, if function is single line -->
-            Math.sin(a * x);
-          </function>
-          <function color="#FFFF00" line="false" dot="false" label="unknown">
-            function helperFunc(c1) {
-              return c1 * c1 - a;
-            }
-
-            return helperFunc(x + 10 * a * b) + Math.sin(a - x);
-          </function>
-          <function output="element" el_id="a_readonly">a</function>
-        </functions>
-
-        <plot>
-
-          <xrange>
-              <min>return 0;</min>
-              <!-- works w/o return -->
-              <max>30</max>
-          </xrange>
-
-          <num_points>120</num_points>
-
-          <xticks>0, 3, 30</xticks>
-          <yticks>-1.5, 1.5, 13.5</yticks>
-
-          <xunits>\(cm\)</xunits>
-          <yunits>\(m\)</yunits>
-        </plot>
-      </configuration>
-    </graphical_slider_tool>
-</vertical>
diff --git a/docs/en_us/olx/source/components/html-components.rst b/docs/en_us/olx/source/components/html-components.rst
deleted file mode 100644
index 3a11ca3424..0000000000
--- a/docs/en_us/olx/source/components/html-components.rst
+++ /dev/null
@@ -1,122 +0,0 @@
-.. _HTML Components:
-
-#################################
-HTML Components
-#################################
-
-See:
-
-* `Create the HTML Component`_
-* `Example of an HTML Component Embedded in a Vertical`_
-* `Example of Separate HTML Files`_
-* `HTML Component XML File Elements`_
-* `html Element Attributes`_
-* `Example HTML Component XML File`_
-* `Example HTML Component Content`_
-
-
-*********************************************
-Create the HTML Component
-*********************************************
-
-To add an HTML component to your course, you can embed the XML for it in the
-parent XML file, or split it up into either 1 or 2 additional files. You can
-break up the HTML configuration into an .xml file in the html directory and an
-additional .html file in the same directory. 
-
-.. caution:: If you are including HTML that is not valid HTML, you must break out HTML content in a separate file.
-
-
-*****************************************************
-Example of an HTML Component Embedded in a Vertical
-*****************************************************
-
-.. code-block:: xml
-  
-   <vertical display_name="Lesson_1_Unit_1">
-      ...
-      <html>The above has an error. <b>x</b> should be <b>y</b> in the second equation.</html>
-  </vertical>
-
-
-*********************************************
-Example of Separate HTML Files
-*********************************************
-
-You create an XML file in the ``html`` directory for each HTML component in
-your course.
-
-The name of the XML file must match the value of the @url_name attribute of the
-``html`` element in the vertical XML file.
-
-For example, if the vertical XML file contains:
-
-.. code-block:: xml
-  
-   <vertical display_name="Lesson_1_Unit_1">
-      <html url_name="Introduction"/>
-      . . .
-  </vertical>
-
-You create the file ``html/Introduction.xml`` to define the HTML component.
-
-*************************************
-HTML Component XML File Elements
-************************************* 
-
-The root element of the XML file for the HTML component is file is ``html``. 
-
-In this case, the ``html`` element contains no children.
-
-*************************************
-``html`` Element Attributes
-*************************************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Attribute
-     - Meaning
-   * - ``display_name``
-     - The value that is displayed to students as the name of the HTML
-       component.
-   * - ``file_name``
-     - The name of the HTML file that contains the content for the HTML
-       component, without the ``.HTML`` extension.
-
-*************************************
-Example HTML Component XML File
-*************************************
-
-The following example shows an XML file for an HTML component:
-
-.. code-block:: xml
-  
-  <html filename="Introduction" display_name="Unit Introduction"/>  
-
-
-*************************************
-Example HTML Component Content
-*************************************
-
-In the component's HTML file, you add valid HTML to represent the content you
-want to be displayed to students. For example, the following is from an HTML
-file for the edX Demo course:
-
-.. code-block:: html
-  
-    <h2>Lesson 2: Let's Get INTERACTIVE!</h2> 
-    <p>
-    <img
-    src="/static/interactive_x250.png" alt="Interactive" width="250"
-    hspace="12" vspace="12" border="0" align="right" />Now that you know your
-    way around an edX course let's look at some of the exciting interactive
-    tools you may encounter. Use the learning sequence above to explore.
-    &nbsp;</p> 
-    <p>Once you have tried the interactive tools in this lesson,
-    make sure to check out the week 2 homework where we show you several of the
-    really cool interactive labs we&rsquo;ve created for past courses.
-    &nbsp;They&rsquo;re fun to play with. &nbsp;Many courses will have tools
-    and labs that you need to use to complete homework assignments.</p>
-
diff --git a/docs/en_us/olx/source/components/iframe.rst b/docs/en_us/olx/source/components/iframe.rst
deleted file mode 100644
index 9bacd4e734..0000000000
--- a/docs/en_us/olx/source/components/iframe.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/iframe.rst
-
diff --git a/docs/en_us/olx/source/components/index.rst b/docs/en_us/olx/source/components/index.rst
deleted file mode 100644
index f85c3b3e43..0000000000
--- a/docs/en_us/olx/source/components/index.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-.. _Course Components:
-
-#################################
-Course Components (XBlocks)
-#################################
-
-Use the chapters in this section to create course components. 
-
-.. toctree::
-   :maxdepth: 2
-
-   html-components
-   discussion-components
-   video-components
-   annotation
-   conditional_module
-   full_screen_image
-   google_hangout
-   graphical_slider_tool
-   iframe
-   lti_component
-   open_response_assessment
-   periodic_table
-   poll
-   word_cloud 
-   zooming_image
diff --git a/docs/en_us/olx/source/components/lti_component.rst b/docs/en_us/olx/source/components/lti_component.rst
deleted file mode 100644
index b7a5e4e8c1..0000000000
--- a/docs/en_us/olx/source/components/lti_component.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/lti_component.rst
-
diff --git a/docs/en_us/olx/source/components/open_response_assessment.rst b/docs/en_us/olx/source/components/open_response_assessment.rst
deleted file mode 100644
index c9a6869509..0000000000
--- a/docs/en_us/olx/source/components/open_response_assessment.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/open_response_assessment.rst
-
diff --git a/docs/en_us/olx/source/components/periodic_table.rst b/docs/en_us/olx/source/components/periodic_table.rst
deleted file mode 100644
index 2dad6a862a..0000000000
--- a/docs/en_us/olx/source/components/periodic_table.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/periodic_table.rst
-
diff --git a/docs/en_us/olx/source/components/poll.rst b/docs/en_us/olx/source/components/poll.rst
deleted file mode 100644
index 7ec89efa11..0000000000
--- a/docs/en_us/olx/source/components/poll.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/poll.rst
-
diff --git a/docs/en_us/olx/source/components/video-components.rst b/docs/en_us/olx/source/components/video-components.rst
deleted file mode 100644
index d21a501c54..0000000000
--- a/docs/en_us/olx/source/components/video-components.rst
+++ /dev/null
@@ -1,135 +0,0 @@
-.. _Video Components:
-
-#################################
-Video Components
-#################################
-
-You can add video components to any container in your course (such as
-a vertical or sequential). Studio places all video components inside
-verticals (which it calls units). 
-
-See:
-
-* `Create the XML File for a Video Component`_
-* `Video Component XML File Elements`_
-* `video Element Attributes`_
-* `Example Video Component XML File`_
-
-**********************************************
-Create the XML File for a Video Component
-**********************************************
-
-To add a video component to your course, add it to the course XML tree as: 
-
-.. code-block:: xml
-
-  <video 
-    youtube="1.00:o2pLltkrhGM" 
-    url_name="Introduction_Lecture" 
-    display_name="Introduction Lecture" 
-    youtube_id_1_0="o2pLltkrhGM" 
-  </video>
-
-If you would prefer to break this out into its own file, you create an
-XML file in the ``video`` directory for each video component in your
-course.
-
-The name of the XML file must match the value of the @url_name attribute of the
-``video`` element in the vertical XML file.
-
-For example, if the vertical XML file contains:
-
-.. code-block:: xml
-  
-   <vertical display_name="Lesson_1_Unit_1">
-      <video url_name="Introduction_Lecture"/>
-      . . .
-  </vertical>
-
-You create the file ``video/Introduction_Lecture.xml`` to define the video
-component.
-
-*************************************
-Video Component XML File Elements
-************************************* 
-
-The root element of the XML file for the HTML component is file is ``video``. 
-
-The ``video`` element contains a single ``source`` element.
-
-==============================
-``source`` Element
-==============================
-
-The ``source`` element contains one attribute:
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Attribute
-     - Meaning
-   * - ``src``
-     - The file path for the video file.
-
-
-*************************************
-``video`` Element Attributes
-*************************************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Attribute
-     - Meaning
-   * - ``display_name``
-     - The value that is displayed to students as the name of the video
-       component.
-   * - ``youtube``
-     - The speed and ID pairings for the YouTube video source. The value can
-       contain multiple speed:ID pairs, separated by commas.
-   * - ``download_track``
-     - Whether students can download the video track. ``true`` or ``false``.
-   * - ``download_video``
-     - Whether students can download the video. ``true`` or ``false``.
-   * - ``html5_sources``
-     - The file path for the HTML5 version of the video.
-   * - ``show_captions``
-     - Whether students can view the video captions. ``true`` or ``false``.
-   * - ``source``
-     - ???
-   * - ``sub``
-     - ???
-   * - ``youtube_id_0_75``
-     - The YouTube ID for the video that plays at 75% normal speed.
-   * - ``youtube_id_1_0``
-     - The YouTube ID for the video that plays at 100% normal speed.
-   * - ``youtube_id_1_25``
-     - The YouTube ID for the video that plays at 125% normal speed.
-   * - ``youtube_id_1_5``
-     - The YouTube ID for the video that plays at 150% normal speed.
-       
-
-*************************************
-Example Video Component XML File
-*************************************
-
-The following example shows an XML file for a discussion component:
-
-.. code-block:: xml
-  
-  <video 
-    youtube="0.75:xGKlr7nT_Zw,1.00:o2pLltkrhGM,1.25:XGsB9bA6rGU,1.50:_HuIF16HdTA" 
-    url_name="Introduction_Lecture" 
-    display_name="Introduction Lecture" 
-    download_video="true" 
-    html5_sources="[&quot;https://s3.amazonaws.com/edx-course-videos/school/DemoCourseIntroductionVideo.mov&quot;]" 
-    source="" 
-    youtube_id_0_75="xGKlr7nT_Zw" 
-    youtube_id_1_0="o2pLltkrhGM" 
-    youtube_id_1_25="XGsB9bA6rGU" 
-    youtube_id_1_5="_HuIF16HdTA">
-  
-    <source src="https://s3.amazonaws.com/edx-course-videos/mit-6002x/6002-Tutorial-00010_100.mov"/>
-  </video>
diff --git a/docs/en_us/olx/source/components/word_cloud.rst b/docs/en_us/olx/source/components/word_cloud.rst
deleted file mode 100644
index 11ec1a53d6..0000000000
--- a/docs/en_us/olx/source/components/word_cloud.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/word_cloud.rst
-
diff --git a/docs/en_us/olx/source/components/zooming_image.rst b/docs/en_us/olx/source/components/zooming_image.rst
deleted file mode 100644
index 0980b687ee..0000000000
--- a/docs/en_us/olx/source/components/zooming_image.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/zooming_image.rst
-
diff --git a/docs/en_us/olx/source/conf.py b/docs/en_us/olx/source/conf.py
deleted file mode 100644
index ad86bde1f3..0000000000
--- a/docs/en_us/olx/source/conf.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-import sys, os
-
-# on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-sys.path.append(os.path.abspath('../../../'))
-sys.path.append(os.path.abspath('../../'))
-
-#from docs.shared.conf import *
-
-sys.path.insert(0, os.path.abspath('.'))
-
-master_doc = 'index'
-
-# Add any paths that contain templates here, relative to this directory.
-#templates_path.append('source/_templates')
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path.append('source/_static')
-
-project = u'edX Open Learning XML Guide - Alpha Version'
-copyright = u'2014, edX'
-
-# The short X.Y version.
-version = ''
-# The full version, including alpha/beta/rc tags.
-release = ''
-
-#Added to turn off smart quotes so users can copy JSON values without problems.
-html_use_smartypants = False
\ No newline at end of file
diff --git a/docs/en_us/olx/source/demo-course/index.rst b/docs/en_us/olx/source/demo-course/index.rst
deleted file mode 100644
index d2d1db0960..0000000000
--- a/docs/en_us/olx/source/demo-course/index.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-########################
-Tour of the DemoX OLX
-########################
-
-TBP
-
-.. toctree::
-   :maxdepth: 2
-
-
- 
\ No newline at end of file
diff --git a/docs/en_us/olx/source/directory-structure.rst b/docs/en_us/olx/source/directory-structure.rst
deleted file mode 100644
index 06e983ad7e..0000000000
--- a/docs/en_us/olx/source/directory-structure.rst
+++ /dev/null
@@ -1,140 +0,0 @@
-.. _ODL Directory Structure:
-
-###############################################
-OLX Course Structure
-###############################################
-
-See:
-
-* `OLX and Directory File Structures`_
-* `Top-level Directory`_
-* `XBlock directories`_
-* `edX Platform Directories`_
-
-****************************************
-OLX and Directory File Structures
-****************************************
-
-All files and sub-directories that comprise your OLX course are stored within
-a single directory.
-
-OLX provides for some flexibility in the directory and file structure
-you use to build your course.
-
-************************
-Top-level Directory
-************************
-
-Starting out, it is easiest to create your courseware structure in a
-single file, the ``course.xml file``. 
-
-This file can contain your entire course, but in most cases, it is convenient
-to split out large chunks of content into individual files. This is typically
-done either at the level of large components, such as problems or homework
-assignments.
-
-Currently, when Studio exports a course, it places each component in its own
-file. 
-
-For example, the edX Platform contains a directory called
-`manual-testing-complete`_ that contains a course with all component
-types for testing purposes.
-
-Following are descriptions of directories needed for a typical course. You
-should set up these directories in preparation for developing your course
-content.
-
-.. note::
- If you are using custom XBlocks, you can have
- additional directories that store the XML for XBlocks of that type.
-
-*******************
-XBlock directories
-*******************
-
-edX course components can be broken out of the main ``course.xml`` file
-into individual files. Those files go into directories of the name of
-the component type (XML tag). For example, components of type ``html``
-can be placed as individual files in the ``html`` directory. If your
-course does not contain html files, or if they are all embedded in
-their top-level components, you do not need to create an ``html``
-directory.
-
-For information about several examples of these directories, see: 
-
-See :ref:`HTML Components` for more information.
-See :ref:`Problems and Tools` for more information.
-See :ref:`Video Components` for more information.
-
-As the set of XBlocks grows, so does the set of associated XML tags
-and directories.
-
-*************************
-edX Platform Directories
-*************************
-
-In addition to the course hierarchy, which is designed to be generic
-and cross-platform, OLX courses contain a set of JSON and HTML
-files that specify course policies and non-courseare content.
-
-====================
-``about`` Directory
-====================
-
-The ``about`` directory contains:
-
-* ``overview.html``, which contains the content for the course overview page
-  students see the the Learning Management System (LMS).
-
-* ``short_description.html``, which contains the content for the course in the
-  course list.
-
-See :ref:`The Course About Pages` for more information.
-
-
-====================
-``info`` Directory
-====================
-
-The ``info`` directory contains:
-
-* ``handouts.html``, which contains the contain for the Course Handouts page in
-  the course.
-
-* ``updates.html``, which contains the course updates students see when opening
-  a course.
-
-=======================
-``policies`` Directory
-=======================
-
-The ``policies`` directory contains:
-
-* ``grading_policy.json``, which defines how student work is graded in the
-  course.
-
-* ``policy.json``, which defines various settings in the course.
-
-* ``assets.json``, which defines all files used in the course, such as images.
-  
-See :ref:`Course Policies` for more information.
-
-====================
-``static`` Directory
-====================
-
-The ``static`` directory contains the files used in your course, such as images
-or PDFs.
-
-See :ref:`Course Assets` for more information.
-
-====================
-``tabs`` Directory
-====================
-
-The ``tabs`` directory contains an HTML file for each page you add to your
-course.
-
-See :ref:`Course Tabs` for more information.
-
- .. include:: links.rst
diff --git a/docs/en_us/olx/source/drafts/index.rst b/docs/en_us/olx/source/drafts/index.rst
deleted file mode 100644
index a531096fff..0000000000
--- a/docs/en_us/olx/source/drafts/index.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-#################################
-Draft Course Content
-#################################
-
-.. toctree::
-   :maxdepth: 2
-
diff --git a/docs/en_us/olx/source/getting-started.rst b/docs/en_us/olx/source/getting-started.rst
deleted file mode 100644
index 363e68d50e..0000000000
--- a/docs/en_us/olx/source/getting-started.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-.. _Getting Started with OLX:
-
-###########################
-Getting Started with OLX
-###########################
-
-To develop your course in OLX, you complete the following steps:
-
- #.  :ref:`Define course policies<Policies>`.
- #.  :ref:`Add course assets<Course Assets>`.
- #.  :ref:`Create the course About page<The Course About Pages>`.
- #.  :ref:`Create pages in your course<Course Pages>`.
- #.  :ref:`Organize Courseware<Organizing Courseware>`.
- #.  :ref:`Create course components<Course Components>`.
- #.  :ref:`Create problems and tools<Problems and Tools>`.
- #.  :ref:`Create advanced components<Advanced Components>`.
\ No newline at end of file
diff --git a/docs/en_us/olx/source/index.rst b/docs/en_us/olx/source/index.rst
deleted file mode 100644
index 51a5d26a4d..0000000000
--- a/docs/en_us/olx/source/index.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-############################
-edX Open Learning XML Guide
-############################
-
-This document is intended for those developing edX courses through Open Learning XML (OLX).
-
-.. toctree::
-   :maxdepth: 1
-
-   read_me
-   preface
-   change_log
-
-
-.. toctree::
-   :maxdepth: 2
-
-   what-is-olx
-   tasks/index
-   getting-started
-   directory-structure
-   policies/index
-   assets/assets
-   about/index
-   pages/pages
-   organizing-course/index
-   components/index
-   problem-xml/index
-   tools/index
-   drafts/index
-   demo-course/index
-
-
- 
diff --git a/docs/en_us/olx/source/links.rst b/docs/en_us/olx/source/links.rst
deleted file mode 100644
index 47bbb3b423..0000000000
--- a/docs/en_us/olx/source/links.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-
-.. Links
-
-.. _Wikipedia XML entry: http://en.wikipedia.org/wiki/XML
-
-.. _manual-testing-complete: https://github.com/edx/edx-platform/tree/master/common/test/data/manual-testing-complete
-
-.. _LONCAPA XML format: https://s1.lite.msu.edu/adm/help/Authoring_XML_Intro.hlp#Authoring_XML_Intro
\ No newline at end of file
diff --git a/docs/en_us/olx/source/organizing-course/course-structure-overview.rst b/docs/en_us/olx/source/organizing-course/course-structure-overview.rst
deleted file mode 100644
index 692e58e4ce..0000000000
--- a/docs/en_us/olx/source/organizing-course/course-structure-overview.rst
+++ /dev/null
@@ -1,65 +0,0 @@
-###############################
-OLX Course Building Blocks
-###############################
-
-Before you begin building OLX, you should understand the
-building blocks of an edX course. See:
-
-* `Courseware`_
-* `Supplemental Course Content`_
-* `Course Policies`_
-
-**************
-Courseware
-**************
-
-Courseware is the main content of your course and consists mainly of lessons
-and assessments. The following list describes how courseware is organized in
-OLX:
-
-* Course chapters are at the top level of your course and typically
-  represent a time period. In Studio, chapters are called *sections*.
-
-* A section contains one or more children which correspond to
-  top-level pages in the course. In Studio, these are called 'subsections' and
-  are currently restricted to ``sequential`` elements at this
-  level. OLX supports any XBlock at this level. 
-
-* Courses are composed of structural elements, such as ``sequential``
-  and ``vertical``, and leaf-nodes or content elements, such as
-  ``html`` or ``problem``. Studio has a fixed hierarchy where children
-  of ``sequential`` elements are ``vertical`` elements (called units),
-  and children of ``vertical`` elements are leaf elements (called modules). 
-
-  * :ref:`Course Components`
-  * :ref:`Problems and Tools`
-  * :ref:`Advanced Components`
-    
-For more information, see :ref:`The Courseware Structure`.
-
-****************************
-Supplemental Course Content
-****************************
-
-In addition to the courseware described above, you course can contain
-supplemental content, such as textbooks, custom pages, and files.  The
-following list describes the types of supported content:
-
-* Course about pages appear in the course list for prospective students and are
-  used to market your course. For more information, see :ref:`The Course About
-  Pages`.
-
-* Course assets are any supplemental files you use in your course, such as a
-  syllabus as a PDF file or an image that appears in an HTML component. For
-  more information, see :ref:`Course Assets`.
-
-* Course pages are custom pages that you can have appear in the top navigation
-  menu of your course.  For more information, see :ref:`Course Pages`.
-
-****************************
-Course Policies
-****************************
-
-Course policies determine how your course functions. For example, policies
-control grading and content experiments. For more information, see
-:ref:`Policies`.
diff --git a/docs/en_us/olx/source/organizing-course/course-xml-file.rst b/docs/en_us/olx/source/organizing-course/course-xml-file.rst
deleted file mode 100644
index 8bfc27e937..0000000000
--- a/docs/en_us/olx/source/organizing-course/course-xml-file.rst
+++ /dev/null
@@ -1,276 +0,0 @@
-.. _The Courseware Structure:
-
-##########################
-The Courseware Structure
-##########################
-
-You develop the courseware structure in the ``course.xml`` file, in the top-
-level directory.
-
-See:
-
-* `The course.xml File`_
-* `Course Chapters`_
-* `Course Sequentials`_
-* `Course Verticals`_
-
-*************************************
-The ``course.xml`` File
-*************************************
-
-The root element of the ``course.xml`` file is ``course``. 
-
-For example, the ``course.xml`` file may contain:
-
-.. code-block:: xml
-  
-  <course advanced_modules="[&quot;concept&quot;, &quot;done&quot;,
-      &quot;profile&quot;, &quot;recommender&quot;]" course="edX_Insider"
-      course_image="code.png" display_name="edX Demo"
-      enrollment_start="2014-03-01T04:00:00Z" org="edX"
-      start="2014-03-03T00:00:00Z" url_name="Ongoing">
-      . . .
-      . . .
-
-==============================
-``course`` Attributes
-==============================
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Attribute
-     - Meaning
-   * - ``advanced_modules``
-     - The list of advanced modules, or custom XBlocks, used in your course.
-   * - ``url_name``
-     - The value in the course URL path directly after the domain,
-       organization, and course name. The url_name must also be the name of the course outline XML file (without the ``.xml`` extension).
-   * - ``org``
-     - The organization sponsoring the course. This value is in the course URL
-       path, following the domain and ``/courses/``.
-   * - ``course``
-     - The name of the course. This value is in the course URL
-       path, following the organization.
-   * - ``course_image``
-     - The filename of the image used on the course About page.
-   * - ``enrollment_start``
-     - The date and time that students can start enrolling in the course.
-
-
-============================================================
-``course`` Element Attributes and Course URLS
-============================================================
-
-The attributes of the ``course`` element are used to construct URLs in the
-course.  The following course URL shows where these values are used:
-
-.. code-block:: html
-  
-  http://my-edx-server.org/courses/<@org value>/<@course value>/<@url_name value>/info
-
-For example:
-
-.. code-block:: html
-  
-  http://my-edx-server.org/courses/edX/DemoX/Demo_Course/info
-
-*******************************
-Course Chapters
-*******************************
-
-You create a course chapter with the ``chapter`` element, as a child of the
-root ``course`` element. Chapter elements are top-level pages in the course.
-The edX platform renders navigation chrome around them (tab-set on top and
-accordion on the left). It is possible to disable chrome for specific chapters
-using the ``chrome`` option. It is possible to associate chapters with
-different elements of the tabset with the ``default_tab`` option. It is
-possible to hide them from the navigation using the ``hide_from_toc`` option.
-
-For example, if the course outline file contains:
-
-.. code-block:: xml
-  
-    <course> 
-      <chapter display_name="Exam Review" url_name="exam_review"> 
-      . . .
-    </course>
-
-==============================================
-``chapter`` Attributes
-==============================================
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Attribute
-     - Meaning
-   * - ``display_name``
-     - The value that is displayed to students as the name of the chapter, or
-       section.
-   * - ``start``
-     - The date and time, in UTC, that the chapter is released to students.
-       Before this date and time, students do not see the chapter.
-
-=========================
-``chapter`` Children
-=========================
-
-The ``chapter`` element contains one or more children. Studio uses ``sequential`` elements for all children of chapters, and calls these ``subsections``.
-
-The following example shows a chapter with two sequentials, or subsections. :
-
-.. code-block:: xml
-  
-  <chapter display_name="Example Week 2: Get Interactive">
-      <sequential display_name="Simulations" url_name="simulations"> 
-          . . .
-      <sequential display_name="Graded Simulations" 
-          url_name="graded_simulations"> 
-          . . .
-  </chapter>
-
-
-*******************************
-Course Sequentials
-*******************************
-
-You create a course sequential with the ``sequential`` element, for each
-subsection in the chapter.
-
-For example, the course may contain:
-
-.. code-block:: xml
-  
-    <course> 
-        <chapter url_name="exam_review"> 
-            <sequential display_name="Simulations" url_name="simulations">
-                . . .
-            </sequential>
-        </chapter>
-        . . .
-    </course>
-
-==============================================
-``sequential`` Attributes
-==============================================
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Attribute
-     - Meaning
-   * - ``display_name``
-     - The value that is displayed to students as the name of the sequential,
-       or subsection.
-   * - ``start``
-     - The date and time, in UTC, that the sequential is released to students.
-       Before this date and time, students do not see the sequential.
-   * - ``graded``
-     - Whether the sequential is a graded subsection; ``true`` or ``false``.
-   * - ``format``
-     - If the sequential is graded, the assignment type.
-   * - ``graceperiod``
-     - If the sequential is graded, the number of seconds in the grace period.
-   * - ``rerandomize``
-     - TBP
-   * - ``showanswer``
-     - TBP
-   * - ``xqa_key``
-     - TBP
-
-==============================================
-``sequential`` Children
-============================================== 
-
-The ``sequential`` element contains one or more child ``vertical`` elements. 
-
-The ``veritical`` element references a vertical, or unit, in the course.
-
-The following example shows a chapter with a sequential that has three verticals, or units. :
-
-.. code-block:: xml
-  
-    <course> 
-        <chapter url_name="exam_review"> 
-            <sequential display_name="Simulations" url_name="simulations">
-                <vertical display_name: "Unit 1" url_name="Lesson_1_Unit_1">
-                    . . . .
-                <vertical display_name: "Unit 2" url_name="Lesson_1_Unit_2">
-                    . . . .
-            </sequential>
-        </chapter>
-        . . .
-    </course>
-
-
-*******************************
-Course Verticals
-*******************************
-
-A course vertical:
-
-* Defines the display name for the vertical, or unit.
-* Organizes components and other verticals in the vertical.
-
-You create a course vertical with the ``vertical`` element, for each
-unit in the subsection.
-
-For example, the course may contain:
-
-.. code-block:: xml
-  
-    <course> 
-        <chapter url_name="exam_review"> 
-            <sequential display_name="Simulations" url_name="simulations">
-                <vertical display_name="Unit 1" url_name="Lesson_1_Unit_1"/>
-                    . . .
-            </sequential>
-        </chapter>
-        . . .
-    </course>
-
-=========================
-``vertical`` Attributes
-=========================
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Attribute
-     - Meaning
-   * - ``display_name``
-     - The value that is displayed to students as the name of the sequential,
-       or subsection.
-
-
-==============================
-``vertical`` Children
-============================== 
-
-The ``vertical`` element contains one or more child elements for each component
-in the vertical, or unit.
-
-note:: 
-  You can embed the content of components in the ``course.xml`` file, as
-  child elements of the ``vertical`` element. Hoever, you may want to store
-  components in separate files, to better enable content reuse across courses.
-
-A vertical element can also contain a vertical element. You can nest
-verticals, or units, recursively.
-
-Child elements of ``vertical`` refer to components in your course.  The edX
-Platform supports a wide range of components, including custom XBlocks.
-
-The following example shows a vertical with two components:
-
-.. code-block:: xml
-  
-  <vertical display_name="Lesson_1_Unit_1">
-      <html url_name="Introduction"/>
-      <video url_name="Unit_1_Video"/>
-  </vertical>
diff --git a/docs/en_us/olx/source/organizing-course/index.rst b/docs/en_us/olx/source/organizing-course/index.rst
deleted file mode 100644
index 772ff80b7c..0000000000
--- a/docs/en_us/olx/source/organizing-course/index.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-.. _Organizing Courseware:
-
-##################################
-Organizing Courseware
-##################################
-
-Use the chapters in this section to organize your courseware with OLX.
-
-.. toctree::
-   :maxdepth: 2
-
-   course-structure-overview
-   course-xml-file
\ No newline at end of file
diff --git a/docs/en_us/olx/source/pages/pages.rst b/docs/en_us/olx/source/pages/pages.rst
deleted file mode 100644
index dc12fc2755..0000000000
--- a/docs/en_us/olx/source/pages/pages.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. _Course Tabs:
-
-#################################
-Course Tabs
-#################################
-
-You can add tabs, or pages, to your course. Each tab appears in your course’s
-navigation bar.
-
-*********************************************
-Create the Tab File
-*********************************************
-
-You create an HTML file for each tab you want to add to the course in the
-``tabs`` directory.
-
-You can add any text and HTML markup to the page. Tabs can also be
-links, and other types of content. One common design pattern is to
-link a tab to a chromeless XBlock in the courseware, which allows for
-top-level interactive course content.
diff --git a/docs/en_us/olx/source/policies/assets-policy.rst b/docs/en_us/olx/source/policies/assets-policy.rst
deleted file mode 100644
index b90dc7bb3f..0000000000
--- a/docs/en_us/olx/source/policies/assets-policy.rst
+++ /dev/null
@@ -1,98 +0,0 @@
-.. _Course Asset Policy:
-
-#################################
-Course Asset Policy
-#################################
-
-You create an asset policy file to provide details of the assets used in your
-course. Assets can include image files, textbooks, handouts, and supporting
-JavaScript files.
-
-You must enter policy details for each asset you add the the ``static``
-directory. See :ref:`Course Assets` for more information.
-
-
-*******************************
-Create the Asset Policy File
-*******************************
-
-You define policies for your assets in the ``assets.json`` file. 
-
-Save the ``assets.json`` file in the ``policy`` directory. You use one
-``assets.json`` file for all of the courses you may have in your directory
-structure.
-
-
-************************************
-Asset Policy JSON Objects
-************************************
-
-  .. list-table::
-     :widths: 10 80
-     :header-rows: 0
-
-     * - ``contentType``
-       - The MIME type of the file.
-     * - ``displayname``
-       - The file name.
-     * - ``locked``
-       - ``true`` if users can only access the file from within your course.
-         ``false`` if users can access the file from outside of your course.
-     * - ``content_son``
-       - A collection that contains:
-         * ``category``:  Equal to ``asset``
-         * ``name``: The file name
-         * ``course``: The course number
-         * ``tag``: 
-         * ``org``: The organization that created the course
-         * ``revision``
-     * - ``filename``
-       - The full path and name of the file in the edX Platform.
-     * - ``import_path``
-       -
-     * - ``thumbnail_location``
-       - An array containing:
-         * ``c4x``
-         * The organization
-         * The course number
-         * ``thumbnail``
-         * The filename for the thumbnail
-
-        
-
-*******************************
-Example Asset Policy File
-*******************************
-
-The following example shows the JSON policy for one image file.
-
-.. code-block:: json
-
-    {
-        "dashboard.png": 
-            {
-                "contentType": "image/png", 
-                "displayname": "dashboard.png", 
-                "locked": false, 
-                "content_son": 
-                    {
-                        "category": "asset", 
-                        "name": "dashboard.png", 
-                        "course": "Course number", 
-                        "tag": "c4x", 
-                        "org": "Organization", 
-                        "revision": null
-                    }, 
-                    "filename": "/c4x/Organization/Course-number/asset/dashboard.png", 
-                    "import_path": null, 
-                    "thumbnail_location": 
-                        [
-                            "c4x", 
-                            "Organization", 
-                            "Course number", 
-                            "thumbnail", 
-                            "dashboard.jpg", 
-                            null
-                        ]
-            }
-    }
\ No newline at end of file
diff --git a/docs/en_us/olx/source/policies/content-experiments.rst b/docs/en_us/olx/source/policies/content-experiments.rst
deleted file mode 100644
index a4444ff55f..0000000000
--- a/docs/en_us/olx/source/policies/content-experiments.rst
+++ /dev/null
@@ -1,96 +0,0 @@
-.. _Group Configuration for Content Experiments:
-
-############################################
-Group Configuration for Content Experiments
-############################################
-
-You define group configurations in the ``policy.json`` file in the ``policies``
-directory.
-
-To specify group configurations, you modify the value for the
-``user_partitions`` policy key.
-
-.. note::  
-  ``user_partitions`` is the internal edX Platform name for group
-  configurations.
-
-The value for ``user_partitions`` is a JSON collection of group configurations,
-each of which defines the groups of students. 
-
-.. note:: 
-  Use names for group configurations that are meaningful. You select from the
-  list of group configuration names when you add a content experiment.
-
-See the following examples for more information.
-
-=============================================
-Example: One Group Configuration
-=============================================
-
-The following is an example JSON object that defines an group configuration
-with two student segments.
-
-.. code-block:: json
-
-    "user_partitions": [{"id": 0,
-                       "name": "Name of the group configuration",
-                       "description": "Description of the group configuration.",
-                       "version": 1,
-                       "groups": [{"id": 0,
-                                   "name": "Group 1",
-                                   "version": 1},
-                                  {"id": 1,
-                                   "name": "Group 2",
-                                   "version": 1}]
-                                }
-                       ]
-
-In this example:
-
-* The ``"id": 0`` identifies the group configuration. For XML courses, the
-  value is referenced in the ``user_partition`` attribute of the
-  ``<split_test>`` element in the content experiment file.
-* The ``groups`` array identifies the groups to which students are randomly
-  assigned. For XML courses, each group ``id`` value is referenced in the
-  ``group_id_to_child`` attribute of the ``<split_test>`` element.
-
-==========================================================
-Example: Multiple Group Configurations
-==========================================================
-
-The following is an example JSON object that defines two group configurations.
-The first group configuration divides students into two groups, and the second
-divides students into three groups.
-
-.. code-block:: json
-
-    "user_partitions": [{"id": 0,
-                         "name": "Name of Group Configuration 1",
-                         "description": "Description of Group Configuration 1.",
-                         "version": 1,
-                         "groups": [{"id": 0,
-                                     "name": "Group 1",
-                                     "version": 1},
-                                    {"id": 1,
-                                     "name": "Group 2",
-                                     "version": 1}]}
-                        {"id": 1,
-                         "name": "Name of Group Configuration 2",
-                         "description": "Description of Group Configuration 2.",
-                         "version": 1,
-                         "groups": [{"id": 0,
-                                     "name": "Group 1",
-                                     "version": 1},
-                                    {"id": 1,
-                                     "name": "Group 2",
-                                     "version": 1}
-                                     {"id": 2,
-                                     "name": "Group 3",
-                                     "version": 1}
-                                     ]}
-                       ]
-
-.. note:: 
-  As this example shows, each group configuration is independent.  Group IDs
-  and names must be unique within a group configuration, but not across all
-  group configurations in your course.
\ No newline at end of file
diff --git a/docs/en_us/olx/source/policies/course.rst b/docs/en_us/olx/source/policies/course.rst
deleted file mode 100644
index c3ab4f4ffe..0000000000
--- a/docs/en_us/olx/source/policies/course.rst
+++ /dev/null
@@ -1,100 +0,0 @@
-.. _Course Policies:
-
-#################################
-Course Policies
-#################################
-
-You create a course policy file to specify metadata about your course.
-
-*******************************
-Create the Course Policy File
-*******************************
-
-You define policies for your course in the ``policy.json`` file. 
-
-Save the ``policy.json`` file in the ``policy/<course-name>`` directory. 
-
-The ``<course-name>`` directory  must match the value of the ``url_name`` attribute in the ``course.xml`` file.
-
-
-************************************
-Course Policy JSON Objects
-************************************
-
-  .. list-table::
-     :widths: 10 80
-     :header-rows: 0
-
-     * - ``start``
-       - The start date for the course.  For example: ``"2012-09-05T12:00"``.
-     * - ``advertised_start``
-       - The start date displayed in the course listing and course about pages.
-         For example: ``"2012-09-05T12:00``.
-     * - ``disable_policy_graph``
-       - Whether the policy graph should be disabled (``true``) or not (``false)``.  SUPORTED?
-     * - ``enrollment_start``, ``enrollment_end``
-       - The dates in which students can enroll in the course. For example, ``"2012-09-05T12:00"``. If not specified, students can enroll any time. 
-     * - ``end``
-       - The end date for the course.  For example: ``"2012-11-05T12:00"``.
-     * - ``end_of_course_survey_url``
-       - The url for an end of course survey. The link is shown after the course is over, next to certificate download links.
-     * - ``tabs``
-       - Custom pages, or tabs, in the courseware.  See below for details.
-     * - ``discussion_blackouts``
-       - An array of time intervals during which students cannot create or edit discussion posts. Moderators, Community TAs, and Administrators are not restricted by these dates. For example, you could specify blackout dates during exams. For example: ``[[""2012-10-29T04:00", "2012-11-03T04:00"], ["2012-12-30T04:00", "2013-01-02T04:00"]]``. Moderators, Community TAs, and Administrators are not restricted during blackout periods.
-     * - ``show_calculator``
-       - Whether the calculator is shown in the course (``true``) or not (``false)``.
-     * - ``days_early_for_beta``
-       - The number of days early that students in the beta-testers group can
-         access the course.
-     * - `cohort_config`
-       -
-          * ``cohorted`` : boolean.  Set to ``true`` if this course uses
-            student cohorts.  If so, all inline discussions are automatically
-            cohorted, and top-level discussion topics are configurable via the
-            cohorted_discussions list. Default is not cohorted).
-          * ``cohorted_discussions``: list of discussions that should be
-            cohorted.  Any not specified in this list are not cohorted.
-          * ``auto_cohort``: ???
-          * ``auto_cohort_groups``: ``["group name 1", "group name 2", ...]``
-            `If ``cohorted`` and ``auto_cohort`` are ``true``, automatically
-            put each student into a random group from the
-            ``auto_cohort_groups`` list, creating the group if needed.
-     * - ``pdf_textbooks``
-       - have pdf-based textbooks on tabs in the courseware.  See below for
-         details.
-     * - ``html_textbooks``
-       - have html-based textbooks on tabs in the courseware.  See below for
-         details.
-
-*******************************
-Example Course Policy File
-*******************************
-
-.. code-block:: json
-
-    {
-      "course/2014":
-          {
-	          "tabs": [{"type": "courseware", "name": "Courseware"}, 
-	                   {"type": "course_info", "name": "Course Info"}, 
-	                   {"type": "discussion", "name": "Discussion"}, 
-	                   {"type": "wiki", "name": "Wiki"}, 
-	                   {"type": "progress", "name": "Progress"}],
-	
-	           "display_name": "edX Demonstration Course",
-	           "discussion_topics": {"General": {"id": "i4x-General-course-2014"}}
-               
-                   "user_partitions": [{"id": 0,
-                                        "name": "Two Groups",
-                                        "description": "For 2-group experiments.",
-                                         "version": 1,
-                                         "groups": [{"id": 0,
-                                                     "name": "Group A",
-                                                     "version": 1},
-                                                    {"id": 2,
-                                                     "name": "Group B",
-                                                     "version": 1}]
-                                       }]
-          }
-    }
\ No newline at end of file
diff --git a/docs/en_us/olx/source/policies/grading.rst b/docs/en_us/olx/source/policies/grading.rst
deleted file mode 100644
index 4300f9d635..0000000000
--- a/docs/en_us/olx/source/policies/grading.rst
+++ /dev/null
@@ -1,70 +0,0 @@
-.. _Grading Policy:
-
-#################################
-Grading Policy
-#################################
-
-You create a grading policy file to specify how problems are graded in your
-course.
-
-*******************************
-Create the Grading Policy File
-*******************************
-
-You define policies for your course in the ``grading_policy.json`` file. 
-
-Save the ``grading_policy.json`` file in the ``policy/<course-name>``
-directory.
-
-The ``<course-name>`` directory  must match the value of the ``url_name``
-attribute in the ``course.xml`` file.
-
-************************************
-Course Policy JSON Objects
-************************************
-
-  .. list-table::
-     :widths: 10 80
-     :header-rows: 0
-
-     * - ``GRADE_CUTOFFS``
-       - The minimal grade for passing the course, and receiving a certificate
-         if offered.
-     * - ``GRADER``
-       - For each assignment type:
-
-         * ``min_count``:???
-         * ``weight``: The percentage of the total grade determined by
-            assignments of this type. The total value for all assignment types
-            must equal 1.0.
-         * ``type``: The name of the assignment type.
-         * ``short_label``: The label for the assignment type shown on the
-           student's Progress page.
-         * ``drop_count``: The number of assignments of this type that can be
-           dropped when calculating the final grade.
-
-*******************************
-Example Grading Policy File
-*******************************
-
-.. code-block:: json
-
-    {
-        "GRADE_CUTOFFS": {"Pass": 0.6}, 
-        "GRADER": [
-                    {
-                        "min_count": 3, 
-                        "weight": 0.75, 
-                        "type": "Homework", 
-                        "drop_count": 1, 
-                        "short_label": "Ex"
-                    }, 
-                    {
-                        "short_label": "", 
-                        "min_count": 1, 
-                        "type": "Exam", 
-                        "drop_count": 0, 
-                        "weight": 0.25
-                    }
-                  ]
-    }
\ No newline at end of file
diff --git a/docs/en_us/olx/source/policies/index.rst b/docs/en_us/olx/source/policies/index.rst
deleted file mode 100644
index ebc04681cc..0000000000
--- a/docs/en_us/olx/source/policies/index.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. _Policies:
-
-#################################
-Policies
-#################################
-
-Use the chapters in this section to define policies for your course.
-
-.. toctree::
-   :maxdepth: 2
-
-   course
-   content-experiments
-   grading
-   assets-policy
diff --git a/docs/en_us/olx/source/preface.rst b/docs/en_us/olx/source/preface.rst
deleted file mode 100644
index 53895c8473..0000000000
--- a/docs/en_us/olx/source/preface.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../shared/preface.rst
\ No newline at end of file
diff --git a/docs/en_us/olx/source/problem-xml/checkbox.rst b/docs/en_us/olx/source/problem-xml/checkbox.rst
deleted file mode 100644
index a7834d27b5..0000000000
--- a/docs/en_us/olx/source/problem-xml/checkbox.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/checkbox.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/chemical_equation.rst b/docs/en_us/olx/source/problem-xml/chemical_equation.rst
deleted file mode 100644
index 57c97cfcc7..0000000000
--- a/docs/en_us/olx/source/problem-xml/chemical_equation.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/chemical_equation.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/circuit_schematic_builder.rst b/docs/en_us/olx/source/problem-xml/circuit_schematic_builder.rst
deleted file mode 100644
index ba60f15ca4..0000000000
--- a/docs/en_us/olx/source/problem-xml/circuit_schematic_builder.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/circuit_schematic_builder.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/custom_javascript.rst b/docs/en_us/olx/source/problem-xml/custom_javascript.rst
deleted file mode 100644
index 8505fae2f5..0000000000
--- a/docs/en_us/olx/source/problem-xml/custom_javascript.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/custom_javascript.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/custom_python.rst b/docs/en_us/olx/source/problem-xml/custom_python.rst
deleted file mode 100644
index e0ec65176b..0000000000
--- a/docs/en_us/olx/source/problem-xml/custom_python.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/custom_python.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/drag_and_drop.rst b/docs/en_us/olx/source/problem-xml/drag_and_drop.rst
deleted file mode 100644
index ecec7082ab..0000000000
--- a/docs/en_us/olx/source/problem-xml/drag_and_drop.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/drag_and_drop.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/dropdown.rst b/docs/en_us/olx/source/problem-xml/dropdown.rst
deleted file mode 100644
index 238b31a4c1..0000000000
--- a/docs/en_us/olx/source/problem-xml/dropdown.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/dropdown.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/gene_explorer.rst b/docs/en_us/olx/source/problem-xml/gene_explorer.rst
deleted file mode 100644
index 66e2180708..0000000000
--- a/docs/en_us/olx/source/problem-xml/gene_explorer.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/gene_explorer.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/image_mapped_input.rst b/docs/en_us/olx/source/problem-xml/image_mapped_input.rst
deleted file mode 100644
index fd92ea8c58..0000000000
--- a/docs/en_us/olx/source/problem-xml/image_mapped_input.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/image_mapped_input.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/index.rst b/docs/en_us/olx/source/problem-xml/index.rst
deleted file mode 100644
index e63b7e331f..0000000000
--- a/docs/en_us/olx/source/problem-xml/index.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-.. _Problems and Tools:
-
-#################################
-Problems
-#################################
-
-The format for edX problems is based on the `LONCAPA XML format`_,
-although the two are not quite compatible. In the edX variant, problems are
-composed of four types of tags:
-
-* **inputtypes** are similar to XBlocks. They define ways for users to enter
-  input into the problem.
-* **responsetypes** are graders. They define how inputs are mapped to grades. 
-* **hinters** are used to provide feedback to problems. 
-* Standard HTML tags are used for formatting. 
-
-OLX is designed to allow mixing-and-matching of inputtypes,
-responsetypes, and hinters. For example, a numerical grader could match
-7+-0.1%. It would be okay to use this with any inputtype which output a number,
-whether this was a text box, equation input, slider, or multiple choice
-question. In practice, this doesn't always work. For example, in the former
-case, a multiple choice question would not give an output in a format a
-numerical grader could handle.
-
-In addition, in many cases, there is a 1:1 mapping between graders and inputs.
-For some types of inputs (especially discipline-specific specialized ones), it
-simply does not make sense to have more than one grader.
-
-The most general grader is ``customresponse``. This uses Python code
-to evaluate the input. By design, this ought to work with any inputtype,
-although there are bugs mixing this with a small number of the newer
-inputtypes.
-
-Like LON-CAPA, OLX allows embedding of code to generate parameterized problems.
-Unlike LON-CAPA, edX supports Python (and not Perl). Otherwise, the syntax is
-approximately identical.
-
-.. toctree::
-   :maxdepth: 2
-
-   checkbox
-   chemical_equation
-   circuit_schematic_builder
-   custom_javascript
-   custom_python
-   drag_and_drop
-   dropdown
-   gene_explorer
-   image_mapped_input
-   math_expression_input
-   mathjax
-   molecule_editor
-   mult_choice_num_input
-   multiple_choice
-   numerical_input
-   problem_in_latex
-   problem_with_hint
-   protein_builder
-   symbolic_response
-   text_input
-
-
-.. include:: ../links.rst
diff --git a/docs/en_us/olx/source/problem-xml/math_expression_input.rst b/docs/en_us/olx/source/problem-xml/math_expression_input.rst
deleted file mode 100644
index 7d70c40186..0000000000
--- a/docs/en_us/olx/source/problem-xml/math_expression_input.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/math_expression_input.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/mathjax.rst b/docs/en_us/olx/source/problem-xml/mathjax.rst
deleted file mode 100644
index fe6cbba43c..0000000000
--- a/docs/en_us/olx/source/problem-xml/mathjax.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/mathjax.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/molecule_editor.rst b/docs/en_us/olx/source/problem-xml/molecule_editor.rst
deleted file mode 100644
index acef0143e3..0000000000
--- a/docs/en_us/olx/source/problem-xml/molecule_editor.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/molecule_editor.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/mult_choice_num_input.rst b/docs/en_us/olx/source/problem-xml/mult_choice_num_input.rst
deleted file mode 100644
index 61c58afb97..0000000000
--- a/docs/en_us/olx/source/problem-xml/mult_choice_num_input.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/mult_choice_num_input.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/multiple_choice.rst b/docs/en_us/olx/source/problem-xml/multiple_choice.rst
deleted file mode 100644
index eedf132103..0000000000
--- a/docs/en_us/olx/source/problem-xml/multiple_choice.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/multiple_choice.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/numerical_input.rst b/docs/en_us/olx/source/problem-xml/numerical_input.rst
deleted file mode 100644
index 804214f369..0000000000
--- a/docs/en_us/olx/source/problem-xml/numerical_input.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/numerical_input.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/problem_in_latex.rst b/docs/en_us/olx/source/problem-xml/problem_in_latex.rst
deleted file mode 100644
index 9b49e09dc2..0000000000
--- a/docs/en_us/olx/source/problem-xml/problem_in_latex.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/problem_in_latex.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/problem_with_hint.rst b/docs/en_us/olx/source/problem-xml/problem_with_hint.rst
deleted file mode 100644
index 2e6263694c..0000000000
--- a/docs/en_us/olx/source/problem-xml/problem_with_hint.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/problem_with_hint.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/protein_builder.rst b/docs/en_us/olx/source/problem-xml/protein_builder.rst
deleted file mode 100644
index ee1e76ad9d..0000000000
--- a/docs/en_us/olx/source/problem-xml/protein_builder.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/protein_builder.rst
-
diff --git a/docs/en_us/olx/source/problem-xml/symbolic_response.rst b/docs/en_us/olx/source/problem-xml/symbolic_response.rst
deleted file mode 100644
index 01e1b550c2..0000000000
--- a/docs/en_us/olx/source/problem-xml/symbolic_response.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-.. _Symbolic Response:
-
-#################
-Symbolic Response
-#################
-
-This document plans to document features that the current symbolic response
-supports. In general it allows the input and validation of math expressions,
-up to commutativity and some identities.
-
-
-********
-Features
-********
-
-This is a partial list of features, to be revised as we go along:
-    * sub and superscripts: an expression following the ``^`` character
-      indicates exponentiation. To use superscripts in variables, the syntax
-      is ``b_x__d`` for the variable ``b`` with subscript ``x`` and super
-      ``d``. 
-
-      An example of a problem::
-
-        <symbolicresponse expect="a_b^c + b_x__d" size="30">
-          <textline math="1"
-           preprocessorClassName="SymbolicMathjaxPreprocessor"
-           preprocessorSrc="/static/js/capa/symbolic_mathjax_preprocessor.js"/>
-        </symbolicresponse>
-
-      It's a bit of a pain to enter that.
-
-    * The script-style math variant. What would be outputted in latex if you
-      entered ``\mathcal{N}``. This is used in some variables.
-
-      An example::
-
-          <symbolicresponse expect="scriptN_B + x" size="30">
-            <textline math="1"/>
-          </symbolicresponse>
-
-      There is no fancy preprocessing needed, but if you had superscripts or
-      something, you would need to include that part.
diff --git a/docs/en_us/olx/source/problem-xml/text_input.rst b/docs/en_us/olx/source/problem-xml/text_input.rst
deleted file mode 100644
index d8580dbbbd..0000000000
--- a/docs/en_us/olx/source/problem-xml/text_input.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../shared/exercises_tools/text_input.rst
-
diff --git a/docs/en_us/olx/source/read_me.rst b/docs/en_us/olx/source/read_me.rst
deleted file mode 100644
index 4b69f09b30..0000000000
--- a/docs/en_us/olx/source/read_me.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-*******
-Read Me
-*******
-
-The *edX Open Learning XML Guide* provides the information you need to build an
-edX course through Open Learning XML (OLX) and supporting files, without using
-edX Studio.  This document is an Alpha version. We will continue to make
-significant updates to improve your ability to build XML-based courses.
-
-This documentation is created using RST_ files and Sphinx_. You, the
-user community, can help update and revise this documentation project on
-GitHub::
-
-  https://github.com/edx/edx-platform/docs/en_us/olx/source
-
-To suggest a revision, fork the project, make changes in your fork, and submit
-a pull request back to the original project: this is known as the `GitHub Flow`_.
-
-All pull requests need approval from edX. For more information, contact edX at `docs@edx.org`_.
-
-.. _docs@edx.org: docs@edx.org
-.. _Sphinx: http://sphinx-doc.org/
-.. _LaTeX: http://www.latex-project.org/
-.. _`GitHub Flow`: https://github.com/blog/1557-github-flow-in-the-browser
-.. _RST: http://docutils.sourceforge.net/rst.html
\ No newline at end of file
diff --git a/docs/en_us/olx/source/tasks/convert-to-olx.rst b/docs/en_us/olx/source/tasks/convert-to-olx.rst
deleted file mode 100644
index 9fefa4b1a0..0000000000
--- a/docs/en_us/olx/source/tasks/convert-to-olx.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. _Convert Content in Other Formats to OLX:
-
-###################################################
-Convert Content in Other Formats to OLX
-###################################################
-
-TBP
\ No newline at end of file
diff --git a/docs/en_us/olx/source/tasks/deploy-lms.rst b/docs/en_us/olx/source/tasks/deploy-lms.rst
deleted file mode 100644
index 2aa565a743..0000000000
--- a/docs/en_us/olx/source/tasks/deploy-lms.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. _Build a Course in OLX and Deploy to the edX LMS:
-
-###################################################
-Build a Course in OLX and Deploy to the edX LMS
-###################################################
-
-TBP
\ No newline at end of file
diff --git a/docs/en_us/olx/source/tasks/index.rst b/docs/en_us/olx/source/tasks/index.rst
deleted file mode 100644
index 4caa2ec72e..0000000000
--- a/docs/en_us/olx/source/tasks/index.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-######################
-Open Learning XML Uses
-######################
-
-
-.. toctree::
-  :maxdepth: 2
-
-  olx-studio
-  deploy-lms
-  convert-to-olx
\ No newline at end of file
diff --git a/docs/en_us/olx/source/tasks/olx-studio.rst b/docs/en_us/olx/source/tasks/olx-studio.rst
deleted file mode 100644
index 4777bbc230..0000000000
--- a/docs/en_us/olx/source/tasks/olx-studio.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. _Use OLX with edX Studio:
-
-###################################################
-Use OLX with edX Studio
-###################################################
-
-TBP
\ No newline at end of file
diff --git a/docs/en_us/olx/source/what-is-olx.rst b/docs/en_us/olx/source/what-is-olx.rst
deleted file mode 100644
index f874b94d4d..0000000000
--- a/docs/en_us/olx/source/what-is-olx.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-.. _What is Open Learning XML?:
-
-###########################
-What is Open Learning XML?
-###########################
-
-Open Learning XML (OLX) is the XML-based standard used to build courses for the
-edX Platform.
-
-With OLX, you can:
-
-* Move content between instances of Open edX.
-* Create course content outside of edX Studio, including by conversion from
-  other content formats.
-* Ensure content remains free of proprietary encoding and allow portability.
-
-**************
-XML Resources
-**************
-
-OLX is based on XML. XML, or Extensible Markup Language, is a set of rules
-for creating documents in a format that is both human-readable and machine-
-readable.
-
-To work with OLX, you should have a strong understanding of XML. This
-document presumes you understand XML and can use tools to create and edit XML
-files.
-
-For a primer on XML, see the `Wikipedia XML entry`_ . 
-
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/Makefile b/docs/en_us/release_notes/Makefile
deleted file mode 100644
index 7a4baa06c4..0000000000
--- a/docs/en_us/release_notes/Makefile
+++ /dev/null
@@ -1,183 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-PAPER         ?=
-BUILDDIR      ?= build
-
-# User-friendly check for sphinx-build
-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
-endif
-
-Q_FLAG        =
-
-ifeq ($(quiet), true)
-Q_FLAG = -Q
-endif
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = $(Q_FLAG) -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  xml        to make Docutils-native XML files"
-	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/getting_started.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/getting_started.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/getting_started"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/getting_started"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-latexpdfja:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through platex and dvipdfmx..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-xml:
-	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
-	@echo
-	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
-
-pseudoxml:
-	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
-	@echo
-	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/docs/en_us/release_notes/__init__.py b/docs/en_us/release_notes/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docs/en_us/release_notes/source/01-07-2014.rst b/docs/en_us/release_notes/source/01-07-2014.rst
deleted file mode 100644
index 28e1a63ba7..0000000000
--- a/docs/en_us/release_notes/source/01-07-2014.rst
+++ /dev/null
@@ -1,80 +0,0 @@
-###################################
-January 7, 2014
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
-
-*************
-edX Studio
-*************
-
-
-* The **Files & Uploads** page has been updated so that a maximum of 50 files now appear on a single page. If your course has more than 50 files, additional files are listed in separate pages. You can navigate to other pages through pagination controls at the top and bottom of the file list.  This change improves the page performance for courses with a large number of files.
-
-  For more information, see the `Add Files to a Course`_.
-
-  .. note::  The :ref:`October 29 2013` release notes describe a workaround to limit the number of files that appear on a single page. With the January 7, 2014 release, this method is not necessary and no longer works.
-
-
-* The **Course Outline** page is updated to include several design improvements. The new Course Outline appears as in the following example:
-
-  .. image::  images/course_outline.png
-    :alt: The Course Outline
-
-  To see the changes, view your course in Studio or see `Organizaing Your Course Content`_.
-
-* A template for custom JavaScript display and grading problems (also called JSInput problems) is now available. For more informatoin, see `Custom JavaScript Problem`_. (BLD-523) (BLD-556)
-
-* A template for the Zooming Image tool is now available. For more informatoin, see the `Zooming Image Tool`_. (BLD-206)
-
-==========================
-Changes and Updates
-==========================
-
-* The Course Export tool now supports non-ASCII characters. (STUD-868)
-
-* In the course outline, you can now drag a section to the end of the list of sections when the last section is collapsed. (STUD-879)
-
-* In Video components, when you click inside the **Start Time** or **End Time** field, you can enter a time in HH:MM:SS format as normal text. After you click out of the field, Studio adds zeros and performs unit conversions so that the field contains six digits that correspond to hours, minutes, and seconds.
-
-  For example, if you enter 1:35, the text in the field changes to 00:01:35. If you enter 2:71:35, the text changes to 3:11:35. (BLD-506 and BLD-581)
-
-* The **Save** button for JSInput Problem components now works as expected. (BLD-568)
-
-
-
-***************************************
-edX Learning Management System
-***************************************
-
-
-* When you download grades by clicking **Download CSV of answer distributions** on the Instructor Dashboard, the LMS no longer returns an empty CSV for small Studio-created courses. Instead, the LMS returns a CSV that is sorted by url_name and that includes responses from students who have unenrolled from the course.
-
-  Note that errors occur if you try to download grades for a large Studio-based course or an XML-based course.
-
-* In the course wiki, the **Preview this Revision** and the **Merge selected with Current** dialog boxes are now keyboard accessible in Internet Explorer. (LMS-1539)
-
-* On the Instructor Dashboard, when you click the Datadump tab and then click Download CSV of all student profile data, you no longer receive a 500 error message. (LMS-1675)
-
-* For Image Response problems, the correct answer now appears when a student clicks **Show Answer**. (BLD-21)
-
-* On iPads, the video player uses edX controls that appear after you click the video or the Play button. On iPhones, the video player uses native controls. (BLD-541)
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/01-16-2014.rst b/docs/en_us/release_notes/source/01-16-2014.rst
deleted file mode 100644
index defec6fed8..0000000000
--- a/docs/en_us/release_notes/source/01-16-2014.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-###################################
-January 16, 2014
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
-
-*************
-edX Studio
-*************
-
-
-* In certain situations, PDF files in the course were saved with the wrong content type.  PDF files are now always stored with the content type ``application/pdf``. (STUD-878)
-
-* The **Files & Uploads** page has been updated so that you can sort files on the page by file name or the date the file was uploaded to the course. (STUD-995)
-
-  For more information, see the `Add Files to a Course`_. 
-
-* The default **Course Start Date** for new courses is now **01/01/2030 GMT**.  This is to ensure that your course does not start before you intend it to. You must change the course start date to the date you want students to begin using the course. (STUD-1072)
-
-  For more information, see the `The Course Start Date`_. 
-
-* For new courses, sections and subsections now have a default release date of **January 1, 2030**. In this case, you must adjust the release date to the day you want students to be able to view the content. (STUD-1072)
-   
-  For more information, see the `Release Dates`_. 
-
-***************************************
-edX Learning Management System
-***************************************
-
-* When a student sets the volume for a video, that volume setting is now saved and used when the student views subsequent videos. (BLD-518)
- 
- 
-
-* For Image Response problems, the correct answer now appears when a student clicks **Show Answer**. (BLD-633)
-
-******************
-Discussion Forums
-******************
-
-* The Vote button in the forum is now accessible by the keyboard and to screen readers. (FOR-64)
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/01-29-2014.rst b/docs/en_us/release_notes/source/01-29-2014.rst
deleted file mode 100644
index 038b8dcad4..0000000000
--- a/docs/en_us/release_notes/source/01-29-2014.rst
+++ /dev/null
@@ -1,81 +0,0 @@
-###################################
-January 29, 2014
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include:
-  
-  * `Discussions`_ 
-  * `Guidance for Discussion Moderators`_
-  * `External Graders`_
-
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
-
-
-*************
-edX Studio
-*************
-
-
-* In edX Studio, you can now duplicate components within a unit. See the documentation on `duplicating components`_ for more information. (STUD-1186)
-
-* You can now use single quotation marks without escaping them when you specify option response answers. The single quotation mark must be between two alphabet characters.  (LMS-2031)
-
-
-
-***************************************
-edX Learning Management System
-***************************************
-
-* A problem that caused the dashboard to not load if there were unicode or space characters in the course image has been fixed. (LMS-2073, STUD-1197)
-
-* When a student sets the speed for a video, that speed setting is now saved and used when the student views subsequent videos. (BLD-237)
-
-* In the Video component, the settings on the **Advanced** tab now include **Transcript Download Allowed** and **Video Download Allowed**, and **Download Video** has been merged into **Video Sources** to eliminate redundancy. A description of each setting is available at `Video Advanced Options`_. (BLD-364, BLD-368)
-
-* For numerical response problems, students can now enter negative exponents in the same ways they can enter positive exponents. For example, students can enter ``4.9e-9`` or ``4.9*10^-9``. (BLD-434)
-
-* For text input problems, course teams can now use regular expressions to allow some flexibility in students' answers. For example, if a question asks students to name the birthplace of Bill Clinton, students can answer "Hope, AR", "Hope, Arkansas", or "Arkansas."
-
-* The video length now appears when a student first views the video component. The student no longer has to start the video to see the total time. (BLD-529)
-
-* Grading in unreleased LTI components did not work correctly for users with the Beta Tester role. This problem has been resolved. (BLD-641)
-
-* In Firefox, videos started playing from 00:00 even if the instructor specified a different start time for the video. Videos now start from the specified start time. (BLD-708)
-
-
-***************************************
-Discussions
-***************************************
-
-* The Discussion search field now expands when it gets focus through the keyboard. (FOR-203)
-
-
-***************************************
-Open Response Assessments
-***************************************
-
-* If a student submitted a response to be peer graded when the XQueue was down, the submission was lost. The LMS now prevents response submissions when the XQueue is down. Students see an error message that tells them to try to submit the response later. (ORA-197)
-
-* Large comments in peer grading caused database issues. Comments now have a 5000 character limit, which prevents this problem. (ORA-201)
- 
-* In self assessments, students had to submit responses before the deadline for the problem passed, but didn't have to perform the self assessment of their responses before the deadline. Students must now submit both the response to the problem and their self assessment of that response before the deadline for the problem. (ORA-202) 
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/02-05-2014.rst b/docs/en_us/release_notes/source/02-05-2014.rst
deleted file mode 100644
index 94dc6e275d..0000000000
--- a/docs/en_us/release_notes/source/02-05-2014.rst
+++ /dev/null
@@ -1,65 +0,0 @@
-###################################
-February 5, 2014
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include:
-  
-  * `Google Instant Hangout Tool`_
-  * `Student Data`_
-  * `Grade and Answer Data`_
-  * `Multiple Choice and Numerical Input Problem`_
-
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
-
-
-
-*************
-edX Studio
-*************
-
-
-* The Display Name of a component is now shown if the unit is Private or a draft. For more information, see the `Components`_ documentation.
-
-
-***************************************
-edX Learning Management System
-***************************************
-
-* The Role element is now added to LTI components.  For edX users with the Instructor role, the Instructor role is passed to LTI.  EdX users with the Staff role have the Administrator role passed to LTI.  All students are passed as Student to LTI. (BLD-583)
-
-===========================
-Accessibility Improvements
-===========================
-
-* The HTML language is now set by the language setting of the user's browser. This enables screen readers to detect the current language.
-
-* Page titles are now more descriptive, enabling screen readers to better interpret the user's location.  The page titles contain the subsection or tab, then the course, then edX. For example, a title from edX101 is ``Creating Video Segments | edX101 Courseware | edX``.
-
-
-***************************************
-Discussions
-***************************************
-
-* Long discussion threads are now paginated. When a student opens the discussion thread, first 25 responses are loaded. The student can then load 100 more responses at a time. The field and button to submit a new response are always available at the bottom of the listed responses. (FOR-371)
-
-* When you hover the mouse button over a discussion thread in the left side bar, the pop-up tool-tip now correctly displays the number of unread comments you have in the thread. (FOR-434)
-
-.. include:: links.rst
diff --git a/docs/en_us/release_notes/source/02-12-2014.rst b/docs/en_us/release_notes/source/02-12-2014.rst
deleted file mode 100644
index 89860d7da8..0000000000
--- a/docs/en_us/release_notes/source/02-12-2014.rst
+++ /dev/null
@@ -1,83 +0,0 @@
-###################################
-February 12, 2014
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include:
-  
-  * `Set the Advertised Start Date`_
-  * `Full Screen Image`_
-
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
-
-
-
-*************
-edX Studio
-*************
-
-
-* The improved layout of components in a unit page now includes visual separation of the header, making clear that the display name for each component is not rendered to students.
-
-* The new Full Screen Image tool allows students to enlarge an image, so they can see all the detail in context. You can create a full screen image with a new HTML component template. For more information, see the `Full Screen Image`_ documentation.
-
-* If you do not change the default course start date (01/01/2030), and the advertised_start policy value is null, then the student dashboard does not now list a start date for the course. Students just see that the course has not yet started. For more information, see the `Set the Advertised Start Date`_ documentation.
-
-
-***************************************
-edX Learning Management System
-***************************************
-
-
-===========================
-Accessibility Improvements
-===========================
-
-* Unnecessary section tags were removed from the student's view of the courseware, so they are no longer announced by screen readers.
-
-* Extraneous title blocks were removed from breadcrumbs, so they are no longer read by screen readers.
-
-* In the student Progress tab, ordered list tags (<ol>) were replaced with <div> tags, to improve how screen readers interpret the screen.
-
-* IDs were added to parts of the course navigation where they were missing, making it easier to skip parts of the course when using a screen reader.
-
-* Updates to unit pages now make navigation more accessible to screen readers.
-
-* Modal dialog boxes and script templates are now hidden from screen readers. 
-
-* Mathjax messages that are specific to Internet Explorer are no longer shown when students are using a different browser.
-
-* Alt text was added to the course footer logo.
-
-* The character set meta tag was added to the main course template.
-
-* The DOCTYPE declaration was added to the top of the main course template.	
-
-
-
-***************************************
-Discussions
-***************************************
-
-* The **Add a Response** button no longer appears in forum threads when students are not allowed to respond. (FOR-452)
-
-
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/02-19-2014.rst b/docs/en_us/release_notes/source/02-19-2014.rst
deleted file mode 100644
index e92aa99591..0000000000
--- a/docs/en_us/release_notes/source/02-19-2014.rst
+++ /dev/null
@@ -1,73 +0,0 @@
-###################################
-February 19, 2014
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include:
-  
-  * `Additional transcripts`_ for videos.
-
-  * `Course data`_ in the instructor dashboard.
-
-  * `Staffing data`_ in the instructor dashboard.
-
-  * `Enrollment data`_ in the instructor dashboard.
-
-  * The `Gene Explorer`_ tool.
-
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
-
-*************
-edX Studio
-*************
-
-
-* A problem with importing a course that has conditionals into a course of a different name is now fixed. (STUD-149)
-
-* Previously, when you canceled changes in a component, then reopened the component, your changes were still present. This problem is resolved.  When you now click **Cancel** in a component, your changes since the last save are properly discarded. (STUD-235)
-
-* A problem with changing a unit from Public to Private, which caused the error message "Studio's having trouble saving your work. The studio servers encountered an error" is fixed. (STUD-1316) 
-
-* The workflows for adding Latex HTML components and problems written in Latex are changed. You can no longer upload Latex files directly from the unit page.  See the following sections in documentation for more information:  `Import LaTeX Code into an HTML Component`_ and `Problem Written in LaTeX`_.
-
-* Developers can now include key-value pairs as a configurable setting in Studio without a special interface. This will be applicable to developers adding multiple-language video transcripts, the LTI custom parameters field, or any field where possible inputs are not known at compile-time. (BLD-658)
-
-* The **Add** button no longer becomes unavailable in some situations after you click **Clear** next to **Video Sources** in a Video component. (BLD-821)
-
-* Instructors can again post non-.srt video transcripts for students to download. (BLD-837)
-
-===========================
-Accessibility Improvements
-===========================
-
-* Course authors can now add labels to input fields for problems, making problems more accessible to screen readers. For more information, see the chapter `Working with Problem Components`_ in *Building a Course with edX Studio*. (LMS-1895)
-
-***************************************
-edX Learning Management System
-***************************************
-
-* A problem that caused timeouts in large courses when loading histograms is resolved. (LMS-1199)
-
-* When a student stops playing a video before it ends and closes the browser, the video starts from the place where the student stopped watching the next time the student views the video. (BLD-385)
-
-.. include:: links.rst
-
-
-
diff --git a/docs/en_us/release_notes/source/02-26-2014.rst b/docs/en_us/release_notes/source/02-26-2014.rst
deleted file mode 100644
index 80d22d8acd..0000000000
--- a/docs/en_us/release_notes/source/02-26-2014.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-###################################
-February 26, 2014
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include:
-  
-  * `Getting Started`_
-  * `Beta Testing a Course`_
-  * `Import LaTeX Code into an HTML Component`_
-  * `Establishing a Grading Policy`_
-
-
-* `edX Research Guide`_
-
-   Recent changes include:
-
-   * `Tracking Logs`_ 
-   * `Wiki Data`_
-   * `Discussion Forum Data`_
-
-* `edX Developer's Guide`_
-
-
-
-*************
-edX Studio
-*************
-
-* Performance when you log in to Studio on edge.edx.org is improved. (STUD-1133)
-
-* A problem that caused deleted textbooks to remain in your course is resolved. (STUD-1327)
-
-* The following problem is resolved:  When viewing a multiple choice problem in Studio, if you selected the correct answer, Studio cleared your selection and marked the problem as incorrect. This problem only occurred in Studio and did not affect students. (BLD-788)
-
-
-*************
-Discussions
-*************
-
-
-* Course staff can now delete comments made on discussion responses.
-  
-.. include:: links.rst
-
-
-
diff --git a/docs/en_us/release_notes/source/03-04-2014.rst b/docs/en_us/release_notes/source/03-04-2014.rst
deleted file mode 100644
index 0612d8835e..0000000000
--- a/docs/en_us/release_notes/source/03-04-2014.rst
+++ /dev/null
@@ -1,84 +0,0 @@
-###################################
-March 4, 2014
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include:
-  
-  * `Staff Debug Info`_ 
-  * `Add Files to a Course`_
-
-
-* `edX Research Guide`_
-
-   Recent changes include:
-
-   * `Tracking Logs`_ 
-
-* `edX Developer's Guide`_
-
-
-
-*************
-edX Studio
-*************
-
-* A problem that caused escaped HTML characters to be displayed incorrectly on the Course Updates page is resolved. (STUD-154)
-
-* A problem that prevented course staff from posting in discussions when a course was deleted and recreated is resolved. (STUD-1140)
-
-* A problem that caused the first line of an HTML component to be partially cut off in the unit page is resolved. (STUD-1380)
-
-* The Files & Uploads page now includes an external URL for each asset.  See `Add Files to a Course`_ for more information.
-
-
-
-
-***************************************
-edX Learning Management System
-***************************************
-
-* The edX registration form now validates that the Public Username field contains 30 or fewer characters, and that the E-mail field contains 75 or fewer characters. The user receives a message if the Public Username or E-mail values are too long. (LMS-1479)
-
-* If a video is configured to start at a time other than 00:00:00, the video player now correctly starts the video at the specified start time after the video player is reset for any reason. (BLD-659)
-
-
-
-===========================
-Accessibility Improvements
-===========================
-
-* The layout of Course Updates is improved to use semantic tagging and not just simple lists, making the page more accessible to screen readers. (LMS-1724)
-
-* A label is added to the checkbox problem template. 
-
-* Confirmation dialog boxes for Open Response Assessments are now screen-reader accessible.
-
-
-*************
-Analytics
-*************
-
-
-* Problem check events now include the problem name, answer value, response type, input type, and annotations for randomized problems. (AN-587, AN-594)
-
-
-*************
-Discussions
-*************
-
-* Tooltips for pinning threads are updated so students do not see the tooltip when they cannot pin a thread, and course staff see the appropriate tooltip text. (FOR-192)
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/03-11-2014.rst b/docs/en_us/release_notes/source/03-11-2014.rst
deleted file mode 100644
index b966aa2980..0000000000
--- a/docs/en_us/release_notes/source/03-11-2014.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-###################################
-March 11, 2014
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include:
-  
-  * `The Course Start Date`_ 
-  * `The Course End Date`_ 
-  * `Add a Course Image`_ 
-  * `Add a Course Introduction Video`_ 
-  * `Describe Your Course`_ 
-  * `Create or Obtain a Video Transcript`_
-
-
-* `edX Research Guide`_
-
-* `edX Developer's Guide`_
-
-
-*************
-edX Studio
-*************
-
-* When you edited an HTML component in a Chrome browser, a problem sometimes caused text that you edited in Visual view to not be updated in HTML view. This problem is resolved. (STUD-1336)
-
-* A problem that caused images to not appear in Visual view in the HTML component editor has been resolved. (STUD-1357)
-
-
-***************************************
-edX Learning Management System
-***************************************
-
-* A problem that caused a course that had not started to be listed as having started in the beta Instructor Dashboard is resolved. (LMS-1548)
-
-* Course authors now have correct permissions to delete Wiki posts in their courses. (LMS-2136)
-
-* When a video first loads but before it begins playing, the video position slider now automatically goes to the configured start time. (BLD-823)
-
-* Students can now download transcripts as .srt or .txt files. A student selects the format below the video:
-
- .. image:: images/transcript-download.png
-  :alt: Image of the transcript download format selection.
-
- The student selects the format, then clicks **Download transcript**. For more information, see `Create or Obtain a Video Transcript`_ (BLD-844)
-
-* A problem that prevented viewing videos in Firefox in full screen mode is resolved. (BLD-905)
-
-===========================
-Accessibility Improvements
-===========================
-
-* The Python code editor and the Wiki **Add new article** screen are now keyboard accessible.  In the Python code editor, the **Tab** key adds a tab in the code; students use the **Esc** key to leave the code editor field. In the Wiki's Add new article page, the **Tab** key navigates through the fields. (LMS-1802)
-
-* When a user is viewing a unit page, the display name of only the first component is now used as the page and navigation title. The display names of subsequent components are not used. (STUD-1351)
-
-* When a user views a video in full screen mode, the transcript no longer obscures the video content. (BLD-852)
-
-.. include:: links.rst
diff --git a/docs/en_us/release_notes/source/03-18-2014.rst b/docs/en_us/release_notes/source/03-18-2014.rst
deleted file mode 100644
index ceece886bb..0000000000
--- a/docs/en_us/release_notes/source/03-18-2014.rst
+++ /dev/null
@@ -1,85 +0,0 @@
-###################################
-March 18, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of March 18, 2014.  See previous pages in this document for a history of changes.
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include: 
-
-  * `Getting Started`_
-
-  * `Building a Course`_
-
-  * `Creating Course Content`_
-
-  * `Creating Exercises and Tools`_
-
-  * `Releasing Your Course`_
-
-  * `Running Your Course`_
-
-  * `Information for Your Students`_
-
-
-* `edX Research Guide`_
-
-  Recent changes include:
-
-  * `Certificate Data`_
-
-
-* `edX Developer's Guide`_
-
-
-*************
-edX Studio
-*************
-
-* In the HTML editor, when you entered a ``<style>`` element, the editor sometimes stopped responding. This problem is resolved. (STUD-1434) 
-
-
-***************************************
-edX Learning Management System
-***************************************
-
-* Course staff could not re-score a problem in the standard Instructor Dashboard. This issue is resolved. (LMS-2327)
-
-* In the Beta Instructor Dashboard, the button for listing enrolled students is now only enabled for courses with fewer than 200 students. (LMS-1203)
-
-* In the Beta Instructor Dashboard, you can now use edX usernames as well as email addresses to set roles for course administrators. (LMS-1438)
-
-* The student Progress page now works correctly for graded XBlocks. (LMS-2349)
-
-* For MatLab problems, when the code exceeded the size of the entry field, the scroll bars stopped working. This problem is resolved. (LMS-2387)
-
-* A problem that in certain situations caused the video transcript button to disappear when you changed the video speed is resolved. (BLD-915)
-
-* Students using Firefox browsers were only able to select 1.0 as the video speed. Firefox users can now select all available speed options. (BLD-895)
-
-***************************************
-edX Analytics
-***************************************
-
-* A problem that prevented the delivery of data research packages of courses with Unicode characters in the organization name is resolved. (AN-657)
-
-
-***************************************
-edX Discussions
-***************************************
-
-* A problem that prevented students from viewing discussion components within a unit when cohorts were configured is resolved. (FOR-523)
-
-.. include:: links.rst
diff --git a/docs/en_us/release_notes/source/03-26-2014.rst b/docs/en_us/release_notes/source/03-26-2014.rst
deleted file mode 100644
index 53e636a7ed..0000000000
--- a/docs/en_us/release_notes/source/03-26-2014.rst
+++ /dev/null
@@ -1,76 +0,0 @@
-###################################
-March 27, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of March 27, 2014.  See previous pages in this document for a history of changes.
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include: 
-
-  * An update to the `Adding Pages to a Course`_ section to reflect the new Pages functionality.
-
-  * Updated the sections on `Beta Testing a Course`_, `Discussions`_, `Grade and Answer Data`_, and `Student Data`_ with changes to the new Instructor Dashboard.
-
-
-* `edX Research Guide`_
-
-  Recent changes include:
-
-  * Addition of the ``user_api_usercoursetag`` table to the `Student Info and Progress Data`_ chapter.
-
-  * Addition of the ``assigned_user_to_partition`` and ``child_render`` event types to the `Tracking Logs`_ chapter.
-
-  * Alternative formatting for the examples in the `Discussion Forums Data`_ chapter.
-
-* `edX Developer's Guide`_
-
-
-
-*************
-edX Studio
-*************
-
-* The previous Static Pages feature has been renamed Pages. You can now see the default pages and re-order custom pages in your course. For more information, see `Adding Pages to a Course`_. (STUD-1193, STUD-1346)
-
-
-***************************************
-edX Learning Management System
-***************************************
-
-* You can now batch add beta testers to your course. The UI for adding beta testers has been expanded. See `Add the Beta Testers`_ for more information. (LMS-1287) 
-
-* When you enroll students, the process now checks that the email addresses are valid and gives you a message for those that are invalid. (LMS-2244)
-
-* In certain situations, the MatLab console tried to display malformed HTML, causing it stop functioning. This problem is resolved. (BLD-948)
-
-===========================
-Accessibility Improvements
-===========================
-
-* Problem response feedback is now accessible to screen readers. (LMS-2158)
-
-* The styles of all objects are now the same when the student hovers over the object with the mouse and when the student uses the tab key to focus on the object. (LMS-2352)
-
-
-
-***************************************
-edX Discussions
-***************************************
-
-* Students previously were able to pin and unpin discussion threads.  Privileges have been fixed and students can no longer pin and unpin threads. (FOR-499)
-
-* Students' discussion accounts were previously set to use the language EN-US by default. Accounts are now set to use students' language setting. (FOR-532)
-
-.. include:: links.rst
diff --git a/docs/en_us/release_notes/source/04-02-2014.rst b/docs/en_us/release_notes/source/04-02-2014.rst
deleted file mode 100644
index 0b9b6ce38a..0000000000
--- a/docs/en_us/release_notes/source/04-02-2014.rst
+++ /dev/null
@@ -1,101 +0,0 @@
-###################################
-April 3, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of April
-3, 2014.  See previous pages in this document for a history of changes.
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include: 
-
-  * Expanded the `Grade and Answer Data`_ chapter to include the new
-    `Student Answer Distribution`_ section.
-
-  * Updated the `Releasing Your Course`_ section to include `Course Launching Activities`_.
-
-  * Updated the `Adding Pages to a Course`_ chapter
-    to reflect ability to `Show or Hide the Course Wiki Page`_.
-
-  * Reorganized the sections `Building a Course`_ and
-    `Creating Course Content`_ to better
-    reflect the workflow of building a new course.
-
-
-* `edX Research Guide`_
-
-  Recent changes include:
-
-  *  Added the `Data Czar/Data Team Selection and Responsibilities`_ chapter.
-
-* `edX Developer's Guide`_
-
-  *  Added the `Custom JavaScript Applications`_ chapter.
-
-
-*************
-edX Studio
-*************
-
-* You can now choose to hide or show the Wiki in your course, by using a control
-  in the list of course Pages.  For more information, see `Show or Hide the
-  Course Wiki Page`_. (STUD-1375)
-
-* A new IFrame template is now available as an option when you create a
-  new HTML component. An IFrame allows you to integrate ungraded exercises and
-  tools from any Internet site into the body of your course. The IFrame appears
-  inside an HTML component, and the exercise or tool appears inside the IFrame.
-  (BLD-678)
-
-* You can now upload video transcripts for multiple languages. In the Video
-  editor, open the **Advanced** tab. In the **Transcript Translations** section,
-  select a language, then click **Upload** to select the transcript file from
-  your computer.  Click **Add** and repeat this process for additional
-  languages. (BLD-751)
-
-***************************************
-edX Learning Management System
-***************************************
-
-* **Answer Distribution Report**
-
-  A downloadable report of student answer distributions is now available from
-  the Instructor Dashboard. This report includes one row for each problem-answer
-  combination selected by students for problems of these types:
-
-  * Checkboxes
-  * Dropdown
-  * Multiple choice
-  * Numerical input
-  * Text input
-  * Math expression input
-
-  The report is automatically generated on a periodic basis, so the most
-  recently updated version of the report is available on the Instructor
-  Dashboard. For more information, see `Student Answer Distribution`_. (AN-590)
-
-* **Bulk Email for New Courses**
-
-  .. note:: The bulk email feature is in limited release, and is available for
-   new courses only. A gradual rollout of this feature is planned for 2014.
-
-  Using this feature, you can send email messages to course participants
-  directly from the Instructor Dashboard, before, during, and after the course
-  run. A history report of all email messages sent for your course is available.
-  It includes the username of the sender, the recipients, the date and time
-  sent, and the task status. For more information, see `Course Launching
-  Activities`_ . (LMS-1035)
-
-
-.. include:: links.rst
diff --git a/docs/en_us/release_notes/source/04-09-2014.rst b/docs/en_us/release_notes/source/04-09-2014.rst
deleted file mode 100644
index 1cc6a8c505..0000000000
--- a/docs/en_us/release_notes/source/04-09-2014.rst
+++ /dev/null
@@ -1,73 +0,0 @@
-###################################
-April 15, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of April
-15, 2014.  See previous pages in this document for a history of changes.
-
-**************************
-edX Documentation
-**************************
-
-You can access the `edX Status`_ page to get an up-
-to-date status for all services on edx.org and edX Edge. The page also includes
-the Twitter feed for @edXstatus, which the edX Operations team uses to post
-updates.
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include: 
-
-  * Expanded the `Course Data`_, `Enrollment`_, and `Staffing`_ sections.
-
-  * Updated `Working with HTML Components`_ to reflect the new HTML editor.
-
-
-* `edX Research Guide`_
-
-* `edX Developer's Guide`_
-
-  *  Added the `Custom JavaScript Applications`_ chapter.
-
-
-*************
-edX Studio
-*************
-
-* **HTML Editor Upgrade**
-
-  The HTML editor you use for HTML components, as well as Pages, was upgraded to improve usability.
-
-  .. image:: images/HTMLEditor.png
-   :alt: Image of the new HTML Editor
-
-  For instructions on using the new editor to add text, images, and links, see `Working with HTML Components`_.
-
-***************************************
-edX Learning Management System
-***************************************
-
-* New **View {page} in Studio** buttons are available in the LMS **Staff View** to make navigating between a live course and Studio easier.
-
-.. image:: /images/Live_Course_Staff_View.png
-  :alt: Image of the Courseware page in a live course with Staff View indicated at top right and a View Unit in Studio button
-
-For more information, see `Go to Studio from Your Live Course`_.
-
-* A problem that prevented course staff from deleting the student's state for an XBlock in the Beta Instructor Dashboard is now resolved. (LMS-2491)
-
-* All error messages that can be produced when a problem is submitted for grading are now correctly written in Javascript. These messages can now be read by screen readers, and no longer cause exception errors. (LMS-2474)
-
-* Video transcripts are now displayed in their source language. (BLD-935)
-
-* Video transcripts are now available for all video speeds in Firefox. (BLD-958)
-  
-
-.. include:: links.rst
diff --git a/docs/en_us/release_notes/source/04-16-2014.rst b/docs/en_us/release_notes/source/04-16-2014.rst
deleted file mode 100644
index 7b631e31f9..0000000000
--- a/docs/en_us/release_notes/source/04-16-2014.rst
+++ /dev/null
@@ -1,84 +0,0 @@
-###################################
-April 16, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of April
-16, 2014.  See previous pages in this document for a history of changes.
-
-**************************
-edX Documentation
-**************************
-
-You can access the `edX Status`_ page to get an up-
-to-date status for all services on edx.org and edX Edge. The page also includes
-the Twitter feed for @edXstatus, which the edX Operations team uses to post
-updates.
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include: 
-
-  * In support of new features, added the following sections to `Multiple Choice`_ problems:
-    
-    * `Shuffle Answers in a Multiple Choice Problem`_
-    * `Targeted Feedback in a Multiple Choice Problem`_
-    * `Answer Pools in a Multiple Choice Problem`_
-      
-
-  * Expanded the `Grade and Answer Data <http://edx.readthedocs.org/projects/ca/en/latest/running_course/course_grades.html#grades>`_ section to include a topic on interpreting the Student Answer Distribution report.
-
-* `edX Research Guide`_
-
-* `edX Developer's Guide`_
-
-
-*************
-edX Studio
-*************
-
-* **Multiple Choice Problem Enhancements**
-
-  Multiple choice problems now support shuffling answers, providing targeted
-  feedback, and answer pools. See the following documentation for more
-  information:
-
-    * `Shuffle Answers in a Multiple Choice Problem`_
-    * `Targeted Feedback in a Multiple Choice Problem`_
-    * `Answer Pools in a Multiple Choice Problem`_
-
-* When you import a large course, your browser may time out while the course is
-  being imported.  In this situation, the following message is now displayed on
-  the Import page: *Your browser has timed out but the server is still
-  processing your import. Please wait 5 min and verify that the new content has
-  appeared*. (STUD-1283)
-
-* In Studio, the Discussion component is updated with the following text: *To
-  view live discussions, click Preview or View Live in Unit Settings*. (FOR-429)
-
-***************************************
-edX Learning Management System
-***************************************
-
-* When you enrolled students in a course on edx.org and sent a notification
-  email message, the message included an invalid link to the course. This
-  problem is now resolved. (LMS-2217)
-
-* The video player now only shows the HD button when an HD video option is
-  available. (BLD-937)
-
-===========================
-Accessibility Improvements
-===========================
-
-* The PDF viewer used for textbooks was updated and is now accessible to screen
-  readers. (LMS-2276)
-
-
-.. include:: links.rst
diff --git a/docs/en_us/release_notes/source/04-23-2014.rst b/docs/en_us/release_notes/source/04-23-2014.rst
deleted file mode 100644
index 2d0bb77944..0000000000
--- a/docs/en_us/release_notes/source/04-23-2014.rst
+++ /dev/null
@@ -1,69 +0,0 @@
-###################################
-April 23, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of April
-23, 2014.  See previous pages in this document for a history of changes.
-
-**************************
-edX Documentation
-**************************
-
-You can access the `edX Status`_ page to get an up-
-to-date status for all services on edx.org and edX Edge. The page also includes
-the Twitter feed for @edXstatus, which the edX Operations team uses to post
-updates.
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include: 
-
-  * Updated `Testing Your Course`_ to include a section on how to `Switch Between Studio and Your Live Course`_.
-
-  * Updated `Transcripts in Additional Languages`_ in `Working with Video Components`_.
-
-  * In `Discussions`_, corrected the steps to Create Discussion Categories.
-
-  * Updated the `Bulk Email`_ section with information about the dashboard option to opt out of course email.
-
-  * Updated the `Enrollment`_ section to reflect feature changes.
-      
-
-* `edX Research Guide`_
-
-* `edX Developer's Guide`_
-
-
-*************
-edX Studio
-*************
-
-* A problem in the HTML editor that caused custom JavaScript and CSS code to be
-  corrupted when you saved an HTML component is now resolved. (STUD-1560)
-
-***************************************
-edX Learning Management System
-***************************************
-
-* This release includes several enhancements to the Beta Instructor Dashboard:
-  
-  * You can now enter either a username or an email address to batch add 
-    and enroll beta testers and students.
-  * The Auto Enroll option is now available when you add beta testers in batch.
-  * For the Batch Enrollment and the Batch Add Beta Testers features, the Auto
-    Enroll and Notify students by email options are now selected by default.
-
-* A problem that prevented MathJax from being displayed properly when the
-  problem answer was shown is now resolved. (BLD-993)
-
-
-
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/04-29-2014.rst b/docs/en_us/release_notes/source/04-29-2014.rst
deleted file mode 100644
index ea7a0dcc2d..0000000000
--- a/docs/en_us/release_notes/source/04-29-2014.rst
+++ /dev/null
@@ -1,89 +0,0 @@
-###################################
-April 30, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of April
-30, 2014.  See previous pages in this document for a history of changes.
-
-**************************
-edX Documentation
-**************************
-
-You can access the `edX Status`_ page to get an up-
-to-date status for all services on edx.org and edX Edge. The page also includes
-the Twitter feed for @edXstatus, which the edX Operations team uses to post
-updates.
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include: 
-
-  * Updated `Show or Hide the Course Wiki Page`_ to include a note about Wiki
-    content being available after you hide the Wiki page.
-
-  * Updated label information and added XML information to `Problem with
-    Adaptive Hint`_
-
-  * Updated `Beta Testing a Course`_ to reflect feature changes.
-    
-  * Expanded the `Grade and Answer Data`_ to include topics on interpreting the
-    grade reports and student progress page.
-
-  * Updated `Working with HTML Components`_ to reflect changes to the HTML
-    component editor.
-
-  * Reorganized information about problems into the `Creating Exercises and
-    Tools`_ section.
-  
-  * Added more information about collecting language and location data from
-    students to `Student Data`_.
-      
-
-* `edX Research Guide`_
-  
-  Added new event types to `Tracking Logs`_ for interactions with PDF files.
-
-* `edX Developer's Guide`_
-  
-  Recent changes include:
-  
-  Added the section `Contributing to Open edX`_
-
-
-
-*************
-edX Studio
-*************
-
-* The HTML component editor is updated to provide a raw HTML editing option. For
-  more information, see `Working with HTML Components`_. (STUD-1562)
-
-* You can now upload a handout that is associated with a video directly in the
-  Video component editor. Open the **Advanced** tab in the Video component
-  editor, and use the **Upload** button to find and add a file from your
-  computer:
-  
-  .. image:: images/upload_handout_video.png
-   :alt: Image of the Upload Handout section of the Video component editor.
-
-***************************************
-edX Learning Management System
-***************************************
-
-* Lines in bulk email messages were not wrapped at 998 characters, which caused
-  error messages and erroneous characters in some email programs. All lines are
-  now wrapped at 998 characters automatically. (LMS-1466)
-
-* Occasionally student submissions for MatLab problems are not graded
-  successfully and the MatLab grader times out. There is now a **Reset** button
-  that allows students to resubmit their answer without counting the
-  resubmission and another attempt of the problem.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/05-12-2014.rst b/docs/en_us/release_notes/source/05-12-2014.rst
deleted file mode 100644
index 9cf5b917a2..0000000000
--- a/docs/en_us/release_notes/source/05-12-2014.rst
+++ /dev/null
@@ -1,73 +0,0 @@
-###################################
-May 12, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of May 12, 2014. See previous pages in this document for a history of changes.
-
-**************************
-edX Documentation
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include: 
-
-  * Updated `Drag and Drop Problem`_ information.
-  
-  * Updated the `Discussions`_ chapter to include a topic on closing
-    discussions.
-  
-  * Expanded the `Grade and Answer Data`_ chapter to include a topic on
-    interpreting the score histograms for problems.
-
-  * Added documentation for the `IFrame Tool`_
-
-* `edX Research Guide`_
-  
-  Recent changes include: 
-  
-  * Corrected misstatement on how `Discussion Forums Data`_ is sent in data
-    packages.
-
-  * Added enrollment events to `Tracking Logs`_.
-    
-  * Removed obsolete information about XML formats for problems.
-  
-
-* `edX Developer's Guide`_
-  
-  
-* `edX XBlock Documentation`_
-
-
-
-*************
-edX Studio
-*************
-
-* In certain rare situations, users were not able to edit a draft unit without
-  making it Private. This problem is resolved. (STUD-1485, STUD-1499)
-
-* When you created problems with two inputs, the label for the second input was
-  not preserved in the Advanced Editor. This problem is resolved. (STUD-1524)
-
-
-***************************************
-edX Learning Management System
-***************************************
-
-* Students registered for an honor code certificate now see their registration
-  track on the Dashboard. (LMS-1071)
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/05-15-2014.rst b/docs/en_us/release_notes/source/05-15-2014.rst
deleted file mode 100644
index d90b8c189a..0000000000
--- a/docs/en_us/release_notes/source/05-15-2014.rst
+++ /dev/null
@@ -1,110 +0,0 @@
-###################################
-May 15, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of May 15, 2014. See previous pages in this document for a history of changes.
-
-**************************
-edX Documentation
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-  Recent changes include: 
-
-  * Updated the `Running Your Course`_ chapter to remove references to the “new
-    beta” Instructor Dashboard.
-
-  * Updated `Enrollment`_ section to reflect that usernames or email
-    addresses can be used to batch enroll students.
-
-  * Updated `Grade and Answer Data`_ section to include new features in
-    the problem **Staff Debug** viewer for rescoring, resetting attempts, and
-    deleting state for a specified student.
-
-  * Updated `Staffing`_ section to explain the labeling differences
-    between Studio and the LMS with respect to course team roles.
-
-  * Updated `Assign Discussion Administration Roles`_ section to include a note
-    about course staff requiring explicit granting of discussion administration
-    roles.
-
-  * Added the `VitalSource E-Reader Tool`_ section.
-    
-  * Updated  `Add Files to a Course`_ section to include warnings about
-    file size.
-
-  * Updated the `LTI Component`_ section to reflect new settings.
-
-
-* `edX Research Guide`_
-  
-  Recent changes include:
-
-  Updated `Tracking Logs`_ section to include events for course
-  enrollment activities: ``edx.course.enrollment.activated`` and
-  ``edx.course.enrollment.deactivated``.
-  
-
-* `edX Developer's Guide`_
-
-   Recent changes include: 
-
-   Added an `Analytics`_ section for developers.
-  
-  
-* `edX XBlock Documentation`_
-
-
-
-*************
-edX Studio
-*************
-
-* A problem that prevented you from hiding the Wiki in the list of Pages when
-  using Firefox is resolved. (STUD-1581)
-
-* A problem that prevented you from importing a course created on edx.org into
-  edX Edge is resolved. (STUD-1599)
-
-* All text in the Video component UI has been updated for clarity. (DOC-206)
-
-***************************************
-edX Learning Management System
-***************************************
-
-* The Instructor Dashboard that appears to course teams by default in the
-  LMS has changed. The Instructor Dashboard that appears when you click
-  **Instructor** is now the "New Beta" dashboard. The "Standard" dashboard
-  remains available; a button click is required to access it. The two dashboard
-  versions are also relabeled in this release. The version that was previously
-  identified as the "New Beta Dashboard" is now labeled "Instructor Dashboard",
-  and the version previously identified as the "Standard Dashboard" is now
-  labeled "Legacy Dashboard". (LMS-1296)
-
-
-* Previously, when a student clicked **Run Code** for a MatLab problem, the
-  entire page was reloaded. This issue has been resolved so that now only the
-  MatLab problem elements are reloaded. (LMS-2505)
-
-
-****************
-edX Analytics
-****************
-
-* There is a new event tracking API for instrumenting events to capture user
-  actions and other point-in-time activities in Studio and the edX LMS. See
-  `Analytics`_ for more information.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/05-20-2014.rst b/docs/en_us/release_notes/source/05-20-2014.rst
deleted file mode 100644
index fa184cbf8b..0000000000
--- a/docs/en_us/release_notes/source/05-20-2014.rst
+++ /dev/null
@@ -1,102 +0,0 @@
-###################################
-May 20, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of May 20, 2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_. 
-
-In addition, you can sign up for the new `edX Release Announcements mailing
-list`_ to get an email message when we have updated the edX Course Staff Release
-Notes.
-
-
-*************
-edX Studio
-*************
-
-* This release introduces context-sensitive online help to Studio. You can click
-  **Help** in the upper-right corner to get more information about the
-  Studio page you are viewing. You can also click links that appear in the right
-  panel on some pages.
-
-  .. image:: /images/help.png
-   :alt: Online help links in Studio
-
-  A page in edX's continuously updated documentation that is related to the Studio page you are viewing opens in a new browser tab or window:
-
-  .. image:: /images/help_page.png
-   :alt: A Studio online help page
-
-
-  You can also expand the panel at the bottom of the Studio user interface and
-  use the links to access a PDF file of edX course staff documentation, edX
-  Studio Author Support, and edX101.
-
-  .. image:: /images/sock_help.png
-   :alt: Other help resources at the bottom of the Studio UI
-
-
-* A problem in a small number of XML-authored courses that caused the video
-  transcript download button to not work for students is fixed. If your course
-  was one of the courses affected, you must re-import the course in Studio to
-  enable transcript downloads. (BLD-1014)
-
-* A problem that prevented users with only course staff privileges from
-  importing courses is resolved. (STUD-1595)
-
-
-**************************
-edX Documentation
-**************************
-
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Click the Help buttons in the edX Studio user interface to access relevant sections in this guide. You can also download the entire guide as a PDF.
-
-  Recent changes include: 
-
-  Updated `Working with Video Components`_ to reflect UI changes.
-
-
-* `edX Research Guide`_
-  
-  Recent changes include:
-
-  * Added an `event list`_, an alphabetical list of events with links to the
-    `Tracking Logs`_ chapter.
-  
-  * Updated the `Tracking Logs`_ chapter to provide a standardized structure
-    for delivering information about events and address problems with table
-    formatting.
-  
-
-* `edX Developer's Guide`_
-
-  Recent changes include: 
-
-  Updated the `Analytics`_ section to include information on documenting and
-  debugging events.
-  
-* `edX XBlock Documentation`_
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/06-10-2014.rst b/docs/en_us/release_notes/source/06-10-2014.rst
deleted file mode 100644
index 16ac42cad5..0000000000
--- a/docs/en_us/release_notes/source/06-10-2014.rst
+++ /dev/null
@@ -1,169 +0,0 @@
-###################################
-June 10, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of June 10,
-2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_. 
-
-In addition, you can sign up for the new `edX Release Announcements mailing
-list`_ to get an email message when we have updated the edX Course Staff Release
-Notes.
-
-
-***************************************
-The New Key Introspection API
-***************************************
-
-This release implements a change in the edX Platform software architecture. The
-Key Introspection API is now used to uniquely identify Xblocks, the building
-blocks for edX courses. This change simplifies the way that the application
-identifies the course content internally. This change does not affect how you
-author content.
-
-In edX Studio, URL formats have changed for all courses. If you previously bookmarked a page in Studio, that bookmark will no longer work. You must update the URL. 
-
-Following is a sample of this format change:
-
-* Old URL: ``https://studio.edx.org/course/OrganizationX.Econ101.2014_T1/branch/draft/block/2014_T1``
-
-* New URL: ``https://studio.edx.org/course/slashes:OrganizationX+Econ101+2014_T1``
-  
-This change does not affect student-visible URLs.
-
-In the edX LMS, the only change is that to reset attempts or rescore student
-responses in the **Student Admin** tab on the Instructor Dashboard, you must now
-specify the complete location identifier of the problem. The `Student Grades and
-Grading`_ section is updated with this revised requirement.
-
-For additional technical detail about this architectural change and the opportunities it creates, see `Opaque Keys`_ on the GitHub wiki.
-
-***************************************
-edX Learning Management System
-***************************************
-   
-* A problem with the **Register** button on `edX Edge`_ is fixed. If you are not
-  logged in to edX Edge, you are redirected to the login page, from which new
-  users can register.
-  
-* If a student's browser does not support HTML5 videos, and the course video is
-  only available in HTML5, the following error message is now displayed to the
-  student:  ``This browser cannot play .mp4, .ogg, or .webm files. Try using a
-  different browser, such as Google Chrome.`` (BLD-638)
-
-* Video transcripts are now displayed correctly on iPads. (BLD-1033)
-  
-===========================
-Accessibility Improvements
-===========================
-
-* Drag and drop problems are updated to improve accessibility for screen
-  readers:
-  
-  * User interface elements that receive focus now have a visual focus
-    indicated. (LMS-1940)
-  
-  * Each user interface element now exposes its name, state, role, and value to
-    assistive technologies. (LMS-1904)
-
-  * The target image now has an ``alt`` attribute. (LMS-1699)
-
-
-**************************
-edX Documentation
-**************************
-
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Click **Help** button in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-  Recent changes include: 
-
-  * Added a description of email task workflow states to the `Course Launching
-    Activities`_ section.
-
-  * Added `Review Grades for Enrolled Students (Small Courses)`_ to the `Student
-    Grades and Grading`_ section.
-
-  * Updated `Working with Video Components`_ to include recommendations to use
-    .mp4 and .webm video formats for browser compatibility.
-
-  * Revised the `Student Grades and Grading`_ section based on the new
-    requirement to specify the complete location identifier of a problem to
-    adjust student grades.
-
-  * Updated the `Problem with Adaptive Hint`_ section to reflect formatting
-    requirements for the Python script and the ``correct_answer`` attribute.
-
-  * Reorganized, updated, and streamlined these sections in the `Running Your
-    Course`_ chapter:
-
-    * Divided "Grade and Answer Data" into separate sections for `Student Grades
-      and Grading`_ and `Answer Data`_.
-
-    * Moved information about the student Progress page from the "Checking
-      Student Progress and Issuing Certificates" section to `Student Grades and
-      Grading`_.
-
-    * Renamed the "Checking Student Progress and
-      Issuing Certificates" section to `Assign Final Grades and Issue
-      Certificates`_.
-
-  
-* `Creating Peer Assessments`_
-  
-  This is a new document that covers using Open Response Assessments 2.0.
-
-
-* `edX Research Guide`_
-  
-  Recent changes include:
-
-  Added descriptions of the following events to the `Tracking Logs`_ chapter:
-
-  *  ``edx.course.enrollment.upgrade.clicked``
-  *  ``edx.course.enrollment.upgrade.succeeded``
-  *  ``edx.forum.searched``
-  *  ``load_video``
-  *  ``hide_transcript``
-  *  ``show_transcript``
-  *  ``problem_reset``
-  *  ``problem_graded``
-
-
-* `Installing, Configuring, and Running the edX Platform`_
-  
-  This is a new document that covers installing and running Devstack.
-
-
-* `edX Developer's Guide`_
-
-
-  
-* `edX XBlock Documentation`_
-  
-
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/06-17-2014.rst b/docs/en_us/release_notes/source/06-17-2014.rst
deleted file mode 100644
index d99999946b..0000000000
--- a/docs/en_us/release_notes/source/06-17-2014.rst
+++ /dev/null
@@ -1,96 +0,0 @@
-###################################
-June 17, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of June 17,
-2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_. 
-
-In addition, you can sign up for the `edX Release Announcements mailing
-list`_ to get an email message when we have updated the edX Course Staff Release
-Notes.
-
-
-***************************************
-edX Studio
-***************************************
-
-* For videos, you can now create a transcript file that functions as a table of contents. The file contains links to different parts of the video. (BLD-933)
-
-  .. image:: /images/VideoTOC.png
-     :width: 500
-     :alt: Video with a transcript file that acts as a table of contents
-
-* Course teams can now set the Matlab API key globally in the advanced settings for the course. 
-
-***************************************
-edX Learning Management System
-***************************************
-   
-* Mandarin Chinese has been added as a language option.
-
-* When you search a discussion forum, the search engine now retrieves common misspellings and alternate spellings of the search term. (FOR-591)
-
-* When a course has no content, users who try to access the course see a "No content has been added to this course" message rather than a 404 or 500 error message. 
-  
-* The edX user ID is now included in student profile information. (LMS-2791)
-
-
-**************************
-edX Documentation
-**************************
-
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-  Recent changes include: 
-
-  * Updated `Bulk Email`_ to add information about possible bulk email states and situations in which enrolled students don't receive bulk e-mail. (DOC-362)
-
-  * Added a description of the Student Gradebook, which is available for courses with enrollments of fewer than 200 students, to `Grade and Answer Data`_.
-
-  * Added recommendation to use only .mp4 and .webm video formats to `Working with Video Components`_. 
-
-  * Updated `Working with Video Components`_ with information about adding a transcript that serves as a table of contents for a video.
-
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
- 
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-   Recent changes include:
-
-   * Added the `Installing the edX Production Stack`_ section.
-  
-
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/06-25-2014.rst b/docs/en_us/release_notes/source/06-25-2014.rst
deleted file mode 100644
index ab5a73a36e..0000000000
--- a/docs/en_us/release_notes/source/06-25-2014.rst
+++ /dev/null
@@ -1,81 +0,0 @@
-###################################
-June 25, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of June
-25, 2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we have updated the edX Course Staff Release Notes.
-
-***************************************
-edX Studio
-***************************************
-
-XBlocks that have been accepted into the edX platform can now be added to
-courses as either advanced problems or advanced components. As a result, **Peer
-Assessments** is now listed as a problem type on the **Advanced** tab in a
-Problem component. For more information, see `Creating Peer Assessments`_.
-
-***************************************
-edX Learning Management System
-***************************************
-   
-* In some courses, an error prevented the full output that is available from an
-  external grader for a coding problem from appearing. This error has been
-  corrected. (LMS-2852)
-
-* In Discussions, you can now search by username to access a list of the
-  discussion posts made by another user. (FOR-627)
-  
-.. ? https://github.com/edx/edx-platform/pull/4106 Video: fix seek tracking log
-
-**************************
-edX Documentation
-**************************
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-  * Instructions for adding a table of contents for a video file are now
-    available in the `Video Table of Contents`_ section.  (BLD-933)
-
-  * The example report in the `Download or view student data`_ section now
-    includes the new User ID column.
-       
-* `edX Research Guide`_
-
-* `edX Developer's Guide`_
- 
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-A Preface that identifies resources for course teams,  developers,
-researchers, and students was added to `Building and Running an edX Course`_,
-the `edX Research Guide`_, and the `edX Developer's Guide`_ this week.
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/07-10-2014.rst b/docs/en_us/release_notes/source/07-10-2014.rst
deleted file mode 100644
index fd2c19138f..0000000000
--- a/docs/en_us/release_notes/source/07-10-2014.rst
+++ /dev/null
@@ -1,92 +0,0 @@
-###################################
-July 10, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of July
-10,
-2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we have updated the edX Course Staff Release Notes.
-
-***************************************
-edX Studio
-***************************************
-
-* In some situations, when you changed your browser's language to any language
-  other than English, Studio did not save changes to video URLs in the Video
-  component. This bug has been fixed.
-
-* Every setting on the **Advanced Settings** page now has a user-friendly name
-  and a description.
-
-***************************************
-edX Learning Management System
-***************************************
-   
-* In Internet Explorer, an "Only secure content is displayed" security warning
-  sometimes appeared in courseware. This bug has been fixed. (LMS-2892)
-
-* When you selected a topic for a new post in the discussion forum, topic names
-  in the discussion forum topic list sometimes appeared with unexpected
-  formatting. This bug has been fixed. (FOR-578)
-
-* The Discussions user interface is updated to include labels for pinned and
-  staff-initiated threads in the discussion list, as shown in the following
-  example:
-
-  .. image:: images/discussion_labels.png
-   :alt: Image of discussions with Pinned and By: Staff labels
-
-**************************
-edX Documentation
-**************************
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-  Recent changes include: 
-
-  * Updated `The Course End Date`_ to specify when students can earn and access
-    certificates.
-       
-* `edX Research Guide`_
-
-  Recent changes include: 
-
-  * In the `Tracking Logs`_ chapter, corrected an error in the description of
-    the ``edx.forum.search`` event, updated the ``seek_video`` event, and added
-    the ``stop_video`` event.
-
-  * Added the `Keys and Credentials for Data Transfers`_ chapter.
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/07-21-2014.rst b/docs/en_us/release_notes/source/07-21-2014.rst
deleted file mode 100644
index 445a38f901..0000000000
--- a/docs/en_us/release_notes/source/07-21-2014.rst
+++ /dev/null
@@ -1,95 +0,0 @@
-###################################
-July 21, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of July 21,
-2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we have updated the edX Course Staff Release Notes.
-
-***************************************
-edX Studio
-***************************************
-
-* In edX Studio, URL formats have changed. If you previously bookmarked a page
-  in Studio, that bookmark will no longer work. You must update the URL.
-
-  Following is a sample of this format change:
-
-  * Old URL: ``https://studio.edx.org/unit/location:MITx+7.00x+2013_SOND+vertical+Coming_Soon_Explore_a_Protein``
-
-  * New URL:
-    ``https://studio.edx.org/unit/i4x://MITx/7.00x/vertical/Coming_Soon_Explore_a_Protein``
-  
-  This change does not affect student-visible URLs.
-
-* In open response assessments, instructors can now create assignments that allow students to upload an image file as well as write a text response. For more information, see `Creating Peer Assessments`_.
-
-* In open response assessments, instructors can now create a criterion that includes a field for comments, but no options. For more information, see `Creating Peer Assessments`_.
-
-* In some cases, deleting a unit from a subsection caused server errors. This bug has been fixed. (STUD-1962)
-
-***************************************
-edX Learning Management System
-***************************************
-   
-* The Instructor Dashboard **Analytics** tab now includes the number of students who interacted with the course by visiting pages, playing videos, contributing to discussions, submitting answers to problems, or completing other course activites. The active student count is updated each week.
-
-* Some links on the right side of the course wiki appeared to be disabled. This has been fixed. (LMS-1308)
-
-* Forum posts created by anonymous users appeared with a "by Staff" label. This bug has been fixed. (FOR-156)
-
-* When a student selected **Post anonymously to classmates** check box in the forums, the post appeared as anonymous to both students and staff. This bug has been fixed. (FOR-122)
-
-**************************
-edX Documentation
-**************************
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-  Recent changes include: 
-
-  * The `Running Your Course`_ section now includes a `Participating in Course Discussions`_ chapter that provides information for both students and staff. 
-
-  * The `Discussions`_ chapter has been updated to reflect changes in the UI.
-       
-* `edX Research Guide`_
-
-  Recent changes include: 
-
-  * The `Track Student Activity`_ section has been added to the `Student Data`_ chapter.
-
-* `edX Developer's Guide`_
-
-   * The link to the `Ubuntu installation instructions`_ has been updated.
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/07-23-2014.rst b/docs/en_us/release_notes/source/07-23-2014.rst
deleted file mode 100644
index 294f1ea754..0000000000
--- a/docs/en_us/release_notes/source/07-23-2014.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-###################################
-July 23, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of July 23,
-2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we have updated the edX Course Staff Release Notes.
-
-***************************************
-edX Studio
-***************************************
-
-* On the **Create a New Course** page, additional information in now available below the **Course Name** field. (STUD-2001)
-
-* Instructors can use a new **Invitation Only** advanced setting to limit course enrollment to a specific group. If this setting is set to True, potential students see an "Enrollment in this course is by invitation only" message on the course About page. By default, this setting is set to False. (LMS-2670)
-
-**************************
-edX Documentation
-**************************
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-  Recent changes include: 
-
-  * A set of `example messages to students <http://edx-partner-course-staff.readthedocs.org/en/latest/releasing_course/course_launching.html#example-messages-to-students>`_ is now available in the `Course Launching Activities`_ chapter.
-
-  * A `Grade Ranges and Certificates`_ section is now available in the `Establishing a Grading Policy`_ chapter.
-       
-* `edX Research Guide`_
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/07-30-2014.rst b/docs/en_us/release_notes/source/07-30-2014.rst
deleted file mode 100644
index 4dcc7a8d3f..0000000000
--- a/docs/en_us/release_notes/source/07-30-2014.rst
+++ /dev/null
@@ -1,93 +0,0 @@
-###################################
-July 30, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of July 30,
-2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we have updated the edX Course Staff Release Notes.
-
-***************************************
-edX Studio
-***************************************
-
-* In some versions of Internet Explorer, users could not edit plain HTML in HTML components. This problem has been fixed.
-
-* Problem components have a new **Correct or Past Due** setting. With this setting, course staff can configure a problem so that students can only see the answer if they have answered the problem correctly or the problem's due date has passed.
-
-***************************************
-edX Website
-***************************************
-
-* On the edX.org sign-up page, the **Public Username** field is now above the **Password** field. 
-
-* In the student dashboard, the appearance of the user profile area in the left pane has changed.
-
-  Former user profile area:
-
-  .. image:: /images/StDash_Old.png
-     :width: 350
-     :alt: User profile in the old student dashboard
-
-  Current user profile area:
-
-  .. image:: /images/StDash_New.png
-     :width: 350
-     :alt: User profile in the new student dashboard
-
-
-**************************
-Coming Soon
-**************************
-
-We're pleased to announce two upcoming features that will release in the next few weeks:
-
-* In Studio, new capabilities will make it easier for course authors to edit
-  and publish content. We've simplified the publishing workflow and added clear
-  indications to the UI so you'll know at a glance whether your content is
-  published and released--and whether students can see it.
-
-* In addition to the existing Discussion post type, course discussions will
-  soon include a new Question post type. Students and course teams will also be
-  able to filter posts by unanswered questions.
-
-**************************
-edX Documentation
-**************************
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-       
-* `edX Research Guide`_
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/08-07-2014.rst b/docs/en_us/release_notes/source/08-07-2014.rst
deleted file mode 100644
index 7d243d11dc..0000000000
--- a/docs/en_us/release_notes/source/08-07-2014.rst
+++ /dev/null
@@ -1,113 +0,0 @@
-###################################
-August 7, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of August
-7, 2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we have updated the edX Course Staff Release Notes.
-
-***************************************
-edX Studio
-***************************************
-
-* When you add an Advanced component to a unit in Studio, an identifying name
-  for every available component is now included in the list of **Advanced
-  Components**. If the component does not have a defined display name, its
-  category name appears on this list. Previously, components that did not have
-  a display name did not appear as an option in the list.
-
-*******************************
-edX Learning Management System
-*******************************
-
-* On the Instructor Dashboard, the **Course Info** page now includes the number
-  of students who selected each certification track (Verified, Honor, or Audit)
-  in addition to the total number of enrollees in the course.
-
-* For email messages sent from the Instructor Dashboard, two additional
-  features are available.
-
-  * On the **Email** page, you can now click **Sent Email History** to see a
-    list of sent messages, and click on a message subject to review its
-    complete text.
-
-  * When you review a previously sent message, the new **Copy Email to Editor**
-    option duplicates the title and body of that message so that you can use it
-    as the basis for a new message.
-
-**************************
-edX Data & Analytics
-**************************
-
-* Daily event tracking data files are now available for download from the
-  Amazon S3 storage service. Weekly, cumulative event logs will remain
-  available for several weeks.
-
-* A defect that caused session ID values to be duplicated for certain events
-  has been fixed. All browser events, and server enrollment events, include a
-  value for the session. (AN-2369)
-
-**************************
-Coming Soon
-**************************
-
-We're pleased to announce two upcoming features that will release in the next
-few weeks:
-
-* In Studio, new capabilities will make it easier for course authors to edit
-  and publish content. We've simplified the publishing workflow and added clear
-  indications to the UI so you'll know at a glance whether your content is
-  published and released--and whether students can see it.
-
-* In addition to the existing Discussion post type, course discussions will
-  soon include a new Question post type. Students and course teams will also be
-  able to filter posts to find unanswered questions easily.
-
-**************************
-edX Documentation
-**************************
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-       
-* `edX Research Guide`_
-
-  Recent changes include: 
-
-  The new `Data Delivered in Data Packages`_ chapter describes the compressed
-  and encrypted data files that make up a data package, the locations of those
-  files on the Amazon S3 storage service, and the files that data czars extract
-  from the packages after download.
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/08-12-2014.rst b/docs/en_us/release_notes/source/08-12-2014.rst
deleted file mode 100644
index 3666a5da24..0000000000
--- a/docs/en_us/release_notes/source/08-12-2014.rst
+++ /dev/null
@@ -1,145 +0,0 @@
-###################################
-August 12, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of August
-12, 2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we update the edX Course Staff Release Notes.
-
-***************************************
-edX Studio
-***************************************
-
-* This release includes a redesigned user experience for publishing. 
-  
-  *  The process for creating, releasing, and updating content has been
-     streamlined and simplified.
-
-     .. image:: images/techdocworkflows(v2)_New-workflow.png
-       :alt: Flowchart showing the process of creating a unit on the Course Outline page, adding components on the Unit page, and then publishing the content. Modifications made on a Unit page can be published immediately.
-
-  *  Visual cues are now present on the **Course Outline** page and on
-     individual unit pages to indicate whether your content is published and
-     whether students can see it.
-  
-      .. image:: images/PubChange_NewOutline.png
-        :alt: The Course Outline page with release dates indicated and callouts for the "Settings" icons that allows you to change it
-
-  *  You can select the **Hide from students** check box on a unit page at any
-     time to immediately remove that unit from student view.
-  
-      .. image:: images/Hide_from_Students.png
-        :alt: The unit page indicating the new check box on the right side of the page
-
-  For more details and a comparison between the new publishing workflow and the
-  previous workflow, see our most recent `edX Product and Engineering
-  Newsletter`_.
-
-* A graphical user interface is now available for creating and maintaining open
-  response assessment problems. 
-
-  You now define the open response assessment rubric in the following page:
-
-  .. image:: images/PeerRubricGUI.png
-   :alt: The Open Response Assessment editor Rubric tab
-
-  You now define settings for the open response assessment in the following page:
-  
-  .. image:: images/PeerAssessmentSettingsGUI.png
-   :alt: The Open Response Assessment editor Settings tab
-
-
-* A new setting, **Enable video caching system**, is now available on the
-  **Advanced Settings** page. When set to true (the default), HTML5 videos use
-  video caching. (BLD-1207)
-
-*******************************
-edX Learning Management System
-*******************************
-
-* When course discussions are closed, the **New Post** button is no longer
-  included in discussion components. (FOR-108)
-
-* When an incomplete course URL was entered in a browser, the error page that
-  displayed included incorrect information. This defect has been corrected.
-  (LMS-11189, LMS-11205)
-
-**************************
-Coming Soon
-**************************
-
-We're pleased to announce these upcoming changes, which will release in the
-next few weeks:
-
-* In addition to the existing Discussion post type, course discussions will
-  soon include a new Question post type. Students and course teams will also be
-  able to filter posts to find unanswered questions easily.
-
-* A new user experience design for course discussions is coming! The new user
-  interface controls will provide consistent methods for taking action on
-  posts. A set of colorful badges will also make it easier to identify posts.
-
-* A new bulk publishing feature will soon be available to enhance the changes
-  that you see to the publishing workflow today. With bulk publishing, the
-  process of releasing your course content to students will be significantly
-  streamlined.
-
-
-**************************
-edX Documentation
-**************************
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-  Recent changes include: 
-
-  A new section, `Developing Your Course`_, that provides documentation on
-  using the new publishing workflow and the enhanced outline and unit pages.
-  These enhancements resulted in extensive changes to the organization and
-  content of this guide.
-
-* `Creating Peer Assessments`_
-
-  Recent changes include: 
-  
-  The `Create an Open Response Assessment Assignment`_ chapter has been
-  completely revised to document the work you do in Studio to create and test
-  this assignment type.
-       
-* `edX Research Guide`_
-
-.. Recent changes include: 
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/08-28-2014.rst b/docs/en_us/release_notes/source/08-28-2014.rst
deleted file mode 100644
index 778f6b87bb..0000000000
--- a/docs/en_us/release_notes/source/08-28-2014.rst
+++ /dev/null
@@ -1,163 +0,0 @@
-###################################
-August 28, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of August
-28, 2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we update the edX Course Staff Release Notes.
-
-***************************************
-edX Studio
-***************************************
-
-* This release further expands the recently redesigned Studio publishing
-  process. These features are available on the **Course Outline** page.
-
-  * You can now publish all unpublished content in an entire section or
-    subsection in a single step: on the **Course Outline** page, click the
-    "Publish" icon.
-
-     .. image:: images/outline-publish-icons.png
-       :alt: The Course Outline page showing an expanded section and subsection
-           with a unit that contains unpublished content.
-
-    The "Publish" icon is also available for individual units on the **Course
-    Outline** page.
-
-  * You can now hide all of the content in an entire section or subsection on
-    the **Course Outline** page. To ensure that students cannot see a part of
-    the course, select the "Settings" icon and in the dialog that opens select
-    **Hide from students**. The same feature is available for individual units.
-  
-  For more details, see our most recent `edX Product and Engineering
-  Newsletter`_.
-
-* You can now build content experiments (also known as A/B tests or split
-  tests) entirely within edX Studio.  With a content experiment, you show
-  different course content to different groups of students. Research teams can
-  compare the performance of students in different groups to gain insights into
-  the relative effectiveness of course content.
-
-* A defect in the drag and drop feature for course content on the **Course
-  Outline** page has been fixed. Dropping a unit into a collapsed subsection
-  now adds the unit without changing any existing content in that subsection.
-  (TNL-56)
-
-*******************************
-edX Learning Management System
-*******************************
-
-* When you click **Sent Email History** on the Instructor Dashboard **Email**
-  page, a new **Sent By** column in the list of messages identifies the sender
-  of each message.
-  
-* The Instructor Dashboard no longer displays instructions for accessing the
-  older version of the dashboard. However, users can still select **Revert to
-  Legacy Dashboard** to access the older version.
-  
-* The computations for demographic distributions that are reported on the
-  **Analytics** page of the Instructor Dashboard have been updated. The level
-  of education and gender distributions are now computed for currently enrolled
-  students only. Previously, these distributions were computed for all students
-  who were ever enrolled in the course. (LMS-11228)
-
-.. * Bulk email now available for all courses? Instructor Dashboard, Email page
-
-.. **************************
-.. edX Data & Analytics
-.. ************************** 
-
-**************************
-Coming Soon
-**************************
-
-We're pleased to announce these changes, which will be released in the next few
-weeks:
-
-* In addition to the existing Discussion post type, course discussions will
-  soon include a new Question post type. Students and course teams will also be
-  able to filter posts to find unanswered questions easily.
-  
-* A new design for course discussions is coming! New controls will provide
-  consistent ways to take action on posts. Additionally, a set of colorful
-  badges will make identifying posts easier.
-  
-* To make the process of registering faster and easier, students will soon be
-  able to both register and log in to the edX.org and edX Edge web sites with
-  their existing Google or Facebook accounts.
-
-**************************
-edX Documentation
-**************************
-
-All guides now include a section that lists browsers supported for use with the
-edX platform.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Update your bookmarks and links! To prepare for some upcoming additions to
-  the edX documentation set, we recently changed the location of this guide
-  and its URL changed as a result. You can always find `Building and Running an
-  edX Course`_  and the rest of our documentation set at `docs.edx.org`_.
-
-  You can also click **Help** in the upper-right corner of any page in the edX
-  Studio user interface to access relevant sections in this guide, and download
-  the entire guide as a PDF as needed.
-
-  Recent changes include: 
-
-  * The `Developing Your Course`_ chapter has been updated to include the new
-    capabilities for publishing and hiding multiple units on the **Course
-    Outline** page.
-
-  * A new `Add Content Experiments to Your Course`_ chapter is now available.
-
-  * An additional sample email message for students, announcing a new run of a
-    course, is now available. See `New Course Run Announcement`_.
-
-  * Messages about the effect of changes to the grading policy, graded
-    subsections, or graded components in a live course are now included in
-    relevant sections throughout the guide.
-
-* `Creating Peer Assessments`_
-
-* `edX Research Guide`_
-
-   Recent changes include: 
-
-   * The `Tracking Logs`_ chapter now includes a section that describes open
-     response assessment events.
-
-   * The "Course Grading" and "XML format of drag and drop input" chapters were
-     removed. These topics are covered in the `Building and Running an edX
-     Course`_  guide.
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/09-04-2014.rst b/docs/en_us/release_notes/source/09-04-2014.rst
deleted file mode 100644
index 69d88e6e58..0000000000
--- a/docs/en_us/release_notes/source/09-04-2014.rst
+++ /dev/null
@@ -1,115 +0,0 @@
-###################################
-September 4, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of September 4,
-2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we update the edX Course Staff Release Notes.
-
-***************************************
-edX Website
-***************************************
-
-* Users who signed up for a verified course sometimes saw an incorrect 
-  price. This bug has been fixed. (ECOM-113)
-
-* A problem with auto-registration sometimes prevented verified courses from 
-  appearing on a user's dashboard. This bug has been fixed. (ECOM-199) 
-
-*******************************
-edX Learning Management System
-*******************************
-
-* This release includes changes that improve student and staff experiences with
-  course discussions. These new features take effect immediately in all courses.
-
-  * When a discussion participant adds a post, the participant must now identify the post as
-    either asking a question or starting a discussion.
-
-  * Controls for actions that discussion participants can take on posts, responses, 
-    and comments have moved to the top right of each contribution. 
-
-  * Informational labels such as "Staff" and "Following" have been redesigned and relocated.
-
-  For more details, see our `End of August Product Announcement`_.
-
-* Students can now submit their usernames and email addresses to a third party
-  by using an LTI interface. (BLD-1250)
-
-* The bulk email feature is now available for all Studio-backed courses on the `edx.org`_ site. 
-  With this feature, you can send email messages to course participants directly from 
-  the Instructor Dashboard before, during, and after the course run. For more information, 
-  see `Bulk Email`_ and `Example Messages to Students`_.
-
-
-**************************
-Coming Soon
-**************************
-
-We're pleased to announce the following change, which will be released in the next few
-weeks:
-
-* Course teams will soon be able to access data about their courses on a
-  dedicated dashboard for course-specific data. By providing insights into who
-  your students are, and what they do while interacting with your course, the
-  data available on this dashboard can validate choices you’ve made, reveal
-  unexpected patterns, and inform plans for changes to the course.
-
-
-**************************
-edX Documentation
-**************************
-
-All guides now include a section that lists browsers supported for use with the
-edX platform.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-  Recent changes include: 
-
-  * The `Discussions`_ and `Participating in Course
-    Discussions`_ chapters now include the question post type and the new placement and
-    appearance of the actions you can take on posts, responses, and comments.
-
-* `Creating Peer Assessments`_
-
-* `edX Research Guide`_
-
-   Recent changes include: 
-
-   * The `Discussion Forums Data`_ chapter now includes the new ``thread_type``
-     field for CommentThreads and the new ``endorsed`` field for Comments.
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/09-09-2014.rst b/docs/en_us/release_notes/source/09-09-2014.rst
deleted file mode 100644
index 0594b483e8..0000000000
--- a/docs/en_us/release_notes/source/09-09-2014.rst
+++ /dev/null
@@ -1,106 +0,0 @@
-###################################
-September 9, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of
-September 9,
-2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we update the edX Course Staff Release Notes.
-
-
-***************************************
-edX Website
-***************************************
-
-* To make accessing edX courses faster and easier, students can now both
-  register and log in to edX.org and edX Edge with their existing Google or
-  Facebook accounts.
-
-  .. image:: images/login-auth.png
-   :alt: The login screen, with Google and Facebook login buttons
-
-*******************************
-edX Learning Management System
-*******************************
-
-* The styling of LTI components is updated to better show links to external
-  resources, as shown in the following example:
-
-  .. image:: images/LTI-link.png
-   :alt: The external resource link in an LTI component
-
-
-* When a user flagged a post in a closed discussion thread, an error message
-  was displayed. This problem is now fixed. (TNL-151)
-
-* When submitting a numerical answer in Internet Explorer 9, students received
-  a warning message that MathJax could not be read. This problem is now fixed.
-  (BLD-1199)
-
-*******************************
-edX Studio
-*******************************
-
-* When you import a course, a progress bar now shows the import progress.
-  (STUD-2017)
-
-**************************
-Coming Soon
-**************************
-
-We're pleased to announce the following upcoming change:
-
-* Course teams will soon be able to access data about their courses on a
-  dedicated dashboard for course-specific data. By providing insights into who
-  your students are, and what they do while interacting with your course, the
-  data available on this dashboard can validate choices you’ve made, reveal
-  unexpected patterns, and inform plans for changes to the course.
-
-
-**************************
-edX Documentation
-**************************
-
-All guides now include a section that lists browsers supported for use with the
-edX platform.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-
-* `Creating Peer Assessments`_
-
-* `edX Research Guide`_
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/09-18-2014.rst b/docs/en_us/release_notes/source/09-18-2014.rst
deleted file mode 100644
index 2fe737c5f6..0000000000
--- a/docs/en_us/release_notes/source/09-18-2014.rst
+++ /dev/null
@@ -1,92 +0,0 @@
-###################################
-September 18, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of
-September 18, 2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we update the edX Course Staff Release Notes.
-
-
-*******************************
-edX Learning Management System
-*******************************
-
-* On the **Discussions** tab, an error message sometimes appeared when you clicked through the thread list quickly. This bug has been fixed. 
-
-* A "Page Not Found" error that could occur in some circumstances has been fixed. Previously, if a student closed the browser window after viewing a course section, and the course team later made that section unavailable, the error could occur when the student returned to the course section. (LMS-6492) 
-
-* If a student changed the playback speed of a video in Firefox, the video did not play. This bug has been fixed. (BLD-1221)
-
-* To help course teams protect video assets, the edX video player now hides video URLs from students by default. This functionality is now in effect for all video files, including those that are not hosted on YouTube. Students can still download videos if you have selected the **Video Download Allowed** option for your Video components. (TNL-302)
-
-
-*******************************
-edX Studio
-*******************************
-
-* The **Adding Files for Your Course** page now includes a recommendation to limit the size of individual files to 10 MB.
-
-* After you added a private YouTube video to your course, the video controls for later videos did not appear in Studio or in the LMS. This bug has been fixed. (TNL-184)
-
-**************************
-Coming Soon
-**************************
-
-We're pleased to announce the following upcoming changes:
-
-* Course teams will soon be able to access data about their courses on a
-  dedicated dashboard for course-specific data. By providing insights into who
-  your students are, and what they do while interacting with your course, the
-  data available on this dashboard can validate choices you’ve made, reveal
-  unexpected patterns, and inform plans for changes to the course.
-
-* EdX will soon release a fully supported cohorts feature that allows course teams and TAs to assign students to different cohorts in class discussions. Students in different cohorts will be able to see the discussions for their individual cohorts, but cannot see discussions for other cohorts. Course teams can also open some course discussions to all students.
-
-
-**************************
-edX Documentation
-**************************
-
-All guides now include a section that lists browsers supported for use with the
-edX platform.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-
-* `Creating Peer Assessments`_
-
-* `edX Research Guide`_
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/09-25-2014.rst b/docs/en_us/release_notes/source/09-25-2014.rst
deleted file mode 100644
index dfe053b926..0000000000
--- a/docs/en_us/release_notes/source/09-25-2014.rst
+++ /dev/null
@@ -1,93 +0,0 @@
-###################################
-September 25, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of
-September 25, 2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we update the edX Course Staff Release Notes.
-
-
-*******************************
-edX Learning Management System
-*******************************
-
-* An issue in which the `char` function caused some MATLAB problems to become
-  unresponsive has been fixed. (TNL-388)
-
-* Answers to a text input problem with a long input string did not render
-  properly. This issue is fixed. (TNL-441)
-
-* Python-evaluated input problems can now give partial, or decimal, grades for
-  submissions. (TNL-198)
-
-* Full screen image components did not render correctly in Chrome. This issue
-  is fixed. (TNL-265)
-
-
-
-**************************
-Coming Soon
-**************************
-
-We're pleased to announce the following upcoming changes:
-
-* Course teams will soon be able to access data about their courses on a
-  dedicated dashboard for course-specific data. By providing insights into who
-  your students are, and what they do while interacting with your course, the
-  data available on this dashboard can validate choices you’ve made, reveal
-  unexpected patterns, and inform plans for changes to the course.
-
-* EdX will soon release a fully supported cohorts feature that allows course
-  teams and TAs to assign students to different cohorts in class discussions.
-  Students in different cohorts will be able to see the discussions for their
-  individual cohorts, but cannot see discussions for other cohorts. Course
-  teams can also open some course discussions to all students.
-
-
-**************************
-edX Documentation
-**************************
-
-All guides now include a section that lists browsers supported for use with the
-edX platform.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-
-* `Creating Peer Assessments`_
-
-* `edX Research Guide`_
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/09-30-2014.rst b/docs/en_us/release_notes/source/09-30-2014.rst
deleted file mode 100644
index 332e52cd57..0000000000
--- a/docs/en_us/release_notes/source/09-30-2014.rst
+++ /dev/null
@@ -1,102 +0,0 @@
-###################################
-September 30, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of
-September 30, 2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we update the edX Course Staff Release Notes.
-
-*******************************
-edX Insights
-*******************************
-
-The initial version of edX Insights, our new course analytics product, is now
-available. In this release, edX Insights provides data for student enrollment
-activity, geographic location, and engagement with course content.
-
-Team members who have the Instructor or Course Staff role can open edX Insights
-from the Instructor Dashboard. A banner announcing this new product displays at
-the top of every page: click the **visit edX Insights** link to view data about
-your course.
-
-EdX Insights uses visualizations, key metrics, and tables to present data about
-who your students are and what they do while interacting with your course. 
-
-For example, the Weekly Student Engagement chart displays the number of
-students who engaged in different activities over time.
-
-.. image:: images/Engagement_Chart.png
-   :alt: A line graph with three lines showing ongoing, differing levels of
-         student activity of any kind, students who watched a video, and
-         students who tried a problem.
-
-To report where your students are, edX Insights shows a color-coded map.
-
-.. image:: images/Geography.png
-   :alt: A world map; countries with darker shading have a higher number of 
-         students than those with lighter shading.
-
-You can use the data that is available from edX Insights to monitor activity,
-validate choices, reveal unexpected patterns, form hypotheses, and inform plans
-for your course. For information about edX Insights, see `Using edX Insights`_.
-
-**************************
-Coming Soon
-**************************
-
-We're pleased to announce the following upcoming changes:
-
-* EdX will soon release a fully supported cohorts feature that allows course
-  teams and TAs to assign students to different cohorts in class discussions.
-  Students in different cohorts will be able to see the discussions for their
-  individual cohorts, but cannot see discussions for other cohorts. Course
-  teams can also open some course discussions to all students.
-
-**************************
-edX Documentation
-**************************
-
-All guides now include a section that lists browsers supported for use with the
-edX platform.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-* `Using edX Insights`_
-
-* `Creating Peer Assessments`_
-
-* `edX Research Guide`_
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/10-07-2014.rst b/docs/en_us/release_notes/source/10-07-2014.rst
deleted file mode 100644
index 0440030a3c..0000000000
--- a/docs/en_us/release_notes/source/10-07-2014.rst
+++ /dev/null
@@ -1,158 +0,0 @@
-###################################
-October 7, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of
-October 7, 2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we update the edX Course Staff Release Notes.
-
-
-*******************************
-edX Learning Management System
-*******************************
-
-* The private discussion cohorts feature has been released! When this optional
-  feature is enabled for a course, the course team defines smaller communities
-  of students within the larger, course-wide community. This feature allows
-  course teams to divide students into cohort groups using either distinctive
-  group characteristics or automated, random assignments. When the cohorts
-  feature is enabled for a course, most discussion topics are divided so that
-  students can only read and contribute to posts made by other members of the
-  same cohort. However, course teams can create some open, or unified,
-  discussion topics so that all students can read and contribute to that topic.
-  Additionally, if the cohorts feature is enabled for the course, the CSV file
-  that contains student profile data now includes a **Cohort** column.
-
-  If you want to use the cohorts feature in your course, we strongly recommend
-  that you implement the feature before your course is released. We do not
-  recommend enabling cohorts in a running course.
-
-  For more information, see `Cohorts`_.
-
-* In the Instructor Dashboard, downloading student profile data is now a
-  background task. You can leave the **Data Download** page after you
-  begin downloading students' profile information and return when the download
-  is complete. Additionally, the **Download profile information as a CSV**
-  button and the **List enrolled students' profile information** button have
-  been moved to the **Reports** section of the **Data Download** page. (TNL-453)
-
-* Course discussions have several new features:
-
-  * Students can now change the topic of a post after they post it. Discussion
-    administrators, moderators, and community TAs can edit the topic for any
-    post.
-
-  * Users no longer have the option to add comments to closed threads. (TNL-150)
-
-  * When a user selects a topic for a post, a link to the unit that contains
-    that discussion topic in the body of the course now appears immediately when the
-    post is created. (TNL-404)
-
-  * Users who have the discussion admin role can now remove their
-    own or other users' discussion admin status. (TNL-315)
-
-  * For some users, a list of posts did not appear in the left sidebar when
-    the user clicked **Posts I'm Following**. This bug has been fixed. (TNL-469)
-
-  * Pinned posts now always appear at the top of the list of posts, regardless
-    of the way that the posts are sorted. (TNL-90)
-
-* In some browsers, if a student clicked a word in a transcript to move to that
-  point in the video, the video began playing from the correct point, but the
-  transcript stopped following along with the video. This bug has been fixed.
-  (TNL-235)
-
-*************
-edX Studio
-*************
-
-* In HTML text components, the default font now appears as an option in the
-  **Font** menu. (TNL-147)
-
-  .. image:: /images/HTMLDefaultFont.png
-    :width: 300
-    :alt: HTML component editor with Font menu open to show Default option
-
-* When a Problem component contained a custom JavaScript display and grading (JS
-  Input) problem and at least one other problem, the JS Input problem was scored
-  incorrectly. The additional problem in the component could be any type of
-  problem. These problems are now scored correctly. (TNL-269)
-
-* When you exported a course, the setting for **Video Download Allowed** in a
-  Video component changed from **False** to **True** in the exported course.
-  This bug has been fixed. (TNL-324)
-
-**************************
-edX Documentation
-**************************
-
-All guides now include a section that lists browsers supported for use with the
-edX platform.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-  Recent changes include:
-
-  * Full documentation for the new cohorts feature is available in `Cohorts`_.
-
-  * Documentation for a new `molecule viewer tool` has been added to `Creating
-    Exercises and Tools`_.
-
-    .. image:: /images/MoleculeViewer.png
-       :width: 500
-       :alt: Image of molecule viewer tool showing a ciprofloxacin molecule
-
-* `Using edX Insights`_
-
-* `EdX Guide for Students`_
-
-  This new guide is written specifically to help students get started with edX.
-  This initial release of the guide includes information about certificates,
-  entering formulas into the response field for math and science problems, and
-  open response assessments. We encourage course teams to share this guide with
-  students and to let us know what else you'd like the guide to cover.
-
-* `Creating Peer Assessments`_
-
-* `edX Research Guide`_
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-* `edX Open Learning XML Guide`_
-
-  The edX Open Learning XML (OLX) Guide is a new manual for course teams who are
-  working with XML courses. We'll release updates to this preliminary version of
-  the guide over the next several months. For more information, see `Open
-  Learning XML (OLX) Format`_.
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/10-16-2014.rst b/docs/en_us/release_notes/source/10-16-2014.rst
deleted file mode 100644
index 5b4fa6c278..0000000000
--- a/docs/en_us/release_notes/source/10-16-2014.rst
+++ /dev/null
@@ -1,116 +0,0 @@
-###################################
-October 16, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of
-October 15, 2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we update the edX Course Staff Release Notes.
-
-*******************************
-edX Website
-*******************************
-
-* The student dashboard now lists courses sorted by when the student enrolled,
-  with the most recent enrollments first. (ECOM-418)
-
-* Students now receive a success message in the dashboard when they enroll in a
-  course. (ECOM-403)
-
-*******************************
-edX Discussions
-*******************************
-
-* Forum moderators can now change the type of a discussion from a question to a
-  post, and vice versa. Students can also change the type of discussion for
-  their own posts. (TNL-172)
-
-* The default type for a new discussion is now a post. Previously, the default
-  was a question.
-
-*************
-edX Studio
-*************
-
-* The format to set dates in the Advanced Settings for discussion blackouts is
-  clarified on the page. You must enter dates as **YYYY-MM-DD**. To include the
-  time, you enter **YYYY-MM-DDTHH:MM**. Be sure to enter the **T** between the
-  date and time.
-
-* The date and time on the **Schedule and Details** page are now shown as
-  Universal Coordinated Times (UTC). (TNL-85)
-
-**************************
-edX Documentation
-**************************
-
-All guides now include a section that lists browsers supported for use with the
-edX platform.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-  Recent changes include:
-
-  * Documentation for the Vital Source E-Reader tool was removed as it is no
-    longer supported in the edX Platform.
-
-* `Using edX Insights`_
-
-* `EdX Guide for Students`_
-
-* `Creating Peer Assessments`_
-
-* `edX Research Guide`_
-  
-  Recent changes include:
-
-  * Added new student and instructor events relating to cohort use to the
-    `Tracking Logs`_ chapter.
-
-  * Added new event member fields for data emitted from mobile devices to the
-    video events in the `Tracking Logs`_ chapter. 
-
-  * Removed information about XML course formats. See the `edX Open Learning
-    XML Guide`_ for information about building XML courses.
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-* `edX Open Learning XML Guide`_
-  
-  Recent changes include:
-
-  * Added alpha documentation for the `Graphical Slider Tool`_ and `Symbolic
-    Response`_ to the `Problems and Tools`_ section.
-
-
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/10-23-2013.rst b/docs/en_us/release_notes/source/10-23-2013.rst
deleted file mode 100644
index f346a97c6b..0000000000
--- a/docs/en_us/release_notes/source/10-23-2013.rst
+++ /dev/null
@@ -1,166 +0,0 @@
-###################################
-October 23, 2013
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
-.. include:: links.rst
-
-*************
-edX Studio
-*************
-
-=============
-New Features
-=============
-
-* **Improved import experience** (STUD-595)
-
-  When you import a course, the Import screen now provides real-time status updates. The Import screen tells you when the import is in the
-  following stages:
-  * Uploading
-  * Unpacking
-  * Verifying
-  * Updated Course
-  * Success (Complete)
-
-* **Improved drag and drop experience in course outlines** (STUD-575)
-
-  The ability to drag and drop sections, subsections, and units in the course outline is enhanced in the following ways:
-
-  * The visual representation of where you are moving the course element to is improved, with a pointer and blue line indicating the
-    new position.
-
-  * You can more easily drag units from one subsection to another.
-
-  * When you cancel a drop, the course element returns to its original position.
-
-  * You can no longer drag a course element below the New Unit button, which was causing confusion. 
-
-* **Text customization capability**
-
-  You can now customize some of the UI text that your students see. You do this through the text_customization key in the Advanced
-  Settings for the course. (However, edX recommends that you contact your Program Manager before you modify the text_customization key.) 
-
-* **JavaScript loading performance**
-
-  JavaScript loading is changed in ways that should improve the performance on some pages.
-  Code contributors should note that JavaScript is now loaded through require.js.
-
-
-
-==========================
-Changes and Updates
-==========================
-
-The following changes are included in this release: 
-
-* In a course outline, you can no longer drag and drop a unit below the New Unit button. (STUD-152)
- 
-* Course update content outside of HTML tags is no longer erroneously removed.(STUD-590)
- 
-* In a course outline, dragging a unit over the Units label no longer causes the unit to be removed. (STUD-755)
- 
-* Support text in the Assignment Types section of the Grading page is updated to clarify that you enter an integer, not a percent, in the W
-  eight of Total Grade field. (STUD-771)
- 
-* Certain component errors no longer prevent the course from saving correctly. (STUD-786)
- 
-* When you delete a Discussion component, the discussion is completely removed from the course. (STUD-811, STUD-817) 
-
-* When you are editing a course update, the update no longer disappears if you click outside of the Edit window. (STUD-822)
- 
-* When you enter the integer 7 in the Total Weight of Grade field, the value is no longer changed to a decimal. (STUD-826)
-
-
-***************************************
-edX Learning Management System 
-***************************************
-
-=============
-New Features
-=============
-
-The following changes are included in this release: 
-
-* **Fixed views in Internet Explorer 9.x**
-
-  Problems with pages in Internet Explorer 9.x are resolved.
-
-* **Disabled downloading data for large courses**
-
-  For courses with over 200 students, downloading large data sets could fail. The Download Data button on the Instructor Dashboard is now
-  temporarily disabled to avoid this problem. 
-
-* **Improved Beta Instructor Dashboard**
-
-  You can access the Beta Instructor Dashboard from the current Instructor Dashboard by clicking Try the New Beta Dashboard. The Beta
-  version continued so evolve with a streamlined design and improved architecture. Both dashboards are currently available.
-
-* **Improved video and transcript experience** (BLD-420)
-
-  When you are playing a video with the transcript hidden, you can display the transcript by hovering the mouse pointer over the CC button. 
-  You can then click a paragraph in the displayed transcript to move to that point in the video. When you move the pointer off the CC button,
-  the transcript is hidden.
-
-* **Improved Learning Tools Interoperability (LTI)** (BLD-330, BLD-347)
-  
-  You can now use multiple LTI tools per page. You can also have an LTI module load external content in a new window.
-
-
-==========================
-Changes and Updates
-==========================
-
-* The link to open and close the calculator has additional aria attributes for accessibility. (BLD-164)
- 
-* The Hints panel for the calculator is now accessible to screen readers. (BLD-165)
- 
-* Students can now download video subtitles. (BLD-245)
- 
-* Multi-speed video playback now works in Firefox browsers as expected. (BLD-287)
- 
-* Window resizing no longer cuts off videos. (BLD-289)
- 
-* Video HD control is now handicap accessible. (BLD-387)
- 
-* You can now export courses that have LTI modules. (BLD-389)
- 
-* A malformed custom parameter in an LTI component no longer permanently breaks the unit. (BLD-390)
- 
-* The styles and text for the download links for videos and transcripts are updated for clarity and accessibility. (BLD-403)
- 
-* The CC button in the video player now includes explanatory text that is accessible with a screen reader. (BLD-404)
- 
-* LTI with the Piazza platform now works as expected. (BLD-405)
- 
-* The **Close** button on dialog boxes is now defined as an HTML button and is accessible to screen readers. (LMS-582)
-
-
-******************
-Discussion Forums
-******************
-
-The following changes are included in this release: 
-
-* The color contrast of the Report Misuse link is updated for accessibility. (FOR-200)
- 
-* The Report Misuse link now includes a tooltip that is accessible to screen readers. (FOR-201)
- 
-* The Report Misuse link is now included in the page tab order, for keyboard accessibility. (FOR-209)
diff --git a/docs/en_us/release_notes/source/10-23-2014.rst b/docs/en_us/release_notes/source/10-23-2014.rst
deleted file mode 100644
index a9144e9262..0000000000
--- a/docs/en_us/release_notes/source/10-23-2014.rst
+++ /dev/null
@@ -1,122 +0,0 @@
-###################################
-October 23, 2014
-###################################
-
-The following information reflects what is new in the edX Platform as of
-October 23, 2014. See previous pages in this document for a history of changes.
-
-****************************************
-edX Release Announcements Mailing List
-****************************************
-
-These edX Course Staff Release Notes are always available and are updated with
-each release of the edX Platform on `edx.org`_ and `edX Edge`_.
-
-You can also sign up for the `edX Release Announcements mailing list`_ to get
-an email message when we update the edX Course Staff Release Notes.
-
-*******************************
-edX Website
-*******************************
-
-Visitors to the `edx.org`_ website can now search for courses by name, school,
-or subject. Search results can be further refined by selecting course
-availability (for example, Current, Starting Soon, Archived) and type (for
-example, Verified, High School, Professional Education).
-
-*******************************
-edX Course Discussion
-*******************************
-
-* When you enter a search term on the **Discussion** page, the search starts
-  either when you click the magnifying glass icon or press the Enter key.
-  Previously, only use of the Enter key started the search. (TNL-526)
-
-* After you mark a response to a question post as the correct answer, a message
-  that describes this action is added to the response. The hyperlinked username
-  in this message now correctly opens a new page showing your contributions to
-  the course discussion. (TNL-188)
-
-*************
-edX Studio
-*************
-
-* The protein builder tool now correctly uses font sizing set by user browser
-  preferences. (TNL-256)
-  
-**************************
-edX Data & Analytics
-**************************
-
-* For compatibility with database import tools, a field in the ``child_render``
-  event was renamed. The ``event`` member field is now named ``child_id``
-  instead of ``child-id``.
-
-**************************
-edX Documentation
-**************************
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_
-
-  Click **Help** in the upper-right corner of any page in the edX Studio
-  user interface to access relevant sections in this guide. You can also
-  download the entire guide as a PDF.
-
-  Recent changes include:
-
-  Course authors can set both a course-wide **Maximum Attempts** value for
-  all problem components and a **Maximum Attempts** value for each problem
-  component added to the course. The interaction between these settings has
-  been clarified.
-
-* `Using edX Insights`_
-
-* `EdX Guide for Students`_
-
-* `Creating Peer Assessments`_
-
-* `edX Research Guide`_
-  
-  Recent changes include:
-
-  Instructions for downloading the weekly tracking event log file have been
-  removed. These log files are now available only daily.
-
-* `edX Developer's Guide`_
-
-* `edX XBlock Documentation`_
-
-* `Installing, Configuring, and Running the edX Platform`_  
-
-* `edX Open Learning XML Guide`_
-  
-  Recent changes include:
-
-  * Additional explanation in the `Problems and Tools`_ section.
-  * Reorganization of the `Problems and Tools`_ and `Course Components
-    (XBlocks)`_ sections.
-  * Clarifications to how an OLX course is organized in the `OLX Course
-    Structure`_ section.
-  * Updates to the descriptions for embedding content in container objects for
-    HTML, video, and discussion components in the `Course Components
-    (XBlocks)`_ section.
-.. comment for spacing only 
-
-* `edX Platform API Version 0.5`_
-
-  Alpha documentation for the edX platform API is now available.
-
-**************************
-Other edX Resources
-**************************
-
-You can access the `edX Status`_ page to get an up-to-date status for all
-services on edx.org and edX Edge. The page also includes the Twitter feed for
-@edXstatus, which the edX Operations team uses to post updates.
-
-You can access the public `edX roadmap`_ for details about the currently
-planned product direction.
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/10-29-2013.rst b/docs/en_us/release_notes/source/10-29-2013.rst
deleted file mode 100644
index 6143aa6661..0000000000
--- a/docs/en_us/release_notes/source/10-29-2013.rst
+++ /dev/null
@@ -1,111 +0,0 @@
-.. _October 29 2013:
-
-###################################
-October 29, 2013
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
-.. include:: links.rst
-
-*************
-edX Studio
-*************
-
-=============
-New Features
-=============
-
-* **New video editing interface, enabling an enhanced workflow for adding timed transcripts to videos** (BLD-238)
-
-  When you enter a video URL in the Editing: Video dialog box, the system checks if a timed transcript for that video exists on edX, and if
-  so, automatically associates the transcript with the video. If no transcript is found, you click Upload New Timed Transcript to locate and
-  upload the .SRT file for the transcript. 
-
-  When there is an associated timed transcript, you can click Download to Edit to download a local copy of the .SRT file. You can then
-  modify the transcript and upload the new file.
-
-  For YouTube videos, you can also import a timed transcript from YouTube, overwriting the version of the transcript on edX with the version
-  from YouTube.
-
-  Backwards compatibility with the other transcript workflow is maintained with a tabbed interface.
-
-====================================================
-Known Issues and Workarounds
-====================================================
-
-* **Uploading a large number of files** (STUD-813, STUD-837)
-
- When you go to the Files & Uploads page, if your course has a large number of files, the Files & Uploads page can time out before it lists
- all the files. The page becomes unresponsive, and you cannot upload more files.
-
- **Workaround**: To upload new files files when the Files & Uploads page is timing out, limit the number of files that appear on the Files &
- Uploads page by adding start and max parameters to the URL. For example, you can append the following parameters to the URL in your
- browser:
- `https://studio.edge.edx.org/assets/organization.course-number.course-name/branch/block/course-name?start=5&max=15`
-
- This example tells the page to load a maximum of 10 files, starting with the 6th file. You can use other values as needed, as long as the list
- is not so long that the page does not load successfully. Note that file counts begin at 0, not 1, and that files are listed chronologically, with
- the most recent first.
-
-
-
-
-
-==========================
-Changes and Updates
-==========================
-
-The following changes are included in this release: 
-
-* Because Course IDs are not case sensitive, all Course IDs must be unique regardless of capitalization. For example, you cannot have
-  both edX101 and EdX101 as course IDs. (STUD-873)
-
-
-***************************************
-edX Learning Management System 
-***************************************
-
-
-The following changes are included in this release: 
-
-* The cheatsheet available when you are adding a new Wiki article is now accessible to screen readers. (LMS-1303)
- 
-* In the Wiki, active links are now displayed as bold, and have additional text labels, to be accessible to screen readers. (LMS-1306)
- 
-* In the Wiki, when you navigate through links with the Tab key, the active link is updated in the same was as when you hover over it with
-  the mouse pointer. (LMS-1336)
- 
-* Default Wiki permissions are updated so that only course staff can delete Wiki pages. (LMS-1355)
- 
-* The Reset Password and Password Reset Confirmation pages are updated to use styles consistent with the system. (LMS-1357)
- 
-* In certain situations, students received a 500 error when viewing the Progress page. This problem was resolved in a patch on October 23, 2013. (LMS-1367)
- 
-* A visual indicator has been added to the video player to indicate which part of the video will play, when it is not the default. (BLD-391)
- 
-* Forum views are updated to improve performance. (FOR-250)
-
-******************
-Analytics 
-******************
-
-The following changes are included in this release: 
-
-* Course exports are included with weekly data dumps delivered to university data representatives. (AN-57)
diff --git a/docs/en_us/release_notes/source/11-06-2013.rst b/docs/en_us/release_notes/source/11-06-2013.rst
deleted file mode 100644
index 763b79be64..0000000000
--- a/docs/en_us/release_notes/source/11-06-2013.rst
+++ /dev/null
@@ -1,132 +0,0 @@
-###################################
-November 6, 2013
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
-.. include:: links.rst
-
-*************
-edX Studio
-*************
-
-=============
-New Features
-=============
-
-* **Improved Course Export page**
-  
-  The Course Export page has a new layout, with enhanced help text.
-
-==========================
-Changes and Updates
-==========================
-
-The following changes are included in this release: 
-
-* The Forgot Password link on the Studio Sign In page now works correctly. (STUD-689)
-
-* In the Create a New Course page Organization field, text now suggests the generic UniversityX, instead of MITx. (STUD-885)
-
-* The Create a New Course page Course Run field, text now suggests the using the year and trimester (for example, 2014_T1), instead
-  of the year and season. (STUD-916)
-
-* Studio now continues working correctly when a YouTube video in the page fails to load. (STUD-472)
- 
-* To avoid potential problems with browser security, you can no longer enter video URLs with http://. You must use https://. (BLD-408)
-
-* By default, the options to add a Problem Written in LaTex and a Problem with Adaptive Hint in Latex are no longer included in the
-  Advanced tab of the Problems component. In addition, the option to add E-text Written in LaTeX is no longer included in the HTML component.
-
-  To enable these options, open the Advanced Settings page and set the value of the use_latex_compiler policy key to true. (BLD-426)
-
-==========================
-Technical Changes
-==========================
-
-Contributors to the open source edX Platform should note the following change:
-
-The Course Export page is updated to use a RESTFul interface. (STUD-846)
-
-***************************************
-edX Learning Management System 
-***************************************
-==========================
-New Features
-==========================
-
-* **Upgrading the Course Track**
-
-  A student in the Honor Code or Audit track can now upgrade to the Verified Certificate track. (LMS-1127)
-  
-==========================
-Changes and Updates
-==========================
-
-The following changes are included in this release: 
-
-* After registering for a course, a student could use the browser's Back button to return to the Registration page and change the
-  registration type. Now, if the user tries to go back to the Registration page, the Learning Management System redirects the student to the
-  courseware, where the student must unregister first to change the course mode. (LMS-1062)
- 
-* When a student fails verification for the Verified track, the Learning Management System now notifies the user through the Student
-  Dashboard, and prompts them to retry. The student must send another set of photos, but does not have to pay again. If the student does
-  not retry, they can get a refund. (LMS-1133)
-
-* In the Beta Instructor Dashboard, the layout is improved and the Pending Instructor Tasks section now functions correctly. (LMS-1242)
- 
-* You can now tab through the Wiki pages without getting stuck in the content area. (LMS-1307)
- 
-* Default settings now include the generic email address @example.com instead of @edx.org. (LMS-1363)
- 
-* The user experience and help text during course registration and upgrading are enhanced, and the last day to register for verified certificates is more clear. (LMS-1384)
- 
-* Keyboard navigation is now updated in the Wiki to skip repetitive content, allowing users to go directly to unique content on a page. (LMS-1387)
- 
-* Errors that prevented the Progress page from successfully loading are fixed. (LMS-1388)
- 
-* In the Sign Up page, the Public Display Name field was renamed to Public Username. (LMS-1393)
- 
-* Errors when creating a new account are resolved. (LMS-1418)
- 
-* A typo was removed from the course registration email template. (LMS-1419)
- 
-* The Saving a Word Cloud component generated an error message. This problem no longer occurs. (BLD-205)
- 
-* When viewing a video, if a student clicked on the video timeline before or after the specified end time, the video jumped to the beginning. This problem is resolved. (BLD-392)
- 
-* Students can now change the video speed when the video is paused. (BLD-424)
- 
-* Several problems with the video player are resolved:
-  * The Start time did not work in Flash mode.
-  * Students could not change the speed before the video started.
-  * The end point in the video slider was inaccurate for short videos.
-  * The video slider showed the incorrect position after the video stopped. (BLD-468)
- 
-* Sorting of the forums thread list now works correctly when a topic is selected from the drop-down menu. (FOR-224)
- 
-* Forum follow buttons are now accessible to screen readers, have the ARIA checkbox role, and activate with the space or Enter key.(FOR-240)
-
-******************
-Analytics 
-******************
-
-The following changes are included in this release: 
-
-* The user_id field is added to tracking events. (AN-213)
diff --git a/docs/en_us/release_notes/source/12-03-2013.rst b/docs/en_us/release_notes/source/12-03-2013.rst
deleted file mode 100644
index eb7d05f281..0000000000
--- a/docs/en_us/release_notes/source/12-03-2013.rst
+++ /dev/null
@@ -1,76 +0,0 @@
-###################################
-December 3, 2013
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
-.. include:: links.rst
-
-*************
-edX Studio
-*************
-
-
-The following Studio changes are included in this release: 
-
-* As part of a database architecture change and the implementation of a RESTful interface, URLs in Studio are changing to use a new
-  period-separated locator syntax. This change currently affects a subset of pages in Studio. In future releases, the other pages in Studio
-  will be changed to use the new URL syntax. 
-
-* Video transcripts now load correctly even if any part of https is in capital letters. (BLD-496)
- 
-* The Problem component now includes a template for creating checkbox problems. (BLD-193)
- 
-* In Internet Explorer 9, Save notifications now appear correctly when a user locks or unlocks assets. (STUD-815)
-
-
-
-*******************************
-edX Learning Management System
-*******************************
-
-
-
-The following changes are included in this release: 
-
-* Discrepancies in how the number of enrolled students were calculated in the Instructor Dashboard and the Beta Instructor Dashboard are
-  fixed. Now, in all cases, the number represents the currently enrolled students. (AN-115) 
- 
-* Incorrect student responses to problems are now saved after the student clicks Check. (LMS-469)
- 
-* JavaScript errors are now fixed in the Reset Password pages. (LMS-1265)
-  The Wiki Changes page is now accessible to screen readers. (LMS-1309)
- 
-* Course staff can now set granular permissions for Wiki articles. In the main Wiki page, you can click Settings to see and set
-  permissions. (LMS-1355)
- 
-* In the Instructor Dashboard, the Edit Course in Studio link now correctly opens the course in Studio. (LMS-1455)
- 
-* Taking a photograph for a verified certificate now works correctly. (LMS-1487)
-  
-* Links within videos no longer have a white background or obscure part of the video content. (BLD-521)
- 
-* In checkbox problems, using bold and italics no longer causes display problems. (BLD-449)
- 
-* The speed change option now works correctly in all video configurations. (BLD-457)
- 
-* A spinning icon now shows users with slow connections when a video is loading. (BLD-502)
-
-* In the Forums, an AJAX request that results in a 500 error now informs the user to try again, instead of silently timing out. (FOR-37)
-
diff --git a/docs/en_us/release_notes/source/12-09-2013.rst b/docs/en_us/release_notes/source/12-09-2013.rst
deleted file mode 100644
index 4cb12ffe4d..0000000000
--- a/docs/en_us/release_notes/source/12-09-2013.rst
+++ /dev/null
@@ -1,77 +0,0 @@
-###################################
-December 9, 2013
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
-.. include:: links.rst
-
-*************
-edX Studio
-*************
-
-* You can now allow multiple strings as correct answers to text response problems. (BLD-474)
-
-The following changes are included in this release: 
-
-* If you entered invalid HTML in the Course Handouts, you were not able to edit the Course Handouts to fix the HTML. This problem is resolved (STUD-293)
-
-* When you created a new video, you received a 500 error and could not import a timed transcript. This problem is resolved. (BLD-530)
-
-* In Internet Explorer 9.x, when you locked and unlocked assets, the Save notification was not displayed. This problem is resolved. (STUD-815)
-
-* In Firefox, when viewing a unit, you could not select and copy the unit identifier. This problem is resolved. (STUD-863)
-
-* When you viewed problems within Studio, italics did not render properly. This problem is resolved. (STUD-963)
-
-
-***************************************
-edX Learning Management System 
-***************************************
-
-
-The following changes are included in this release: 
-
-* All dialog boxes in the Wiki are now fully accessible to screen readers. (LMS-1337)
-
-* The reset password function allowed others to determine valid usersnames. This problem is resolved. [DETAILS] (LMS-1507)
-
-* If a user registered for a verified certificate, then switched to audit the course, the student
-  remained listed as signed up for a verified certificate. This problem is resolved. (LMS-1526)
-  
-* In code response questions, the button to hide the output is now shown for each test case, so students do
-  not need to scroll through all test cases to get to the button to hide all output. (BLD-126)
-  
-* The calculator tooltips now show all options for inputing numbers. (BLD-400)
-
-* The video player now alerts screen readers when the video is over. (BLD-488)
-
-* Numerical input problems now support mathematical operations. (BLD-525)
-
-* The calculator tooltips are now fully accessible to screen readers. (BLD-533)
-
-******************
-Discussion Forums
-******************
-
-The following changes are included in this release: 
-
-* An update to enhance accessibility was made so that when users load additional forum threads,
-  focus remains on the loading element. (FOR-238)
-
diff --git a/docs/en_us/release_notes/source/12-17-2013.rst b/docs/en_us/release_notes/source/12-17-2013.rst
deleted file mode 100644
index 6642cce62e..0000000000
--- a/docs/en_us/release_notes/source/12-17-2013.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-###################################
-December 18, 2013
-###################################
-
-**************************
-edX Documentation
-**************************
-
-You can access the public `edX roadmap`_ for
-details about the currently planned product direction.
-
-The following documentation is available:
-
-* `Building and Running an edX Course`_ 
-
-  You can also download the guide as a PDF from the edX Studio user interface.
-
-* `edX Research Guide`_
-
-
-* `edX Developer's Guide`_
-
-.. include:: links.rst
-
-*************
-edX Studio
-*************
-
-The following changes are included in this release: 
-
-* The Terms of Service are now available from a link in edX Studio. (STUD-151)
-* When a course export fails due to a problem in the course XML, an error message is now displayed that points you to the source of the problem. (STUD-1013)
-* Studio Dashboard performance on Edge is improved. (STUD-1039)
-* In the Video component editor Advanced tab, the **Clear** button next the the **HTML 5 Transcript** field, shown below, now correctly removes the transcript. (BLD-438)
-
-  .. image::  images/Video_Advanced_tab.png
-    :alt: The Advanced tab of the Video component editor
-
-
-* The Drag and Drop problem template, available in the Advanced list when you are creating a new problem, is updated to demonstrate the updated drag and drop functionality. (BLD-479)
-* You can now rearrange LTI components as expected. (BLD-543) 
-
-
-
-***************************************
-edX Learning Management System 
-***************************************
-
-
-The following changes are included in this release: 
-
-* Grade reports in .csv files that you download form the Instructor Dashboard can now handle Unicode characters. (LMS-197)
-* For courses using OpenID, the user's Full Name is now returned in the Full Name field, not the username. (LMS-750)
-* A problem that prevented the listing of course staff in the Instructor Dashboard is fixed. (LMS-1599)
-* Image mapping problems now work correctly in Internet Explorer. (BLD-413)
-* A problem that sometimes prevented students from opening an e-reader in another browser window is resolved. (BLD-465)
-
-
-******************
-Discussion Forums
-******************
-
-The following changes are included in this release: 
-
-* The text formatting buttons in the forum post editor are now keyboard accessible. 
-  Students and staff can tab through the buttons and activate a button with the Enter or space key.
diff --git a/docs/en_us/release_notes/source/browsers.rst b/docs/en_us/release_notes/source/browsers.rst
deleted file mode 100644
index c98836b8f7..0000000000
--- a/docs/en_us/release_notes/source/browsers.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../shared/browsers.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/conf.py b/docs/en_us/release_notes/source/conf.py
deleted file mode 100644
index 9a4f4c1e17..0000000000
--- a/docs/en_us/release_notes/source/conf.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-import sys, os
-
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-sys.path.append(os.path.abspath('../../../../'))
-sys.path.append(os.path.abspath('../../../'))
-
-from docs.shared.conf import *
-
-sys.path.insert(0, os.path.abspath('.'))
-
-master_doc = 'index'
-
-# Add any paths that contain templates here, relative to this directory.
-#templates_path.append('source/_templates')
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path.append('source/_static')
-
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-# General information about the project.
-project = u'edX Course Staff Release Notes'
-copyright = u'2014, edX'
-
-# The short X.Y version.
-version = ''
-# The full version, including alpha/beta/rc tags.
-release = ''
diff --git a/docs/en_us/release_notes/source/images/Engagement_Chart.png b/docs/en_us/release_notes/source/images/Engagement_Chart.png
deleted file mode 100644
index 706e7dc4e2..0000000000
Binary files a/docs/en_us/release_notes/source/images/Engagement_Chart.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/Geography.png b/docs/en_us/release_notes/source/images/Geography.png
deleted file mode 100644
index a59816b704..0000000000
Binary files a/docs/en_us/release_notes/source/images/Geography.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/HTMLDefaultFont.png b/docs/en_us/release_notes/source/images/HTMLDefaultFont.png
deleted file mode 100644
index 3f7c3d783c..0000000000
Binary files a/docs/en_us/release_notes/source/images/HTMLDefaultFont.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/HTMLEditor.png b/docs/en_us/release_notes/source/images/HTMLEditor.png
deleted file mode 100644
index 5865825f8a..0000000000
Binary files a/docs/en_us/release_notes/source/images/HTMLEditor.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/Hide_from_Students.png b/docs/en_us/release_notes/source/images/Hide_from_Students.png
deleted file mode 100644
index c144f2ea1c..0000000000
Binary files a/docs/en_us/release_notes/source/images/Hide_from_Students.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/LTI-link.png b/docs/en_us/release_notes/source/images/LTI-link.png
deleted file mode 100644
index eb389aeb4b..0000000000
Binary files a/docs/en_us/release_notes/source/images/LTI-link.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/Live_Course_Staff_View.png b/docs/en_us/release_notes/source/images/Live_Course_Staff_View.png
deleted file mode 100644
index 870c7a4c70..0000000000
Binary files a/docs/en_us/release_notes/source/images/Live_Course_Staff_View.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/MoleculeViewer.png b/docs/en_us/release_notes/source/images/MoleculeViewer.png
deleted file mode 100644
index 438a7be033..0000000000
Binary files a/docs/en_us/release_notes/source/images/MoleculeViewer.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/PeerAssessmentSettingsGUI.png b/docs/en_us/release_notes/source/images/PeerAssessmentSettingsGUI.png
deleted file mode 100644
index f0dee79830..0000000000
Binary files a/docs/en_us/release_notes/source/images/PeerAssessmentSettingsGUI.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/PeerRubricGUI.png b/docs/en_us/release_notes/source/images/PeerRubricGUI.png
deleted file mode 100644
index 453d1ac01c..0000000000
Binary files a/docs/en_us/release_notes/source/images/PeerRubricGUI.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/PubChange_NewOutline.png b/docs/en_us/release_notes/source/images/PubChange_NewOutline.png
deleted file mode 100644
index 19b5d05db1..0000000000
Binary files a/docs/en_us/release_notes/source/images/PubChange_NewOutline.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/StDash_New.png b/docs/en_us/release_notes/source/images/StDash_New.png
deleted file mode 100644
index 0eca6f9d88..0000000000
Binary files a/docs/en_us/release_notes/source/images/StDash_New.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/StDash_Old.png b/docs/en_us/release_notes/source/images/StDash_Old.png
deleted file mode 100644
index 32bb0b9506..0000000000
Binary files a/docs/en_us/release_notes/source/images/StDash_Old.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/VideoTOC.png b/docs/en_us/release_notes/source/images/VideoTOC.png
deleted file mode 100644
index cd84a20e66..0000000000
Binary files a/docs/en_us/release_notes/source/images/VideoTOC.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/Video_Advanced_tab.png b/docs/en_us/release_notes/source/images/Video_Advanced_tab.png
deleted file mode 100644
index e9e6aeda90..0000000000
Binary files a/docs/en_us/release_notes/source/images/Video_Advanced_tab.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/course_outline.png b/docs/en_us/release_notes/source/images/course_outline.png
deleted file mode 100644
index f08682918e..0000000000
Binary files a/docs/en_us/release_notes/source/images/course_outline.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/discussion_labels.png b/docs/en_us/release_notes/source/images/discussion_labels.png
deleted file mode 100644
index 4d44adb02b..0000000000
Binary files a/docs/en_us/release_notes/source/images/discussion_labels.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/help.png b/docs/en_us/release_notes/source/images/help.png
deleted file mode 100644
index 8d016c72bd..0000000000
Binary files a/docs/en_us/release_notes/source/images/help.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/help_page.png b/docs/en_us/release_notes/source/images/help_page.png
deleted file mode 100644
index 983a746347..0000000000
Binary files a/docs/en_us/release_notes/source/images/help_page.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/login-auth.png b/docs/en_us/release_notes/source/images/login-auth.png
deleted file mode 100644
index 22ca60e9df..0000000000
Binary files a/docs/en_us/release_notes/source/images/login-auth.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/outline-publish-icons.png b/docs/en_us/release_notes/source/images/outline-publish-icons.png
deleted file mode 100644
index 1a520a8353..0000000000
Binary files a/docs/en_us/release_notes/source/images/outline-publish-icons.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/sock_help.png b/docs/en_us/release_notes/source/images/sock_help.png
deleted file mode 100644
index 40f5a6869c..0000000000
Binary files a/docs/en_us/release_notes/source/images/sock_help.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/techdocworkflows(v2)_New-workflow.png b/docs/en_us/release_notes/source/images/techdocworkflows(v2)_New-workflow.png
deleted file mode 100644
index 9d0d5bc954..0000000000
Binary files a/docs/en_us/release_notes/source/images/techdocworkflows(v2)_New-workflow.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/transcript-download.png b/docs/en_us/release_notes/source/images/transcript-download.png
deleted file mode 100644
index 8a0d391574..0000000000
Binary files a/docs/en_us/release_notes/source/images/transcript-download.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/images/upload_handout_video.png b/docs/en_us/release_notes/source/images/upload_handout_video.png
deleted file mode 100644
index a0c993b140..0000000000
Binary files a/docs/en_us/release_notes/source/images/upload_handout_video.png and /dev/null differ
diff --git a/docs/en_us/release_notes/source/index.rst b/docs/en_us/release_notes/source/index.rst
deleted file mode 100755
index 2057813d76..0000000000
--- a/docs/en_us/release_notes/source/index.rst
+++ /dev/null
@@ -1,88 +0,0 @@
-.. Getting_Started documentation master file, created by
-   sphinx-quickstart on Tue Apr 16 11:19:12 2013.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-####################################
-edX Course Staff Release Notes
-####################################
-
-The *edX Course Staff Release Notes* provide a cumulative list of changes that
-affect the use of edX Studio, the edX Learning Management System, and edX
-Insights.
-
-This document contains a page for each update to the edX system, which includes
-both `edx.org`_ and `edX Edge`_. Each page contains information on new or
-changed documentation, as well as new features and changes in edX Studio, the
-edX Learning Management System, edX Insights, Course Discussions, Analytics,
-accessibility, and more.
-
-You can sign up for the `edX Release Announcements mailing list`_ to get an
-email message each time we update the edX Course Staff Release Notes.
-
-
-
-*************
-2014
-*************
-
-.. toctree::
-   :maxdepth: 1
-
-   read_me
-   preface
-   browsers
-   10-23-2014
-   10-16-2014
-   10-07-2014
-   09-30-2014
-   09-25-2014
-   09-18-2014
-   09-09-2014
-   09-04-2014
-   08-28-2014
-   08-12-2014
-   08-07-2014
-   07-30-2014
-   07-23-2014
-   07-21-2014
-   07-10-2014
-   06-25-2014
-   06-17-2014
-   06-10-2014
-   05-20-2014
-   05-15-2014
-   05-12-2014
-   04-29-2014
-   04-23-2014
-   04-16-2014
-   04-09-2014
-   04-02-2014
-   03-26-2014
-   03-18-2014
-   03-11-2014
-   03-04-2014
-   02-26-2014
-   02-19-2014
-   02-12-2014
-   02-05-2014
-   01-29-2014
-   01-16-2014
-   01-07-2014
-
-*************
-2013
-*************
-
-.. toctree::
-   :maxdepth: 1
-
-   12-17-2013
-   12-09-2013
-   12-03-2013
-   11-06-2013
-   10-29-2013
-   10-23-2013
-
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/latex/Makefile b/docs/en_us/release_notes/source/latex/Makefile
deleted file mode 100644
index 6b87ad8814..0000000000
--- a/docs/en_us/release_notes/source/latex/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# Makefile for Sphinx LaTeX output
-
-ALLDOCS = $(basename $(wildcard *.tex))
-ALLPDF = $(addsuffix .pdf,$(ALLDOCS))
-ALLDVI = $(addsuffix .dvi,$(ALLDOCS))
-
-# Prefix for archive names
-ARCHIVEPRREFIX =
-# Additional LaTeX options
-LATEXOPTS =
-
-all: $(ALLPDF)
-all-pdf: $(ALLPDF)
-all-dvi: $(ALLDVI)
-all-ps: all-dvi
-	for f in *.dvi; do dvips $$f; done
-
-all-pdf-ja:
-	for f in *.pdf *.png *.gif *.jpg *.jpeg; do extractbb $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	-for f in *.idx; do mendex -U -f -d "`basename $$f .idx`.dic" -s python.ist $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.dvi; do dvipdfmx $$f; done
-
-zip: all-$(FMT)
-	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
-	cp $(ALLPDF) $(ARCHIVEPREFIX)docs-$(FMT)
-	zip -q -r -9 $(ARCHIVEPREFIX)docs-$(FMT).zip $(ARCHIVEPREFIX)docs-$(FMT)
-	rm -r $(ARCHIVEPREFIX)docs-$(FMT)
-
-tar: all-$(FMT)
-	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
-	cp $(ALLPDF) $(ARCHIVEPREFIX)docs-$(FMT)
-	tar cf $(ARCHIVEPREFIX)docs-$(FMT).tar $(ARCHIVEPREFIX)docs-$(FMT)
-	rm -r $(ARCHIVEPREFIX)docs-$(FMT)
-
-bz2: tar
-	bzip2 -9 -k $(ARCHIVEPREFIX)docs-$(FMT).tar
-
-# The number of LaTeX runs is quite conservative, but I don't expect it
-# to get run often, so the little extra time won't hurt.
-%.dvi: %.tex
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-	-makeindex -s python.ist '$(basename $<).idx'
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-
-%.pdf: %.tex
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-	-makeindex -s python.ist '$(basename $<).idx'
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-
-clean:
-	rm -f *.dvi *.log *.ind *.aux *.toc *.syn *.idx *.out *.ilg *.pla
-
-.PHONY: all all-pdf all-dvi all-ps clean
-.PHONY: all-pdf-ja
-
diff --git a/docs/en_us/release_notes/source/links.rst b/docs/en_us/release_notes/source/links.rst
deleted file mode 100644
index bec681212b..0000000000
--- a/docs/en_us/release_notes/source/links.rst
+++ /dev/null
@@ -1,272 +0,0 @@
-
-.. Links
-
-.. _Open Learning XML (OLX) Format: http://engineering.edx.org/2014/10/open-learning-xml-olx-format/
-
-.. _edX Open Learning XML Guide: http://edx-open-learning-xml.readthedocs.org/en/latest/index.html
-
-.. OLX Guide Links
-
-.. _Graphical Slider Tool: http://edx-open-learning-xml.readthedocs.org/en/latest/problem-xml/graphical_slider_tool.html#graphical-slider-tool
-
-.. _Symbolic Response: http://edx-open-learning-xml.readthedocs.org/en/latest/problem-xml/symbolic_response.html#symbolic-response
-
-.. _molecule viewer tool: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/molecule_viewer.html
-
-.. _Problems and Tools:  http://edx-open-learning-xml.readthedocs.org/en/latest/problem-xml/index.html
-
-.. _OLX Course Structure: http://edx-open-learning-xml.readthedocs.org/en/latest/directory-structure.html#odl-directory-structure
-
-.. _Course Components (XBlocks): http://edx-open-learning-xml.readthedocs.org/en/latest/components/index.html
-
-.. Student-facing doc links
-
-.. _EdX Guide for Students: http://edx-guide-for-students.readthedocs.org/en/latest/
-
-
-.. Platform API guide links
-
-.. _edX Platform API Version 0.5: http://edx-platform-api.readthedocs.org/en/latest/index.html
-
-.. other links not yet categorized carefully
-
-.. _Cohorts: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/cohorts/index.html
-
-.. _Creating Exercises and Tools: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/index.html
-
-
-.. _edX Product and Engineering Newsletter: http://us5.campaign-archive2.com/?u=1822a33c054dc20e223ca40e2&id=090cb3ea4c&e=4a41f5542a
-
-.. _End of August Product Announcement: http://us5.campaign-archive1.com/?u=1822a33c054dc20e223ca40e2&id=2f58184233
-
-.. _edX Release Announcements mailing list: http://eepurl.com/U84tj
-
-.. _edX Edge: https://edge.edx.org
-
-.. _edx.org: http://edx.org
-
-.. _Sphinx: http://sphinx-doc.org/
-.. _LaTeX: http://www.latex-project.org/
-.. _GitHub Flow: https://github.com/blog/1557-github-flow-in-the-browser
-.. _RST: http://docutils.sourceforge.net/rst.html
-
-.. _edX Status: http://status.edx.org/
-
-.. _docs.edx.org: http://docs.edx.org
-
-.. _edX roadmap: https://openedx.atlassian.net/wiki/display/PROD/Product+Roadmap
-
-.. _Building and Running an edX Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/
-
-
-.. _Using edX Insights: http://edx-insights.readthedocs.org/en/latest/
-
-.. _Installing, Configuring, and Running the edX Platform: http://edx.readthedocs.org/projects/edx-installing-configuring-and-running/en/latest/
-
-.. _Installing the edX Production Stack: http://edx.readthedocs.org/projects/edx-installing-configuring-and-running/en/latest/prodstack/install_prodstack.html
-
-.. _Creating Peer Assessments: http://edx.readthedocs.org/projects/edx-open-response-assessments/en/latest/
-
-.. _edX Research Guide: http://edx.readthedocs.org/projects/devdata/en/latest/
-
-.. _Data Delivered in Data Packages: http://edx.readthedocs.org/projects/devdata/en/latest/internal_data_formats/package.html
-
-.. _edX Developer's Guide: http://edx.readthedocs.org/projects/userdocs/en/latest/
-
-.. _Keys and Credentials for Data Transfers: http://edx.readthedocs.org/projects/devdata/en/latest/internal_data_formats/credentials.html
-
-.. _Testing Your Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/developing_course/testing_courseware.html
-
-.. _Switch Between Studio and Your Live Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/developing_course/testing_courseware.html#view-your-live-course
-
-.. _Transcripts in Additional Languages: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/creating_content/create_video.html#transcripts-in-additional-languages
-
-.. _Working with Video Components: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/creating_content/create_video.html
-
-.. _Bulk Email: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/releasing_course/course_launching.html#bulk-email
-
-.. _Example Messages to Students: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/releasing_course/course_launching.html#example-messages-to-students
-
-.. _Enrollment: http://ca.readthedocs.org/en/latest/running_course/course_enrollment.html#enrollment
-
-.. _Shuffle Answers in a Multiple Choice Problem: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/multiple_choice.html#shuffle-answers-in-a-multiple-choice-problem
-
-.. _Targeted Feedback in a Multiple Choice Problem: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/multiple_choice.html#targeted-feedback-in-a-multiple-choice-problem
-
-.. _Answer Pools in a Multiple Choice Problem: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/multiple_choice.html#answer-pools-in-a-multiple-choice-problem
-
-.. _Grade and Answer Data: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/course_grades.html#grades
-
-.. _Multiple Choice: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/multiple_choice.html
-
-.. _Course Data: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/course_data.html#course-data
-
-.. _Staffing: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/course_staffing.html#course-staffing
-
-.. _Working with HTML Components: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/creating_content/create_html_component.html
-
-.. _Custom JavaScript Applications: http://edx.readthedocs.org/projects/userdocs/en/latest/extending_platform/javascript.html
-
-.. _Go to Studio from Your Live Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/developing_course/testing_courseware.html#open-studio-from-your-live-course
-
-.. _Student Answer Distribution: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/course_grades.html#review-answers
-
-.. _Releasing Your Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/releasing_course/index.html
-
-.. _Course Launching Activities: http://ca.readthedocs.org/en/latest/releasing_course/course_launching.html#launch
-
-.. _Adding Pages to a Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/building_course/pages.html
-
-.. _Show or Hide the Course Wiki Page: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/building_course/pages.html#show-or-hide-the-course-wiki-page
-
-.. _Creating Course Content: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/en/latest/creating_content/index.html
-
-.. _Beta Testing a Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/releasing_course/beta_testing.html#beta-testing
-
-.. _Student Data: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/course_student.html#student-data
-
-.. _Track Student Activity: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/course_student.html#track-student-activity
-
-.. _Add the Beta Testers: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/releasing_course/beta_testing.html#add-testers
-
-.. _Getting Started: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/getting_started/index.html#getting-started-index
-
-.. _Building a Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/building_course/index.html
-
-
-.. _Running Your Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/index.html
-
-.. _Information for Your Students: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/students/index.html#information-for-your-students-index
-
-.. _The Course Start Date: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/building_course/setting_up_student_view.html#the-course-start-date
-
-.. _The Course End Date: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/building_course/setting_up_student_view.html#the-course-end-date
-
-.. _Add a Course Image: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/building_course/setting_up_student_view.html#add-a-course-image
-
-.. _Add a Course Introduction Video: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/building_course/setting_up_student_view.html#add-a-course-video
-
-.. _Describe Your Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/building_course/setting_up_student_view.html#describe-your-course
-
-.. _Create or Obtain a Video Transcript: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/creating_content/create_video.html#create-transcript
-
-.. _Staff Debug Info: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/releasing_course/staff_debug_info.html
-
-.. _Add Files to a Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/building_course/course_files.html
-
-.. _Import LaTeX Code into an HTML Component: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/creating_content/create_html_component.html#import-latex-code
-
-.. _Establishing a Grading Policy: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/building_course/establish_grading_policy.html
-
-.. _Grade Ranges and Certificates: http://edx-partner-course-staff.readthedocs.org/en/latest/building_course/establish_grading_policy.html#grade-ranges-and-certificates
-
-.. _Additional transcripts: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/creating_content/create_video.html#additional-transcripts
-
-.. _Staffing data: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/course_staffing.html
-
-.. _Enrollment data: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/course_enrollment.html
-
-.. _Gene Explorer: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/gene_explorer.html
-
-.. _Problem Written in LaTeX: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/problem_in_latex.html
-
-.. _Working with Problem Components: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/creating_content/create_problem.html
-
-.. _Set the Advertised Start Date: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/building_course/setting_up_student_view.html#set-the-advertised-start-date
-
-.. _Full Screen Image: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/full_screen_image.html
-
-.. _Google Instant Hangout Tool: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/google_hangouts.html
-
-.. _Multiple Choice and Numerical Input Problem: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/mult_choice_num_input.html
-
-.. _Components: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/developing_course/course_components.html
-
-.. _Discussions: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/discussions.html
-
-.. _Participating in Course Discussions: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/discussions_students.html
-
-.. _Guidance for Discussion Moderators: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/discussion_guidance_moderators.html
-
-.. _External Graders: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/external_graders.html
-
-.. _duplicating components: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/developing_course/course_components.html#duplicate-a-component
-
-.. _Video Advanced Options: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/creating_content/create_video.html#advanced-options
-
-.. _Organizaing Your Course Content: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/developing_course/workflow.html
-
-.. _Custom JavaScript Problem: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/custom_javascript.html
-
-.. _Zooming Image Tool: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/zooming_image.html
-
-.. _IFrame Tool: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/iframe.html
-
-.. _Drag and Drop Problem: http://ca.readthedocs.org/en/latest/exercises_tools/drag_and_drop.html
-
-
-.. _Assign Discussion Administration Roles: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/discussions.html#assigning-discussion-roles
-
-.. _LTI Component: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/lti_component.html
-
-.. _VitalSource E-Reader Tool: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/vitalsource.html
-
-.. _Problem with Adaptive Hint: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/problem_with_hint.html#problem-with-adaptive-hint
-
-
-.. _Student Grades and Grading: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/course_grades.html#grades
-
-.. _Answer Data: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/course_answers.html#review-answers
-
-.. _Assign Final Grades and Issue Certificates: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/checking_student_progress.html#checking-student-progress-and-issuing-certificates
-
-
-.. _Review Grades for Enrolled Students (Small Courses): http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/course_grades.html#gradebook
-
-.. _Video Table of Contents: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/creating_content/create_video.html#video-toc
-
-.. _Download or view student data: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/running_course/course_student.html#view-and-download-student-data
-
-.. _Developing Your Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/developing_course/index.html
-
-.. _New Course Run Announcement: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/releasing_course/course_launching.html#new-course-run-announcement
-
-.. _Add Content Experiments to Your Course: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/content_experiments/content_experiments_add.html
-
-
-
-.. Peer Assessments
-
-.. _Create an Open Response Assessment Assignment: http://edx.readthedocs.org/projects/edx-open-response-assessments/en/latest/CreatePeerAssessment.html
-
-.. DATA DOCUMENTATION
-
-.. _Student Info and Progress Data: http://edx.readthedocs.org/projects/devdata/en/latest/internal_data_formats/sql_schema.html#student-info
-
-.. _Tracking Logs: http://edx.readthedocs.org/projects/devdata/en/latest/internal_data_formats/tracking_logs.html#tracking-logs
-
-.. _Discussion Forums Data: http://edx.readthedocs.org/projects/devdata/en/latest/internal_data_formats/discussion_data.html#discussion-forums-data
-
-.. _Certificate Data: http://edx.readthedocs.org/projects/devdata/en/latest/internal_data_formats/sql_schema.html#certificates
-
-.. _Wiki Data: http://edx.readthedocs.org/projects/devdata/en/latest/internal_data_formats/wiki_data.html#wiki-data
-
-.. _Discussion Forum Data: http://edx.readthedocs.org/projects/devdata/en/latest/internal_data_formats/discussion_data.html#discussion-forums-data
-
-.. _Release Dates: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/releasing_course/set_content_releasedates.html#release-dates
-
-.. _Data Czar/Data Team Selection and Responsibilities: http://edx.readthedocs.org/projects/devdata/en/latest/internal_data_formats/data_czar.html
-
-.. _event list: http://edx.readthedocs.org/projects/devdata/en/latest/internal_data_formats/event_list.html#event-list
-
-.. Developer Doc
-
-.. _Contributing to Open edX: http://edx.readthedocs.org/projects/userdocs/en/latest/process/index.html
-
-.. _edX XBlock Documentation: http://edx.readthedocs.org/projects/xblock/en/latest/
-
-.. _Analytics: http://edx.readthedocs.org/projects/userdocs/en/latest/analytics.html
-
-.. _Opaque Keys: https://github.com/edx/edx-platform/wiki/Opaque-Keys
-
-.. _Ubuntu installation instructions: https://github.com/edx/configuration/wiki/edX-Ubuntu-12.04-64-bit-Installation
diff --git a/docs/en_us/release_notes/source/preface.rst b/docs/en_us/release_notes/source/preface.rst
deleted file mode 100644
index 53895c8473..0000000000
--- a/docs/en_us/release_notes/source/preface.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../shared/preface.rst
\ No newline at end of file
diff --git a/docs/en_us/release_notes/source/read_me.rst b/docs/en_us/release_notes/source/read_me.rst
deleted file mode 100644
index d6ad5ee6c3..0000000000
--- a/docs/en_us/release_notes/source/read_me.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-*******
-Read Me
-*******
-
-This document is created using RST_ files and Sphinx_. You, the user community,
-can help update and revise this documentation project on GitHub::
-
-  https://github.com/edx/edx-platform/tree/master/docs/en_us/release_notes/source
-
-To suggest a revision, fork the project, make changes in your fork, and submit
-a pull request back to the original project: this is known as the `GitHub Flow`_.
-All pull requests need approval from edX. For more information, contact edX at docs@edx.org.
-
-
-.. include:: links.rst
\ No newline at end of file
diff --git a/docs/en_us/shared/exercises_tools/create_exercises_and_tools.rst b/docs/en_us/shared/exercises_tools/create_exercises_and_tools.rst
index 860f316fd2..dd55ca5c8d 100644
--- a/docs/en_us/shared/exercises_tools/create_exercises_and_tools.rst
+++ b/docs/en_us/shared/exercises_tools/create_exercises_and_tools.rst
@@ -91,11 +91,7 @@ General Exercises and Tools
           :alt: Example write-your-own-grader problem
      - :ref:`Write Your Own Grader`
      - In custom Python-evaluated input (also called "write-your-own-grader") problems, the grader uses a Python script that you create and embed in the problem to evaluates a student's response or provide hints. These problems can be any type.
-   * - .. image:: /Images/VitalSource.png
-          :width: 100
-          :alt: VitalSource e-book with highlighted note
-     - :ref:`VitalSource`
-     - The VitalSource Online Bookshelf e-reader allows students to read, browse, and search content (including figures and notes), as well as work with multiple highlighters and copy notes into external documents.
+
 
 ********************************
 Image-Based Exercises and Tools
@@ -185,6 +181,11 @@ STEM Exercises and Tools
           :alt: Example molecule editor problem
      - :ref:`Molecule Editor`
      - The molecule editor allows students to draw molecules that follow the rules for covalent bond formation and formal charge, even if the molecules are chemically impossible, are unstable, or do not exist in living systems.
+   * - .. image:: /Images/Molecule_Viewer.png
+          :width: 100
+          :alt: Example molecule viewer tool
+     - :ref:`Molecule Viewer`
+     - The molecule viewer allows you to create three-dimensional representations of molecules for students to view.
    * - .. image:: /Images/image292.png
           :width: 100
           :alt: Example numerical input problem
diff --git a/docs/en_us/shared/exercises_tools/custom_python.rst b/docs/en_us/shared/exercises_tools/custom_python.rst
index f5b0a3b4b9..6227cc8ced 100644
--- a/docs/en_us/shared/exercises_tools/custom_python.rst
+++ b/docs/en_us/shared/exercises_tools/custom_python.rst
@@ -288,3 +288,45 @@ The following template does not return answers when the student clicks **Show An
       </solution>
   </problem>
 
+.. _Create a Randomized Custom Python-Evaluated Input Problem:
+
+*****************************************************************
+Create a Randomized Custom Python-Evaluated Input Problem
+*****************************************************************
+
+You can create a custom Python-evaluated input problem that randomizes
+variables in the Python code. 
+
+.. note:: 
+  In the problem settings, you must set the **Randomization** value to
+  something other than **Never** to have Python variables randomized. See
+  :ref:`Randomization` for more information.
+
+The following example demonstrates using randomization with a Python-evaluated
+input problem.
+
+.. note::
+ This example uses the method ``random.randint`` to generate random numbers.  You can use any standard Python library for this purpose.
+
+.. code-block:: xml
+
+  <problem>
+    <p>Some problems in the course will utilize randomized parameters.
+       For such problems, after you check your answer you will have the option 
+       of resetting the question, which reconstructs the problem with a new 
+       set of parameters.</p>
+  <script type="loncapa/python">
+  x1 = random.randint(0, 100)
+  x2 = random.randint(0, 100)
+  y = x1+x2
+  </script>
+  <p>Let (x_1 = $x1) and (x_2 = $x2). What is the value of (x_1+x_2)?</p>
+  <numericalresponse answer="$y">
+    <responseparam type="tolerance" default="0.01%" name="tol" 
+      description="Numerical Tolerance"/>
+    <textline size="10"/>
+  </numericalresponse>
+  <solution>
+    <p><b>Explanation:</b></p>
+  </solution>
+  </problem>
diff --git a/docs/en_us/shared/exercises_tools/drag_and_drop.rst b/docs/en_us/shared/exercises_tools/drag_and_drop.rst
index a36732ded0..0bafe66a25 100644
--- a/docs/en_us/shared/exercises_tools/drag_and_drop.rst
+++ b/docs/en_us/shared/exercises_tools/drag_and_drop.rst
@@ -143,8 +143,8 @@ Template for Advanced Problem
           <drag_and_drop_input img="/static/TARGET_IMAGE.png" target_outline="true" one_per_target="true" no_labels="true" label_bg_color="rgb(222, 139, 238)">
               <draggable id="1" label="LABEL 1" />
               <draggable id="2" label="LABEL 2" />
-              <target id="A" x="NUMBER" Y="NUMBER" w="X+WIDTH" h="Y+HEIGHT"/>
-              <target id="B" x="NUMBER" Y="NUMBER" w="X+WIDTH" h="Y+HEIGHT"/>
+              <target id="A" x="NUMBER" y="NUMBER" w="X+WIDTH" h="Y+HEIGHT"/>
+              <target id="B" x="NUMBER" y="NUMBER" w="X+WIDTH" h="Y+HEIGHT"/>
           </drag_and_drop_input>
           <answer type="loncapa/python">
   correct_answer = [{
diff --git a/docs/en_us/course_authors/source/exercises_tools/molecule_viewer.rst b/docs/en_us/shared/exercises_tools/molecule_viewer.rst
similarity index 100%
rename from docs/en_us/course_authors/source/exercises_tools/molecule_viewer.rst
rename to docs/en_us/shared/exercises_tools/molecule_viewer.rst
diff --git a/docs/en_us/shared/preface.rst b/docs/en_us/shared/preface.rst
index 2e5fe7bb85..350ed5a0c5 100644
--- a/docs/en_us/shared/preface.rst
+++ b/docs/en_us/shared/preface.rst
@@ -140,7 +140,7 @@ Documentation
 
 Documentation for developers is available on the docs.edx.org web page.
 
-* `edX Developer Documentation`_ collects information directly from edX
+* The `edX Platform Developer's Guide`_ collects information directly from edX
   platform python docstrings. The topics in this guide include guidelines for
   contributing to Open edX, options for extending the Open edX platform, using
   the edX public sandboxes, instrumenting analytics, and testing.
@@ -152,7 +152,9 @@ Documentation for developers is available on the docs.edx.org web page.
 * XBlock_: Open edX courseware components provides preliminary documentation
   on the XBlock component architecture for building courses.
 
-* `edX Open Learning XML Guide`_ provides guidelines for building edX courses with Open Learning XML (OLX). Note that this guide is currently an Alpha version.
+* `edX Open Learning XML Guide`_ provides guidelines for building edX courses
+  with Open Learning XML (OLX). Note that this guide is currently an Alpha
+  version.
 
 GitHub
 -------
@@ -271,7 +273,7 @@ edX Global Community meetup_ group.
 .. _Open Source Home: http://edx-wiki.atlassian.net/wiki/display/OS/Open+Source+Home
 .. _XBlock: http://edx.readthedocs.org/projects/xblock/en/latest/
 .. _Installing, Configuring, and Running the edX Platform: http://edx.readthedocs.org/projects/edx-installing-configuring-and-running/en/latest/
-.. _edX Developer Documentation: http://edx.readthedocs.org/projects/userdocs/en/latest/
+.. _edX Platform Developer's Guide: http://edx.readthedocs.org/projects/edx-developer-guide/en/latest/
 .. _edx/configuration: http://github.com/edx/configuration/wiki
 .. _site: http://code.edx.org/
 .. _edx/edx-platform: https://github.com/edx/edx-platform
diff --git a/docs/en_us/students/Makefile b/docs/en_us/students/Makefile
deleted file mode 100644
index 7a4baa06c4..0000000000
--- a/docs/en_us/students/Makefile
+++ /dev/null
@@ -1,183 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-PAPER         ?=
-BUILDDIR      ?= build
-
-# User-friendly check for sphinx-build
-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
-endif
-
-Q_FLAG        =
-
-ifeq ($(quiet), true)
-Q_FLAG = -Q
-endif
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = $(Q_FLAG) -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  xml        to make Docutils-native XML files"
-	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/getting_started.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/getting_started.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/getting_started"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/getting_started"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-latexpdfja:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through platex and dvipdfmx..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-xml:
-	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
-	@echo
-	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
-
-pseudoxml:
-	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
-	@echo
-	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/docs/en_us/students/__init__.py b/docs/en_us/students/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docs/en_us/students/source/Images/Dashboard_CertTypes.png b/docs/en_us/students/source/Images/Dashboard_CertTypes.png
deleted file mode 100644
index 7f121a9a5f..0000000000
Binary files a/docs/en_us/students/source/Images/Dashboard_CertTypes.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_AnswerQuestion.png b/docs/en_us/students/source/Images/Disc_AnswerQuestion.png
deleted file mode 100644
index 56832f82e0..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_AnswerQuestion.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_AnsweredInList.png b/docs/en_us/students/source/Images/Disc_AnsweredInList.png
deleted file mode 100644
index 7bf68d55bd..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_AnsweredInList.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_EditDelete.png b/docs/en_us/students/source/Images/Disc_EditDelete.png
deleted file mode 100644
index 39db6924b8..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_EditDelete.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_Following.png b/docs/en_us/students/source/Images/Disc_Following.png
deleted file mode 100644
index c37c5b5b3e..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_Following.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_LinkToCourse.png b/docs/en_us/students/source/Images/Disc_LinkToCourse.png
deleted file mode 100644
index 2dd90f70dc..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_LinkToCourse.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_OptionIcons.png b/docs/en_us/students/source/Images/Disc_OptionIcons.png
deleted file mode 100644
index 5484bffba8..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_OptionIcons.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_Pinned.png b/docs/en_us/students/source/Images/Disc_Pinned.png
deleted file mode 100644
index a20475dc85..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_Pinned.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_PostsEtc.png b/docs/en_us/students/source/Images/Disc_PostsEtc.png
deleted file mode 100644
index 7510c6077e..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_PostsEtc.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_PostsEtc.psd b/docs/en_us/students/source/Images/Disc_PostsEtc.psd
deleted file mode 100644
index 9688cd66e7..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_PostsEtc.psd and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_RecUpdatesBox.png b/docs/en_us/students/source/Images/Disc_RecUpdatesBox.png
deleted file mode 100644
index 8eca58fe12..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_RecUpdatesBox.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_ReceiveUpdates.png b/docs/en_us/students/source/Images/Disc_ReceiveUpdates.png
deleted file mode 100644
index 54160a6221..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_ReceiveUpdates.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_SortByVotes.png b/docs/en_us/students/source/Images/Disc_SortByVotes.png
deleted file mode 100644
index cd0edca78d..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_SortByVotes.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_TopicList.png b/docs/en_us/students/source/Images/Disc_TopicList.png
deleted file mode 100644
index d48581a3d4..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_TopicList.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_TopicList.psd b/docs/en_us/students/source/Images/Disc_TopicList.psd
deleted file mode 100644
index 9f5e05e65a..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_TopicList.psd and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_Unread.png b/docs/en_us/students/source/Images/Disc_Unread.png
deleted file mode 100644
index 5b14278093..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_Unread.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_UserContributions.png b/docs/en_us/students/source/Images/Disc_UserContributions.png
deleted file mode 100644
index 9a3ddd2282..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_UserContributions.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Disc_Vote.png b/docs/en_us/students/source/Images/Disc_Vote.png
deleted file mode 100644
index b4757f8fd6..0000000000
Binary files a/docs/en_us/students/source/Images/Disc_Vote.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/DiscussionHomeCallouts.png b/docs/en_us/students/source/Images/DiscussionHomeCallouts.png
deleted file mode 100644
index 6e1fc358a3..0000000000
Binary files a/docs/en_us/students/source/Images/DiscussionHomeCallouts.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/DiscussionHomeCallouts.psd b/docs/en_us/students/source/Images/DiscussionHomeCallouts.psd
deleted file mode 100644
index 13510dafef..0000000000
Binary files a/docs/en_us/students/source/Images/DiscussionHomeCallouts.psd and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Discussion_More_menu.png b/docs/en_us/students/source/Images/Discussion_More_menu.png
deleted file mode 100644
index 297c72bd56..0000000000
Binary files a/docs/en_us/students/source/Images/Discussion_More_menu.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Discussion_add_response.png b/docs/en_us/students/source/Images/Discussion_add_response.png
deleted file mode 100644
index c2929defcd..0000000000
Binary files a/docs/en_us/students/source/Images/Discussion_add_response.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Discussion_colorcoding.png b/docs/en_us/students/source/Images/Discussion_colorcoding.png
deleted file mode 100644
index 8d9efdbd59..0000000000
Binary files a/docs/en_us/students/source/Images/Discussion_colorcoding.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Discussion_content_specific.png b/docs/en_us/students/source/Images/Discussion_content_specific.png
deleted file mode 100644
index 2bad4e93c9..0000000000
Binary files a/docs/en_us/students/source/Images/Discussion_content_specific.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Discussion_content_specific_post.png b/docs/en_us/students/source/Images/Discussion_content_specific_post.png
deleted file mode 100644
index d3e8a3c840..0000000000
Binary files a/docs/en_us/students/source/Images/Discussion_content_specific_post.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Discussion_course_wide_post.png b/docs/en_us/students/source/Images/Discussion_course_wide_post.png
deleted file mode 100644
index 2595ed885a..0000000000
Binary files a/docs/en_us/students/source/Images/Discussion_course_wide_post.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Discussion_expand.png b/docs/en_us/students/source/Images/Discussion_expand.png
deleted file mode 100644
index 912bfdb3cd..0000000000
Binary files a/docs/en_us/students/source/Images/Discussion_expand.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Discussion_follow.png b/docs/en_us/students/source/Images/Discussion_follow.png
deleted file mode 100644
index d4dbbc662a..0000000000
Binary files a/docs/en_us/students/source/Images/Discussion_follow.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Discussion_mouseover.png b/docs/en_us/students/source/Images/Discussion_mouseover.png
deleted file mode 100644
index 05e6558f37..0000000000
Binary files a/docs/en_us/students/source/Images/Discussion_mouseover.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Discussion_options_mouseover.png b/docs/en_us/students/source/Images/Discussion_options_mouseover.png
deleted file mode 100644
index 4a8cdaaafb..0000000000
Binary files a/docs/en_us/students/source/Images/Discussion_options_mouseover.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Discussion_reportmisuse.png b/docs/en_us/students/source/Images/Discussion_reportmisuse.png
deleted file mode 100644
index ae0abda508..0000000000
Binary files a/docs/en_us/students/source/Images/Discussion_reportmisuse.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Math1.png b/docs/en_us/students/source/Images/Math1.png
deleted file mode 100644
index e54585e25b..0000000000
Binary files a/docs/en_us/students/source/Images/Math1.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Math2.png b/docs/en_us/students/source/Images/Math2.png
deleted file mode 100644
index b0346a8226..0000000000
Binary files a/docs/en_us/students/source/Images/Math2.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Math3.png b/docs/en_us/students/source/Images/Math3.png
deleted file mode 100644
index de3cb96405..0000000000
Binary files a/docs/en_us/students/source/Images/Math3.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Math4.png b/docs/en_us/students/source/Images/Math4.png
deleted file mode 100644
index df9f7881fa..0000000000
Binary files a/docs/en_us/students/source/Images/Math4.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/Math5.png b/docs/en_us/students/source/Images/Math5.png
deleted file mode 100644
index c9e85b50d7..0000000000
Binary files a/docs/en_us/students/source/Images/Math5.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/PA_AllScores.png b/docs/en_us/students/source/Images/PA_AllScores.png
deleted file mode 100644
index ebb0a78846..0000000000
Binary files a/docs/en_us/students/source/Images/PA_AllScores.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/PA_ContinueGrading.png b/docs/en_us/students/source/Images/PA_ContinueGrading.png
deleted file mode 100644
index 717e7d9e4f..0000000000
Binary files a/docs/en_us/students/source/Images/PA_ContinueGrading.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/PA_CriterionAndOverallComments.png b/docs/en_us/students/source/Images/PA_CriterionAndOverallComments.png
deleted file mode 100644
index ce254e36f4..0000000000
Binary files a/docs/en_us/students/source/Images/PA_CriterionAndOverallComments.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/PA_PAHeadingCollapsed.png b/docs/en_us/students/source/Images/PA_PAHeadingCollapsed.png
deleted file mode 100644
index fd5a8a3bcf..0000000000
Binary files a/docs/en_us/students/source/Images/PA_PAHeadingCollapsed.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/PA_S_AsmtWithResponse.png b/docs/en_us/students/source/Images/PA_S_AsmtWithResponse.png
deleted file mode 100644
index 95272dbfb5..0000000000
Binary files a/docs/en_us/students/source/Images/PA_S_AsmtWithResponse.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/PA_S_PeerAssmt.png b/docs/en_us/students/source/Images/PA_S_PeerAssmt.png
deleted file mode 100644
index 02730e7bb1..0000000000
Binary files a/docs/en_us/students/source/Images/PA_S_PeerAssmt.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/PA_S_ReviewResponse.png b/docs/en_us/students/source/Images/PA_S_ReviewResponse.png
deleted file mode 100644
index ed722a5b87..0000000000
Binary files a/docs/en_us/students/source/Images/PA_S_ReviewResponse.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/PA_S_Rubric.png b/docs/en_us/students/source/Images/PA_S_Rubric.png
deleted file mode 100644
index 60ee71dbdb..0000000000
Binary files a/docs/en_us/students/source/Images/PA_S_Rubric.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/PA_TopResponses.png b/docs/en_us/students/source/Images/PA_TopResponses.png
deleted file mode 100644
index becd092aca..0000000000
Binary files a/docs/en_us/students/source/Images/PA_TopResponses.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/PA_TrainingAssessment_Scored.png b/docs/en_us/students/source/Images/PA_TrainingAssessment_Scored.png
deleted file mode 100644
index 81ccb7bb3c..0000000000
Binary files a/docs/en_us/students/source/Images/PA_TrainingAssessment_Scored.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/PA_Upload_ChooseFile.png b/docs/en_us/students/source/Images/PA_Upload_ChooseFile.png
deleted file mode 100644
index 609a4d08e6..0000000000
Binary files a/docs/en_us/students/source/Images/PA_Upload_ChooseFile.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/PA_Upload_WithImage.png b/docs/en_us/students/source/Images/PA_Upload_WithImage.png
deleted file mode 100644
index d6f3ce42eb..0000000000
Binary files a/docs/en_us/students/source/Images/PA_Upload_WithImage.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/SFD_Cert_DownloadButton.png b/docs/en_us/students/source/Images/SFD_Cert_DownloadButton.png
deleted file mode 100644
index f606183592..0000000000
Binary files a/docs/en_us/students/source/Images/SFD_Cert_DownloadButton.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/SFD_DiscussionHome.png b/docs/en_us/students/source/Images/SFD_DiscussionHome.png
deleted file mode 100644
index 937778a076..0000000000
Binary files a/docs/en_us/students/source/Images/SFD_DiscussionHome.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/SFD_HCCert.png b/docs/en_us/students/source/Images/SFD_HCCert.png
deleted file mode 100644
index 4eba0dc563..0000000000
Binary files a/docs/en_us/students/source/Images/SFD_HCCert.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/SFD_VerCert.png b/docs/en_us/students/source/Images/SFD_VerCert.png
deleted file mode 100644
index d82c6680fe..0000000000
Binary files a/docs/en_us/students/source/Images/SFD_VerCert.png and /dev/null differ
diff --git a/docs/en_us/students/source/Images/SFD_VerifiedBadge.png b/docs/en_us/students/source/Images/SFD_VerifiedBadge.png
deleted file mode 100644
index ac53902dbe..0000000000
Binary files a/docs/en_us/students/source/Images/SFD_VerifiedBadge.png and /dev/null differ
diff --git a/docs/en_us/students/source/SFD_ORA.rst b/docs/en_us/students/source/SFD_ORA.rst
deleted file mode 100644
index 7001085f1b..0000000000
--- a/docs/en_us/students/source/SFD_ORA.rst
+++ /dev/null
@@ -1,272 +0,0 @@
-.. _SFD_ORA:
-
-###########################################
-Student Guide to Open Response Assessments
-###########################################
-
-In an open response assessment, you'll provide a written response to a question that may not have a simple or definitive answer. For some open response assessments, you can submit an image to accompany your written response.
-
-Open response assessments may include a peer assessment, a self assessment, or both. With a peer assessment, you'll assess, or grade, responses that several of your peers have submitted, and several of your peers will assess your response. With a self assessment, you'll assess your own response. To assess a response, you'll compare the response to a rubric that the instructor provides. 
-
-A *rubric* is a list of expectations that a response should meet. Rubrics are made of *criteria* and *options*. *Criteria* describe characteristics that the response should have, such as topics the response should cover. The *options* for each of the criteria describe how well the response satisfies the criteria. In the following image, you can see a rubric with two criteria. Each of the criteria has several options.
-
-.. image:: /Images/PA_S_Rubric.png
-   :alt: Rubric showing criteria and options
-   :width: 500
-
-When you assess a response, you'll select the option that best describes the response for each of the criteria. 
-
-Some instructors create a **Top Responses** section that shows the top-scoring responses for the assignment and the scores that these responses received. If an instructor creates this section, you can see it below your score after you've completed each step of the assignment. 
-
-************************
-Student Instructions
-************************
-
-When you come to an open response assessment in the course, you'll see the question and a response field. After you submit your response, you'll assess some of your peers' responses, your own response, or both, depending on the assignment. You can see the steps that your assignment includes below the response field.
-
-.. image:: /Images/PA_S_AsmtWithResponse.png
-   :alt: Open response assessment example with question, response field, and assessment types and status labeled
-   :width: 550
-
-Here, we'll walk you through the process of completing an open response assessment that includes a student training step, a peer assessment, and a self assessment:
-
-#. Submit your response to a question.
-#. Learn to assess responses.
-#. Assess responses that other students have submitted.
-#. Assess your own response to the question.
-#. Receive your score and provide feedback on the peer assessment.
-
-At any time during the assessment, you can see your progress through the assignment at the bottom of the page under **Your Grade**. A message tells you the steps that you still have to perform before you can receive your grade. For example, you may see the following message:
-
-.. code-block:: xml
-
-  Not Completed
-  You have not completed the peer assessment step and self assessment step of this problem.
-
-=====================
-Submit Your Response
-=====================
-
-Read the question carefully. Some instructors include important information in the question, such as how long your response must be or specific topics your response must cover.
-
-.. note:: Your response must contain fewer than 10,000 words (approximately the equivalent of 20 pages of 8.5x11 paper, with text single-spaced).
-
-Type your response into the field under **Your Response**, and then click **Submit your response and move to the next step**. If you don't want to finish your response all at once, you can click **Save Your Progress** to save a draft of your response, and then come back and submit it later.
-
-After you submit your response, if other students have already submitted responses, the peer assessment step starts immediately. However, you don't have to start grading right away. If you want to stop working and come back later, just refresh or reopen your browser when you come back. New peer responses will be available for you to grade.
-
-If no other students have submitted responses yet, you'll see the following message:
-
-.. code-block:: xml
-
-  Waiting for Peer Responses
-  All submitted peer responses have been assessed. Check back later to see if more students
-  have submitted responses. You'll receive your grade after you complete the peer assessment
-  and self assessment steps, and after your peers have assessed your response.
-
-Note that you can view your own response at any time after you submit it. To do this, click the **Your Response** heading to expand the response field. You'll see your response, the status of your response, and information about additional steps you have to complete before you receive your grade.
-
-.. image:: /Images/PA_S_ReviewResponse.png
-   :alt: Image of the Response field collapsed and then expanded
-   :width: 500
-
-Submit an Image with Your Response
-***********************************
-
-Some assignments ask you to submit an image with your text response. If you can submit an image, you'll see buttons that you'll use to upload your image.
-
-.. image:: /Images/PA_Upload_ChooseFile.png 
-   :alt: Open response assessment example with Choose File and Upload Your Image buttons circled
-   :width: 500
-
-To upload your image:
-
-#. Click **Choose File**.
-#. In the dialog box that opens, select the file that you want, and then click **Open**.
-#. When the dialog box closes, click **Upload Your Image**.
-
-.. note:: The image file must be a .jpg or .png file, and it must be smaller than 5 MB in size.
-
-Your image appears below the response field, and the name of the image file appears next to the **Choose File** button. If you want to change the image, follow steps 1-3 again. You can only upload one image.
-
-.. image:: /Images/PA_Upload_WithImage.png
-   :alt: Example response with an image of Paris
-   :width: 500
-
-.. note:: You must submit text as well as your image in your response. You can't submit a response that doesn't contain text.
-
-============================
-Learn to Assess Responses
-============================
-
-In this step, you'll learn to assess responses effectively by reviewing and assessing sample responses that the instructor has provided. You'll try to select the same options for the response that the instructor selected.
-
-.. note:: Not all instructors provide sample responses for training. If the instructor doesn't provide sample responses, this step won't appear in the assignment.
-
-After you submit your response, one of the sample responses opens, together with the rubric for the assignment. Read the sample response and the rubric carefully, select the options that you think best reflect the response, and then click **Compare your selections with the instructor's selections**. 
-
-* If all of your selections are the same as the instructor's selections, the next sample response opens automatically.
-
-* If any option that you select is not the same as the instructor's selection, you'll see the response again, and the following message appears above the response:
-
-.. code-block:: xml
-
-  Learning to Assess Responses
-  Your assessment differs from the instructor's assessment of this response. Review the
-  response and consider why the instructor may have assessed it differently. Then, try 
-  the assessment again.
-
-For each of the criteria, you'll see one of the following two messages, depending on whether your selections matched those of the instructor:
-
-.. code-block:: xml
-
-  Selected Options Agree
-  The option you selected is the option that the instructor selected.
-
-.. code-block:: xml
-
-  Selected Options Differ
-  The option you selected is not the option that the instructor selected.
-
-In the following example, the student chose one correct option and one incorrect option.
-
-.. image:: /Images/PA_TrainingAssessment_Scored.png
-   :alt: Sample training response, scored
-   :width: 500
-
-You'll continue to assess the sample response until the options you select for all criteria match the options the instructor selected. 
-
-When you've successfully assessed all of the sample responses, you'll move to the next step in the assignment.
-
-=====================
-Assess Peer Responses
-=====================
-
-When peer assessment starts, you'll see the original question, another student's response, and the rubric for the assignment. Above the response you can see how many responses you'll assess and how many you've already assessed. 
-
-.. image:: /Images/PA_S_PeerAssmt.png
-   :alt: In-progress peer assessment
-   :width: 500
-
-You'll assess these responses by selecting options in the rubric, the same way you assessed the sample responses in the "learn to assess responses" step. Additionally, this step has a field below the rubric where you can provide comments about the student's response. 
-
-.. note:: Some assessments have an additional **Comments** field for one or more of the assessment's individual criteria. You can enter up to 300 characters in these fields. In the following image, both criteria have a **Comments** field. There is also a field for overall comments on the response.
-
-    .. image:: /Images/PA_CriterionAndOverallComments.png
-       :alt: Rubric with comment fields under each criterion and under overall response
-       :width: 600
-
-After you've selected options in the rubric and provided additional comments about the response, click **Submit your assessment and move to response #<number>**.
-
-When you submit your assessment of the first student's response, another response opens for you. Assess this response in the same way that you assessed the first response, and then submit your assessment. You'll repeat these steps until you've assessed the required number of responses. The number in the upper-right corner of the step is updated as you assess each response.
-
-Assess Additional Peer Responses
-********************************
-
-You can assess more peer responses if you want to. After you assess the required number of responses, the step "collapses" so that just the **Assess Peers** heading is visible. 
-
-.. image:: /Images/PA_PAHeadingCollapsed.png
-   :width: 500
-   :alt: The peer assessment step with just the heading visible
-
-To assess more responses, click the **Assess Peers** heading to expand the step. Then, click **Continue Assessing Peers**.
-
-.. image:: /Images/PA_ContinueGrading.png
-   :width: 500
-   :alt: The peer assessment step expanded so that "Continue Assessing Peers" is visible
-
-
-=====================
-Assess Your Response
-=====================
-
-When you've completed the required number of peer assessments, your self assessment opens. You'll see your response along with the same rubric that you used in the peer assessment step. Assess your response, and then click **Submit Your Assessment**.
-
-==========================================
-Receive Your Score and Provide Feedback
-==========================================
-
-After you submit your self assessment, if other students are still assessing your response, you'll see the following message under the **Assess Your Response** step.
-
-.. code-block:: xml
-
-  Your Grade: Waiting for Peer Assessment
-
-  Your response is still undergoing peer assessment. After your peers have assessed your
-  response, you'll see their feedback and receive your final grade.
-
-If you see this message, keep checking back periodically until the peer assessments of your work are complete.
-
-When peer assessment is complete, you can see the scores you received from all of your peers, as well as your self assessment. You can also see any additional comments that your peers have provided.
-
-.. image:: /Images/PA_AllScores.png
-   :alt: A student's response with peer and self assessment scores
-   :width: 550
-
-If you want to, you can provide feedback on the scores that you received under **Provide Feedback on Peer Assessments**.
-
-=================================================
-Assess Additional Peer Responses (optional)
-=================================================
-
-If you've assessed the required number of peer responses and completed your self assessment, you can assess additional peer responses. To do this, click the **Assess Peers** heading. If any responses remain to be assessed, a new response opens.
-
-***********************
-Peer Assessment Scoring
-***********************
-
-Peer assessments are scored by criteria. An individual criterion's score is the *median*, not average, of the scores that each peer assessor gave that criterion. For example, if the Ideas criterion in a peer assessment receives a 10 from one student, a 7 from a second student, and an 8 from a third student, the Ideas criterion's score is 8.
-
-Your final score for a peer assessment is the sum of the median scores for each individual criterion. 
-
-For example, a response may receive the following scores from peer assessors:
-
-.. list-table::
-   :widths: 25 10 10 10 10
-   :stub-columns: 1
-   :header-rows: 1
-
-   * - Criterion Name
-     - Peer 1
-     - Peer 2
-     - Peer 3
-     - Median
-   * - Ideas (out of 10)
-     - 10
-     - 7
-     - 8
-     - **8**
-   * - Content (out of 10)
-     - 7
-     - 9
-     - 8
-     - **8**
-   * - Grammar (out of 5)
-     - 4
-     - 4
-     - 5
-     - **4**
-
-To calculate the final score, the system adds the median scores for each criterion:
-
-  **Ideas median (8/10) + Content median (8/10) + Grammar median (4/5) = final score (20/25)**
-
-Note, again, that your final score is not the median of the scores that each individual peer assessor gave the response.
-
-==================================
-View Top Responses (optional)
-==================================
-
-If the instructor has included a **Top Responses** section, you can see the highest-scoring responses that your peers have submitted. This section only appears after you've completed all the steps of the assignment.
-
-.. image:: /Images/PA_TopResponses.png
-   :alt: Section that shows the text and scores of the top three responses for the assignment
-   :width: 500
-
-
-******************************************************
-Try an Example Open Response Assessment Problem
-******************************************************
-
-If you want to try an example open response assessment problem, check out the edX demonstration course, `DemoX <https://www.edx.org/course/edx/edx-demox-1-demox-4116#.VBxWCLZ8GoV>`_. In addition to giving you a tour of a typical edX course, DemoX contains `information about open response assessments <https://courses.edx.org/courses/edX/DemoX.1/2014/courseware/70a1e3505d83411bb72393048ac4afd8/1e5cd9f233a2453f83731ccbd863b731/>`_ and an `example peer assessment <https://courses.edx.org/courses/edX/DemoX.1/2014/courseware/70a1e3505d83411bb72393048ac4afd8/1e5cd9f233a2453f83731ccbd863b731/2>`_.
-
diff --git a/docs/en_us/students/source/SFD_certificates.rst b/docs/en_us/students/source/SFD_certificates.rst
deleted file mode 100644
index c8574c5030..0000000000
--- a/docs/en_us/students/source/SFD_certificates.rst
+++ /dev/null
@@ -1,196 +0,0 @@
-.. _Certificates:
-
-##############################
-Student Guide to Certificates
-##############################
-
-Nearly every course on edx.org offers a certificate when you complete a course
-successfully. The certificate includes your name, the name of the course, the
-edX partner university that created the course, and the names of one or more
-members of the course team. The certificate also lists a URL that viewers can
-use to verify the authenticity of the certificate.
-
-.. image:: /Images/SFD_HCCert.png
-   :width: 500
-   :alt: Example edX honor code certificate
-
-Because edX courses are not credit-bearing courses, the certificate doesn't
-include a grade or specify the number of credit hours that the course might earn
-in a university. Additionally, transcripts are not available for edX course
-work.
-
-.. note:: Your certificate lists the full name that appears on your dashboard. 
-  Before your course ends, make sure that the name on your dashboard is correct. 
-  To change your full name, go to your dashboard, and then click **edit** under 
-  **Full Name** in the left pane.
-
-****************************
-Selecting a Certificate Type
-****************************
-
-Three types of certificates may be available for courses on edx.org: honor code,
-verified, and XSeries. You select the certificate type you want when you
-register for a course.
-
-Honor code and verified certificates show that you've completed a single honor
-code or verified course. An XSeries certificate shows that you've completed a
-series of courses, known as an XSeries.
-
-The type of certificate appears in a color-coded tag under the course image on
-your dashboard:
-
-.. image:: /Images/Dashboard_CertTypes.png
-   :width: 500
-   :alt: Dashboard with color indications for audit, honor code, and verified courses
-
-
-.. note:: A very small number of courses do not offer certificates. These courses 
-  have the same rigorous material as other edX courses. If you want evidence that 
-  you completed the course, you can print a copy of the **Progress** page in the course.
-
-
-=========================
-Honor Code Certificates
-=========================
-
-Honor code certificates are free of charge to all students and are available for
-all except a few specific courses. When you audit a course, or you take a course
-that doesn't offer verified certificates, you'll automatically receive an honor
-code certificate if you meet the requirements to pass the course.
-
-.. image:: /Images/SFD_HCCert.png
-   :width: 500
-   :alt: Example edX honor code certificate
-
-=========================
-Verified Certificates
-=========================
-
-A verified certificate shows not only that you successfully completed your edX
-course, but also that you've verified your identity by using a webcam and an
-official ID from your country or region. You may want to work toward a verified
-certificate if you plan to use your course for job applications, promotions, or
-school applications.
-
-.. image:: /Images/SFD_VerCert.png
-   :width: 500
-   :alt: Example edX honor code certificate
-
-Verified certificates are available for select courses. If a course offers
-verified certificates, you'll see a "Verified" badge on the course image in the
-list of courses on edx.org:
-
-.. image:: /Images/SFD_VerifiedBadge.png
-   :width: 200
-   :alt: Image of DemoX course listing with a verified badge
-
-Verified certificates are available for a fee that varies by course. The fee
-helps support edX. If you want to help support edX, you can choose to pay more
-than the minimum required fee. For more information about the fee for a
-particular course, see the About page for that course.
-
-When you register for a verified course, you'll use a webcam to submit a photo
-of yourself and of an official ID to edX's secure authorization service. We
-encrypt your photos and use the highest levels of security available to protect
-your data. During the course, you may be asked to use the same method to re-
-verify your identity periodically. If your computer doesn't have a webcam, you
-must register for the verified certificate on a computer that has a webcam.
-
-.. For more information about registering for a verified certificate and paying
-.. the fee, see :ref:`SFD_registration`. (this topic not written yet)
-
-For a list of all courses that offer verified
-certificates, see the `edX course catalog <https://www.edx.org/course-
-list/allschools/verified/allcourses>`_.
-
-If you have a question or an issue with billing for a verified certificate,
-contact us at `billing@edx.org <mailto://billing@edx.org>`_. Include your order
-number, but please **do not include your credit card information**.
-
-=========================
-XSeries Certificates
-=========================
-
-XSeries certificates show that you've successfully earned a verified certificate
-for each course in a series of courses that make up an XSeries.
-
-****************************
-Changing a Certificate Type
-****************************
-
-You may register for one type of certificate but later decide that you want a
-different type of certificate. For example, you may register for an honor code
-certificate, but you might later want to change to a verified certificate. You
-can change the certificate type until registration for verified certificates
-ends for your course, usually two or more weeks after the course starts.
-
-* To upgrade to a verified certificate, go to your dashboard, and then click
-  **Challenge Yourself!** under the name of your course. You'll then follow the
-  onscreen instructions to register for a verified certificate.
-
-  If registration for verified certificates has closed, you can't change your
-  certificate type. Registration for verified certificates typically closes two
-  weeks after the course has started, or after at least one assignment due date
-  has passed.
-
-* To change from a verified certificate to an honor code certificate, go to your
-  dashboard, and then click **Unregister** under the name of your course. The
-  edX support team will contact you with information about a refund. You must
-  change to an honor code certificate before verified certificate registration
-  closes for your course if you want to receive a refund.
-
-  If you don't see the **Unregister** button, registration for verified
-  certificates has closed. Registration for verified certificates typically
-  closes two weeks after the course has started, or after at least one
-  assignment due date has passed. 
-
-If you have questions about changing your certificate type, you can contact the
-edX support team at `technical@edx.org <mailto://technical@edx.org>`_. 
-
-*************************
-Receiving a Certificate
-*************************
-
-Certificates are distributed shortly after a course ends--usually within two
-weeks. After the course ends, you'll see the following message under the course
-name on your dashboard:
-
-``Final course details are being wrapped up at this time. Your final standing
-will be available shortly.``
-
-When your certificate is ready, your dashboard will show you your final grade
-for the class as well as a link to your certificate.
-
-.. image:: /Images/SFD_Cert_DownloadButton.png
-   :width: 500
-   :alt: Dashboard with course name, grade, and link to certificate
-
-If you want a paper copy of your certificate, you can click **Download Your Certificate (PDF)** to download and print the certificate from your dashboard.
-
-.. note:: Your certificate lists the full name that appears on your dashboard. 
-  Before your course ends, make sure that the name on your dashboard is correct. 
-  To change your full name, go to your dashboard, and then click **edit** under 
-  **Full Name** in the left pane.
-
-=============================================
-Receiving Certificates for Self-Paced Courses
-=============================================
-
-While most edX courses have specific start and end dates, a few courses are
-self-paced. You can start these courses anytime and work through the courseware
-at your own pace.
-
-Receiving a certificate for a self-paced course is similar to receiving a
-certificate for a regular course. After you've completed all course assignments
-and the final exam (if applicable), a certificate is generated automatically.
-You don't have to complete any additional steps to obtain your certificate.
-
-Be aware, however, that different self-paced courses issue certificates at
-different intervals. Some courses issue certificates once a month, and others issue
-certificates less frequently. For more information about your course's specific
-certificate schedule, see the About page or the **Course Info** tab for your
-course.
-
-
-
-
diff --git a/docs/en_us/students/source/SFD_mathformatting.rst b/docs/en_us/students/source/SFD_mathformatting.rst
deleted file mode 100644
index a1fd31cae2..0000000000
--- a/docs/en_us/students/source/SFD_mathformatting.rst
+++ /dev/null
@@ -1,171 +0,0 @@
-.. _Math Formatting:
-
-#####################################################################
-Student Guide to Entering Mathematical and Scientific Expressions
-#####################################################################
-
-For some math, science, and other problems, you'll enter a numerical or math expression, such as a formula, into a response field. You enter your response as plain text, and the edX system then converts your text into numbers and symbols that appear below the response field:
-
-.. image:: /Images/Math4.png
- :alt: Image of a numerical input probem rendered by the parser
-.. image:: /Images/Math5.png
- :alt: Image of a numerical input probem rendered by the parser
-.. image:: /Images/Math3.png
- :alt: Image of a numerical input probem rendered by the parser
-.. image:: /Images/Math2.png
- :alt: Image of a numerical input probem rendered by the parser
-.. image:: /Images/Math1.png
- :alt: Image of a numerical input probem rendered by the parser
-
-You may recognize parts of this system if you've used math programs before. 
-
-****************************
-Entering Math Expressions
-****************************
-
-When you enter your plain text into the response field, follow these guidelines:
-
-* Use standard arithmetic operation symbols: the plus sign (+), minus sign (-), multiplication sign (*), and division sign (/).
-* Indicate multiplication explicitly. That is, instead of ``mc^2`` type ``m*c^2``, and instead of ``5a+4b+3c`` type ``5*a+4*b+3*c``.
-* Use parentheses to specify the order of operations and to make your expression as clear as possible.
-* Use a caret (^) to indicate an exponent.
-* Use an underscore (_) to indicate a subscript.
-* Avoid whitespace.
-* Don't use equal signs (=).
-* Because the system is case-sensitive, make sure you use uppercase and lowercase letters carefully.
-* Only use curved parentheses. Don't use brackets ([]) or braces ({}).
-
-For more information about the types of characters you can use, see below.
-
-
-============
-Numbers
-============
-
-You can use the following types of numbers:
-
-- Integers: 2520
-- Fractions: 2/3
-- Normal floats: 3.14
-- Floats with no integer part: .98
-
-The largest number you can use is **1.7977e+308**, which is the largest float
-possible in the Python programming language. 
-
-====================================
-Scientific Notation and Affixes
-====================================
-
-To indicate scientific notation, enter the letter ``e`` and the exponent that you want. You can enter positive exponents as well as negative exponents. If you enter a negative exponent, make sure to include a minus sign.
-
-For example, type ``0.012`` as ``1.2e-2`` and ``-440,000`` as ``-4.4e+5`` or ``-4.4e5``.
-
-You can also use the following International System of Units (SI) affixes: 
-
-.. list-table::
-
-  * - Affix
-    - Stands for
-    - Example
-  * - %
-    - percent
-    - 0.01 = 1e-2
-  * - k
-    - kilo
-    - 1000 = 1e3
-  * - M
-    - mega
-    - 1e6
-  * - G
-    - giga
-    - 1e9
-  * - T
-    - tera
-    - 1e12
-  * - c
-    - centi
-    - 0.01 = 1e-2
-  * - m
-    - milli
-    - 0.001 = 1e-3
-  * - u
-    - micro
-    - 1e-6
-  * - n
-    - nano
-    - 1e-9
-  * - p
-    - pico
-    - 1e-12
-
-============
-Constants
-============
-
-You can use the following constants:
-
-- ``i`` and ``j`` as ``sqrt(-1)``
-- ``e`` as Euler's number (2.718...)
-- ``g``: gravity (9.80 m/s^2)
-- ``pi``
-- ``k``: the Boltzmann constant (~1.38e-23 in Joules/Kelvin)
-- ``c``: the speed of light in m/s (2.998e8)
-- ``T``: the positive difference between 0K and 0°C (273.15)
-- ``q``: the fundamental charge (~1.602e-19 Coloumbs)
-
-==================
-Greek Letters
-==================
-
-To use any of the following Greek letters, type the name of the letter in the response field.
-
-.. list-table::
-   :widths: 20 20 20 20
-   :header-rows: 0
-
-   * - alpha
-     - beta
-     - gamma
-     - delta
-   * - epsilon
-     - varepsilon
-     - zeta
-     - eta
-   * - theta
-     - vartheta
-     - iota
-     - kappa
-   * - lambda
-     - mu
-     - nu
-     - xi
-   * - pi
-     - rho
-     - sigma
-     - tau
-   * - upsilon
-     - phi
-     - varphi
-     - chi
-   * - psi
-     - omega
-     - 
-     - 
-
-.. note:: ``epsilon`` is the lunate version, whereas ``varepsilon`` looks like a backward 3.
-
-
-============
-Functions
-============
-
-To use a function, type the letters that represent the function, and then surround the expression in that function with parentheses. For example, to represent the square root of ``4*a+b``, type ``sqrt(4*a+b)``. 
-
-You can use the following functions:
-
-* Common functions: sqrt, log10, log2, ln, exp, abs
-* Trigonometric functions: sin, cos, tan, sec, csc, cot
-* Their inverses: arcsin, arccos, arctan, arcsec, arccsc, arccot
-* Hyperbolic trigonometric functions and their inverses: sinh, cosh, tanh, sech, csch, coth, arcsinh, arccosh, arctanh, arcsech, arccsch, arccoth
-* Factorials: Enter factorials as ``fact(3)`` or ``factorial(3)``. You must use integers. For example, you can't enter ``fact(1.5)``.
-* A "parallel resistors" operator (``||``). For example, ``1 || 2`` represents the resistance of a pair of parallel resistors (of resistance 1 and 2 ohms), evaluating to 2/3 (ohms).
diff --git a/docs/en_us/students/source/change_log.rst b/docs/en_us/students/source/change_log.rst
deleted file mode 100644
index 72143c85c9..0000000000
--- a/docs/en_us/students/source/change_log.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-############
-Change Log
-############
-       
-*****************
-October 2014
-*****************
-
-.. list-table::
-   :widths: 10 70
-   :header-rows: 1
-
-   * - Date
-     - Change
-   * - 10/24/14
-     - Added :ref:`Course Discussions` section
-
-.. _Preface: http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/
\ No newline at end of file
diff --git a/docs/en_us/students/source/conf.py b/docs/en_us/students/source/conf.py
deleted file mode 100644
index 41d3e466a0..0000000000
--- a/docs/en_us/students/source/conf.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-import sys, os
-
-# on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-
-
-
-
-
-
-
-sys.path.append(os.path.abspath('../../../'))
-sys.path.append(os.path.abspath('../../'))
-
-#from docs.shared.conf import *
-
-sys.path.insert(0, os.path.abspath('.'))
-
-master_doc = 'index'
-
-# Add any paths that contain templates here, relative to this directory.
-#templates_path.append('source/_templates')
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path.append('source/_static')
-
-
-# General information about the project.
-project = u'edX Guide for Students'
-copyright = u'2014, edX'
-
-# The short X.Y version.
-version = ''
-# The full version, including alpha/beta/rc tags.
-release = ''
diff --git a/docs/en_us/students/source/index.rst b/docs/en_us/students/source/index.rst
deleted file mode 100644
index d1e62448f1..0000000000
--- a/docs/en_us/students/source/index.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-.. Getting_Started documentation master file, created by
-   sphinx-quickstart on Tue Apr 16 11:19:12 2013.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-
-edX Guide for Students
-========================================
-
-.. toctree::
-   :numbered:
-   :maxdepth: 2
-
-   change_log
-   SFD_certificates
-   SFD_mathformatting
-   SFD_ORA
-   sfd_discussions/index
\ No newline at end of file
diff --git a/docs/en_us/students/source/latex/Makefile b/docs/en_us/students/source/latex/Makefile
deleted file mode 100644
index 6b87ad8814..0000000000
--- a/docs/en_us/students/source/latex/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# Makefile for Sphinx LaTeX output
-
-ALLDOCS = $(basename $(wildcard *.tex))
-ALLPDF = $(addsuffix .pdf,$(ALLDOCS))
-ALLDVI = $(addsuffix .dvi,$(ALLDOCS))
-
-# Prefix for archive names
-ARCHIVEPRREFIX =
-# Additional LaTeX options
-LATEXOPTS =
-
-all: $(ALLPDF)
-all-pdf: $(ALLPDF)
-all-dvi: $(ALLDVI)
-all-ps: all-dvi
-	for f in *.dvi; do dvips $$f; done
-
-all-pdf-ja:
-	for f in *.pdf *.png *.gif *.jpg *.jpeg; do extractbb $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	-for f in *.idx; do mendex -U -f -d "`basename $$f .idx`.dic" -s python.ist $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
-	for f in *.dvi; do dvipdfmx $$f; done
-
-zip: all-$(FMT)
-	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
-	cp $(ALLPDF) $(ARCHIVEPREFIX)docs-$(FMT)
-	zip -q -r -9 $(ARCHIVEPREFIX)docs-$(FMT).zip $(ARCHIVEPREFIX)docs-$(FMT)
-	rm -r $(ARCHIVEPREFIX)docs-$(FMT)
-
-tar: all-$(FMT)
-	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
-	cp $(ALLPDF) $(ARCHIVEPREFIX)docs-$(FMT)
-	tar cf $(ARCHIVEPREFIX)docs-$(FMT).tar $(ARCHIVEPREFIX)docs-$(FMT)
-	rm -r $(ARCHIVEPREFIX)docs-$(FMT)
-
-bz2: tar
-	bzip2 -9 -k $(ARCHIVEPREFIX)docs-$(FMT).tar
-
-# The number of LaTeX runs is quite conservative, but I don't expect it
-# to get run often, so the little extra time won't hurt.
-%.dvi: %.tex
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-	-makeindex -s python.ist '$(basename $<).idx'
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-
-%.pdf: %.tex
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-	-makeindex -s python.ist '$(basename $<).idx'
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-
-clean:
-	rm -f *.dvi *.log *.ind *.aux *.toc *.syn *.idx *.out *.ilg *.pla
-
-.PHONY: all all-pdf all-dvi all-ps clean
-.PHONY: all-pdf-ja
-
diff --git a/docs/en_us/students/source/sfd_discussions/add_post.rst b/docs/en_us/students/source/sfd_discussions/add_post.rst
deleted file mode 100644
index d12f538ec6..0000000000
--- a/docs/en_us/students/source/sfd_discussions/add_post.rst
+++ /dev/null
@@ -1,231 +0,0 @@
-
-.. _Add or Edit a Contribution:
-
-#########################################################
-Add, Edit, or Delete a Post, Response, or Comment
-#########################################################
-
-You can add, edit, or delete contributions to discussions from inside the course
-or from the **Discussion** page.
-
-* :ref:`Add a Post`
-* :ref:`Add Response`
-* :ref:`Edit or Delete`
-
-************************************
-Add a Post, Response, or Comment
-************************************
-
-.. _Add a Post:
-
-==============
-Add a Post
-==============
-
-When you add a post to the course discussions, you'll determine the post type
-and the post topic, and then you'll add the post either directly inside the
-course unit or on the **Discussion** page.
-
-.. _Determine Post Type:
-
-Determine the Post Type: Discussion or Question
-**************************************************
-
-To make sure that other students and the course team can find and respond to
-your post, determine the type for your post: either question or discussion.
-
-* A *question* post raises an issue so that the discussion staff and community can
-  provide answers.
-
-* A *discussion* post starts a conversation by sharing thoughts and
-  reflections, and inviting community participation.
-
-If you have any difficulty deciding which type of post you want to add, think
-about whether you want to get concrete information (a question) or start an
-open-ended conversation (a discussion).
-
-.. note:: You can change the post type from discussion to question or vice versa at any time after you add your post. For more information, see :ref:`Edit or Delete`.
-
-.. _Determine Post Topic:
-
-Determine the Post Topic
-*************************
-
-Every post in the course discussions has an associated topic. The course team
-creates the list of discussion topics for each course, and you'll choose a topic
-from the list when you create your post. Before you add a post, you should look
-through the list of topics in the course discussions so that you can decide
-which topic is the most appropriate for your post. For more information, see
-:ref:`Explore Posts`.
-
-After you've decided on a post type and topic, you can add your post on the
-**Discussion** page or in the body of the course.
-
-Add a Post on the Discussion Page
-************************************
-
-You can add a post for course-wide or content-specific discussion
-topics on the **Discussion** page.
-
-#. Click the **Discussion** page.
-
-#. In the upper-right corner, click **New Post**.
-
-#. Click **Question** or **Discussion** to select the type of post that you want
-   to create.
-
-#. Select the most appropriate discussion topic for your post.
-
-  .. image:: /Images/Discussion_course_wide_post.png
-    :width: 300 
-    :alt: Selecting the topic for a new post on the Discussion page 
-
-5. In the **Title** box, supply a short, descriptive title. The title is the
-   part of your post that others see when they are browsing on the
-   **Discussion** page or scrolling through one of the content-specific topics.
-
-#. Enter the complete text of your post. To format the text or add links or
-   images, click the buttons above the text field.
-
-
-In a few courses, you can add posts, responses, and comments anonymously. If
-this is the case, you'll see a **Post Anonymously** check box under the field
-where you enter your text. When you post anonymously, discussion staff can see your
-username, but other students cannot.
-
-Add a Post in a Course Unit
-************************************
-
-If you come to a discussion as you work through the units in your course, or if
-you know where in the course a particular discussion originates, you can add a
-post for that discussion right from the unit in your course. This only applies
-to content-specific discussions.
-
-#. Click **Courseware**.
-
-#. Open the unit in the course that includes the discussion topic that you want
-   to add to.
-
-#. Click **Show Discussion** to read what others have already contributed to the
-   conversation.
-
-   You can scroll through the posts that have already been added: the title and
-   the first sentence or two of each post appear. To read an entire post, view
-   the responses to it, and see any comments, click **Expand discussion**.
-  
-4. Click **New Post** to add a post.
-
-   .. image:: /Images/Discussion_content_specific_post.png
-     :width: 500
-     :alt: Adding a post about specific course content
-
-5. Click **Question** or **Discussion** to select the type of post you want to
-   create.
-
-#. In the **Title** field, enter a short, descriptive identifier for your post.
-   The title is the part of your post that others see when they are browsing on
-   the **Discussion** page or scrolling through one of the content-specific
-   topics.
-
-#. Enter the complete text of your post. Click the buttons above the text field
-   to see options for formatting the text and for adding links or images.
-
-In a few courses, you can add posts, responses, and comments anonymously. If
-this is the case, you'll see a **Post Anonymously** check box under the field
-where you enter your text. When you post anonymously, discussion staff can see your
-username, but other students cannot.
-
-.. _Add Response:
-
-==============================
-Add a Response or Comment
-==============================
-
-
-To participate in an ongoing discussion, you reply to the initial post by
-adding a response, or expand on a particular response by adding a comment.
-
-The same options for formatting the text and for adding links or images are
-available for responses and comments as for posts.
-
-Add a Response or Comment on the Discussion Page
-**************************************************
-
-You can add a response or comment to course-wide or content-specific discussion
-topics on the **Discussion** page.
-
-#. On the **Discussion** page, find the post that you want to contribute to. To
-   help you decide where to add your thoughts, review the current responses and
-   their comments.
-
-   For more information about finding posts by searching, sorting, or using
-   filters, see :ref:`Explore Posts`.
-
-#. Add a response or comment.
-
- - To add a response to the post, click **Add A Response**. When your response
-   is complete, click **Submit**.
-
-  .. image:: /Images/Discussion_add_response.png
-    :width: 500
-    :alt: The **Add A Response** button located between a post and its 
-          responses 
-
- - To add a comment to a response, click inside the **Add a comment** field below
-   the response. When your comment is complete, click **Submit**.  
-
-Add a Response or Comment in a Course Unit
-*******************************************
-
-You can add a response or comment to a content-specific discussion
-topic inside the course.
-
-#. In the unit that contains the discussion topic where you want to make
-   your contribution, click **Show Discussion**. 
-
-#. Scroll to the post that you want to contribute to. To help you decide
-   where to add your thoughts, review the current responses and their comments.
-
-#. Under the text of the post, click **Expand discussion**.
-   
-  .. image:: /Images/Discussion_expand.png
-    :width: 500
-    :alt: The **Expand discussion** link under a post
-
-4. Add a response or comment.
-
- - To add a response to the post, click **Add A Response**. When your response
-   is complete, click **Submit**.
-
- - To add a comment to a response, click inside the **Add a comment** field below
-   the response. When your comment is complete, click **Submit**.
-
-.. _Edit or Delete:
-
-*******************************************
-Edit or Delete a Post, Response, or Comment
-******************************************* 
-
-You can edit or delete your own posts, responses, or comments at any time. You
-cannot edit or delete contributions from other students.
-
-#. Locate the contribution that you want to edit or delete, either in the body
-   of the course or on the **Discussion** page.
-
-#. In the upper-right corner of the contribution, click the "More" icon (...). A
-   menu opens.
-
-   .. image:: /Images/Disc_EditDelete.png
-    :width: 500
-    :alt: Response with the "More" menu expanded, showing Edit, Delete, and Report options
-
-#. Edit or delete the contribution.
-
- - To edit the contribution, click **Edit**, make the changes that you want in
-   the text editor that opens, and then click **Update Response**. For posts,
-   you can change the post topic and the post type as well as the text of the
-   post.
-
- - To delete the contribution, click **Delete**, and then click **OK** in the
-   pop-up confirmation box.
-
diff --git a/docs/en_us/students/source/sfd_discussions/anatomy.rst b/docs/en_us/students/source/sfd_discussions/anatomy.rst
deleted file mode 100644
index 3eb23e480d..0000000000
--- a/docs/en_us/students/source/sfd_discussions/anatomy.rst
+++ /dev/null
@@ -1,161 +0,0 @@
-
-.. _Anatomy of edX Course Discussions:
-
-#######################################
-Anatomy of edX Course Discussions 
-#######################################
-
-********************************************************************
-Basic Elements: Posts, Responses, and Comments
-********************************************************************
-
-Discussions are made up of *posts*, *responses*, and *comments*. Together,
-posts, responses, and comments are known as *contributions*, and a post together
-with its responses and comments is an *exchange*.
-
-* *Posts* initiate a conversation by asking a question or making a statement for
-  students to consider.
-
-* *Responses* reply directly to the post.
-
-* *Comments*, in turn, reply to specific responses.
-
-The following conversation shows each of these contributions:
-
-::
-
-  Post: "Please introduce yourself."
-    - Response: "My name is Lee and I teach secondary school maths in Canberra,
-      Australia."
-    - Response: "Hello everyone, I am Sumei from Hong Kong, China."
-      - Comment: "Hi Sumei, I am taking this course in Hong Kong too. Maybe we
-        should make a study group!"
-      - Comment: "I'd like to join the Hong Kong study group too, I think it
-        will help me keep up with the homework."
-    - Response: "Hi from Johannesburg! I am taking the course to prepare for my
-      matric exams."
-
-You can see posts, comments, and responses, as well as other information about 
-the course discussions and individual posts, on the **Discussion** page.
-
-**********************************
-The Discussion Page
-**********************************
-
-When you go to the **Discussion** page in your course, you'll see a page that
-looks like the following image. You can click the image to enlarge it.
-
-.. image:: /Images/DiscussionHomeCallouts.png
-   :width: 800 
-   :alt: Discussion home page with a topics pane on the left side and "How to use edX discussions" pane on the right
-
-=============
-List of Posts
-=============
-
-The list of posts in the left pane lists titles and information for all the
-individual posts in the course. The list of posts also has filters that you can
-use to sort discussions by topic, status, and activity.
-
-The list of posts includes the following elements.
-
-1. The drop-down Discussion list. When you click this list, you can
-   see all of the topics in the course discussions, or you can view only the posts that you're currently following. For more information about discussion topics, see :ref:`Discussion Topics`. For more information about following posts, see :ref:`Follow Posts`.
-
-2. The status filter. You can filter discussions that you haven't read or that
-   contain unanswered questions. For more information, see :ref:`Answer
-   Questions`.
-
-3. Specific identifiers. If an instructor has pinned a post, if you're
-   following a post, or if the person who created the post is a community TA,
-   moderator, or administrator, you'll see a colored identifier with this
-   information.
-
-4. The title of the post. The title lets you know what the post is about.
-
-5. The post type. A post can be a question or a discussion. For more
-   information, see :ref:`Determine Post Type`.
-
-6. A "correct answer" status indicator. The green check mark indicates that one
-   of the responses to the post correctly answers the question that the post
-   asks.
-
-7. The post search box. You can search all posts, responses, and comments for
-   individual words or phrases. For more information, see :ref:`Search Discussions`.
-
-8. The activity sorting control. You can sort discussions by recent activity,
-   most activity, or most votes. For more information, see :ref:`Keep Up with
-   New Activity`.
-
-9. Status indicators. These indicators show whether you've read a post and the
-   responses and comments for that post. For more information, see :ref:`Keep Up
-   with New Activity`.
-
-===========
-Right Pane
-===========
-
-When you click the **Discussion** tab, the right pane opens to a home page that
-lists ways that you can interact with posts. Each of these interactions is
-covered later in this topic. For more information, see the following sections:
-
-* :ref:`Explore Posts`
-* :ref:`Follow Posts`
-* :ref:`Provide Feedback`
-
-On the home page, you can also specify that you want to receive an email message
-each day that summarizes discussion activity for the posts you are following. To
-receive this daily digest, select the **Receive updates** check box.
-
-.. image:: ../Images/Disc_ReceiveUpdates.png
-  :width: 400
-  :alt: The right pane with the Receive Updates check box circled
-
-After you click the title of a post, the right pane shows the original post,
-responses to the post, and comments on responses. The page is formatted to help
-distinguish between posts, responses, and comments:
-
-* The post and its title appear at the top of the page.
-* Responses appear indented and with a white background below the original post.
-* Comments on a response appear with a gray background below the response. The
-  font size for comments is smaller than the font size for responses.
-
-These elements appear in the image below. You can click the image to enlarge it.
-
-.. image:: ../Images/Disc_PostsEtc.png
-   :width: 600
-   :alt: Discussion page with a specific post selected in the left pane and the
-       post, responses, and comments in the right pane
-
-
-Additionally, in the upper-right corner of every post, response, and comment, you can see several option icons. The icons that you see depend on the type of contribution. (For more information, see :ref:`Provide Feedback`.)
-
-.. image:: ../Images/Disc_OptionIcons.png
-  :width: 450
-  :alt: A single post with the option icons on the right circled
-
-The icons that you see may include the following:
-
-* A plus sign (+), together with the number of votes the post has received.
-  Click this icon to vote for the post or response. For more information, see
-  :ref:`Vote for Posts or Responses`.
-* A star (posts only). Click this icon if you want to follow the post. For more
-  information, see :ref:`Follow Posts`. 
-* A check mark (responses only). For questions, the student who posted the
-  question, or discussion staff, can use this icon to indicate that the response is
-  correct. For more information, see :ref:`Answer Questions`.
-* An ellipsis, or "more", icon (...). When you click this icon, you may see several additional options:
-
-  * **Edit**. This option is only visible if you are the author of the post,
-    response, or comment. You can change the text of your contribution, or, for
-    posts, you can change the type of post. For more information, see :ref:`Edit or Delete`.
-  * **Delete**. This option is only visible if you are the author of the post,
-    response, or comment. For more information, see :ref:`Edit or Delete`.
-  * **Report**. You can use this option to report an inappropriate post,
-    response, or comment. For more information, see :ref:`Report Discussion
-    Misuse`.
-
-
-
-
-
diff --git a/docs/en_us/students/source/sfd_discussions/discussions.rst b/docs/en_us/students/source/sfd_discussions/discussions.rst
deleted file mode 100644
index 1a6acd50a0..0000000000
--- a/docs/en_us/students/source/sfd_discussions/discussions.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _Course Discussions:
-
-####################
-Course Discussions
-####################
-
-Course discussions give you the opportunity to start conversations with other
-students, ask questions that other students or course staff can answer, and
-participate in the course community. If you have not previously participated in
-an online discussion forum, see the introductory :ref:`Anatomy of edX Course
-Discussions` section.
-
-This chapter also describes features of edX discussions that can make your
-participation more effective:
-
-* :ref:`Explore Posts`
-
-* :ref:`Add or Edit a Contribution`
-
-* :ref:`Keep Up with New Activity`
-
-* :ref:`Provide Feedback`
-
diff --git a/docs/en_us/students/source/sfd_discussions/explore_posts.rst b/docs/en_us/students/source/sfd_discussions/explore_posts.rst
deleted file mode 100644
index 16b128e9a1..0000000000
--- a/docs/en_us/students/source/sfd_discussions/explore_posts.rst
+++ /dev/null
@@ -1,169 +0,0 @@
-
-.. _Explore Posts:
-
-#########################
-Explore Posts
-#########################
-
-Finding out whether someone else has already asked the same question or
-initiated a conversation about the subject that interests you, and then
-reading and contributing to that exchange instead of starting a new one, helps
-make the time that everyone spends with the course discussions more productive.
-You can search for something specific, or you can browse through the posts in a
-single discussion topic.
-
-.. _Search Discussions:
-
-******************************
-Search the Discussions
-******************************
-
-To search for text, click **All Discussions** and enter a phrase, a word, or part of
-a word in the **Search all posts** field above the list of posts. When you
-press Enter, the search tries to find:
-
-* A match or close match to your text in any post, response, or comment. The
-  display updates to show a list of the posts that have a match at any level of
-  interaction.
-
-* A similar value in any post, response, or comment (if no exact matches are
-  found). A "No results found for {text}. Showing results for {similar}"
-  message appears above the posts that have similar text at any interaction
-  level.
-
-* Any usernames that are an exact match to your text. A "Show posts by
-  {username}" option appears above any posts that have an exact text match at
-  any interaction level. Click the username in the message to read that user's
-  posts, responses, and comments. For more information about viewing
-  contributions from a specific user, see :ref:`View from Participant`.
-
-.. _Discussion Topics:
-
-*********************************************
-View Discussions about a Specific Topic
-*********************************************
-
-Every post in the course discussions has an associated topic. When a participant
-creates a post, the participant selects a topic from a list of topics that the
-course team has provided. You can look through topics in the discussions to find
-one that you're interested in.
-
-Discussion topics for edX courses can be *course-wide* or *content-specific*.
-
-* *Course-wide* discussion topics cover matters that affect the entire course,
-  and may include topics such as "Frequently Asked Questions" and
-  "Troubleshooting".
-
-* *Content-specific* discussion topics cover specific video lectures, reading
-  assignments, homework problems, or other course content. 
-
-=======================================
-View Topics on the Discussion Page
-=======================================
-
-On the **Discussion** page, you can view both course-wide and content-specific
-discussions. Click **All Discussions** in the upper left corner of the left pane
-to see all discussion topics in the course. To see all the discussions in an
-individual topic, click the topic name.
-
-Note that course-wide topics do not have other topics indented below them, while
-content-specific topics are indented under a category name. For content-specific
-topics, you can click either the category name to see all the posts in that
-category, or you can click an individual topic name.
-
-  .. image:: /Images/Disc_TopicList.png
-     :width: 400
-     :alt: Discussion topic list expanded, showing all course discussion topics
-
-=======================================
-View Topics in a Course Unit
-=======================================
-
-Content-specific topics are located in specific units in the course. They typically appear below the content they apply to. 
-
-You can access a content-specific topic by viewing the unit that
-contains the topic. To see the discussion, click **Show Discussion**.
-
-.. image:: /Images/Discussion_content_specific.png
-   :width: 500
-   :alt: A discussion topic that appears below text inside the course, identified
-       by a "Show Discussion" link
-
-You can also use the **Discussion** page to access a discussion in the unit
-where that topic is located. 
-
-#. In the list of topics, click the topic that you want.
-#. Click the name of a post to open the post in the right pane.
-#. In the right pane, click the name of the discussion topic below the text of
-   the post to go to the discussion inside the unit.
-
-.. image:: /Images/Disc_LinkToCourse.png
-    :width: 800
-    :alt: Post on the Discussion page with a link back to the course unit
-
-*****************************************
-View Only Unread or Unanswered Posts
-*****************************************
-
-To limit the posts shown on the **Discussion** page, you can select one of the
-filter options. Above the list of posts, the **Show all** filter is selected by
-default.
-
-* To list only the discussions and questions that you have not yet viewed,
-  select **Unread**.
-
-* To list only question posts that do not yet have any responses marked as
-  answers, select **Unanswered**.
-
-.. image:: /Images/Disc_Unread.png
- :width: 300
- :alt: List of unread topics with the "Unread" filter circled
-
-*****************************************
-View Pinned Posts
-*****************************************
-
-Pinned posts appear at the top of the list of posts when you view all
-discussions. Pinned posts can contain important information about the course or
-any part of the course, such as a particular video or problem. The pinned post
-may originate from anyone in the course, including students and staff, but only
-members of course staff can pin posts.
-
-.. image:: /Images/Disc_Pinned.png
- :width: 300
- :alt: Short list of posts with the "pinned" identifier circled
-
-.. _View from Participant:
-
-*************************************************
-View Contributions from a Specific Participant
-*************************************************
-
-You can review all the posts, responses, and comments that a specific
-participant has made, both for students and for course staff. To do this, click
-the username that appears at the top of any of the participant's contributions. A page
-opens that shows the following information about the participant. 
-
-* The participant's username.
-
-* The participant's role (for example, student or community TA).
-
-* The number of posts the participant has created (listed in the upper-left corner
-  as the number of discussions started).
-
-* The total number of responses and comments the participant has added to other
-  posts (listed in the upper-left corner as the number of comments).
-
-* A list of all the posts that contain a contribution from the participant,
-  whether the participant created the original post or contributed a response or
-  comment to a different post. The list of posts includes the title of the post
-  and the username of the participant who created the post. To see the comments
-  or responses on any post, click **View Discussion** below the post to open the
-  discussion on the **Discussion** page.
-
-.. image:: /Images/Disc_UserContributions.png
- :width: 800
- :alt: Page that lists the posts that a user has added or contributed to
-
-
-
diff --git a/docs/en_us/students/source/sfd_discussions/index.rst b/docs/en_us/students/source/sfd_discussions/index.rst
deleted file mode 100644
index 1a17813160..0000000000
--- a/docs/en_us/students/source/sfd_discussions/index.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. _Course Discussions Index:
-
-######################################
-Student Guide to Course Discussions
-######################################
-
-.. toctree::
-   :maxdepth: 3
-
-   discussions
-   anatomy
-   explore_posts
-   add_post
-   keep_up
-   provide_feedback
\ No newline at end of file
diff --git a/docs/en_us/students/source/sfd_discussions/keep_up.rst b/docs/en_us/students/source/sfd_discussions/keep_up.rst
deleted file mode 100644
index 451b98f6c7..0000000000
--- a/docs/en_us/students/source/sfd_discussions/keep_up.rst
+++ /dev/null
@@ -1,80 +0,0 @@
-
-.. _Keep Up with New Activity:
-
-################################
-Keep Up with New Activity
-################################
-
-.. _Read New or Updated Posts:
-
-****************************
-Read New or Updated Posts
-****************************
-
-The list of posts on the **Discussion** page provides visual cues to help you
-distinguish posts that are new, or that have responses or comments that you have
-not read yet, from exchanges that you have already read completely.
-
-==================
-Sort by Activity
-==================
-
-Color-coded callout images appear when you sort the list of posts **by recent
-activity** or **by most activity**. This is the default view when you open the
-**Discussion** page.
-
-* A **gray callout image on a gray background** indicates that you have read the
-  post and all of its responses and comments.
-
-* A **white callout image on a gray background** indicates that you have read the
-  original post, but the post has new responses or comments that you have not
-  read yet.
-
-* A **blue callout image on a white background** indicates that you have not yet
-  read the post.
-
-.. image:: /Images/Discussion_colorcoding.png 
-  :alt: The list of posts with posts showing differently colored backgrounds 
-        and callout images
-
-The number in each callout image indicates the total number of contributions in
-the exchange (the post and its responses and comments). To see the number of
-contributions that you haven't read yet, move your cursor over the callout
-image.
-
-.. image:: /Images/Discussion_mouseover.png
- :width: 300
- :alt: A post with 4 contributions total and a popup that shows only two are 
-       unread
-
-==================
-Sort by Votes
-==================
-
-You can also sort the list of posts by number of votes. To do this, click the
-sorting list in the upper-right corner of the list of posts, and then click **by
-most votes**.
-
-If you sort by most votes, the number of votes that the post has received
-appears in place of the callouts. For more information, see :ref:`Vote for Posts
-or Responses`.
-
-.. image:: /Images/Disc_SortByVotes.png
-  :width: 300
-  :alt: A list of posts sorted by votes, with the number of votes to the right of
-      the post title
-
-
-
-****************************
-Receive Daily Digests
-****************************
-
-You have the option to receive an email message each day that summarizes
-discussion activity for the posts you are following. To receive this daily
-digest, click **Discussion** to go to the discussions home page, and then select
-the **Receive updates** check box in the right pane.
-
-.. image:: /Images/Disc_RecUpdatesBox.png
-  :width: 500
-  :alt: Discussion home page with the Receive Updates check box circled
diff --git a/docs/en_us/students/source/sfd_discussions/provide_feedback.rst b/docs/en_us/students/source/sfd_discussions/provide_feedback.rst
deleted file mode 100644
index 0a3997a603..0000000000
--- a/docs/en_us/students/source/sfd_discussions/provide_feedback.rst
+++ /dev/null
@@ -1,133 +0,0 @@
-
-.. _Provide Feedback:
-
-###############################################
-Provide Feedback on Contributions
-###############################################
-
-As you read the contributions that other students and staff make to discussion
-topics, you can provide feedback without writing a complete response or
-comment. You can:
-
-* :ref:`Vote for posts and responses<Vote for Posts or Responses>` to provide
-  positive feedback.
-
-* :ref:`Follow posts<Follow Posts>` so that you can check back in on
-  interesting conversations and questions easily.
-
-* :ref:`Answer questions, and mark your questions as answered<Answer
-  Questions>`.
-
-* :ref:`Report a contribution<Report Discussion Misuse>` that is inappropriate
-  to the course staff.
-
-To select a feedback option, you use the icons at the top right of each post,
-response, or comment. When you move your cursor over these icons a label
-appears.
-
-.. image:: /Images/Discussion_options_mouseover.png
- :width: 300
- :alt: The icons at top right of a post, shown before the cursor is 
-      placed over each one and with the Vote, Follow, and More labels
-
-When you click the "More" icon, a menu of available options opens. Options vary
-depending on whether the contribution is a post, response, or comment, and on
-whether you are a student or a member of discussion staff.
-
-.. image:: /Images/Discussion_More_menu.png
- :width: 300
- :alt: The More icon expanded to show a menu with one option and a menu with 
-       three options
-
-.. _Vote for Posts or Responses:
-
-************************************
-Vote for Posts or Responses
-************************************
-
-If you like a post or one of its responses, you can vote for it. Hover over the plus sign (+) icon for the post or response, and then click **Vote**.
-
-.. image:: /Images/Disc_Vote.png
- :width: 500
- :alt: A post with the Vote icon circled
-
-You can sort the list of posts so that the posts with the most votes appear at
-the top: click the drop-down list of sorting options and select **by most
-votes**.
-
-.. image:: /Images/Disc_SortByVotes.png
- :width: 300
- :alt: The list of posts with the "by most votes" sorting option and the 
-       number of votes for the post circled
-
-You can see the number of votes that each post has received in the list of posts.
-(Votes for responses are not included in the number.)
-
-.. _Follow Posts:
-
-************************************
-Follow Posts
-************************************
-
-If you find a post particularly interesting and want to return to it in the
-future, you can follow it. To follow a post, hover over the star icon for the
-post, and then click **Follow**.
-
-.. image:: /Images/Discussion_follow.png
- :width: 500
- :alt: A post with the Follow icon circled
-
-Each post that you follow appears with a "Following" indicator in the list of
-posts.
-
-To list only the posts that you are following, regardless of the discussion
-topic they apply to, click the drop-down Discussion list and select
-**Posts I'm Following**.
-
-.. image:: /Images/Disc_Following.png
- :width: 300
- :alt: The list of posts with the "Posts I'm Following" filter selected. Every
-       post in the list shows the following indicator.
-
-.. _Answer Questions:
-
-********************************************************
-Answer Questions and Mark Questions as Answered 
-********************************************************
-
-Anyone in a course can answer questions. Just add a response with your answer to
-the question post.
-
-You can indicate that a response to your own question post is the correct
-answer. To do this, hover over the check mark icon for the response, and then
-click **Mark as Answer**.
-
-.. image:: /Images/Disc_AnswerQuestion.png
- :width: 500
- :alt: A question and a response, with the Mark as Answer icon circled
-
-After at least one response is marked as the answer, a check or tick mark image
-replaces the question mark image for the post in the list of posts.
-
-.. image:: /Images/Disc_AnsweredInList.png
- :width: 300
- :alt: The list of posts with images identifying unanswered and answered
-     questions and discussions
-
-.. note:: Discussion staff can mark any response as correct. Students can only mark responses as correct for their own posts.
-
-.. _Report Discussion Misuse:
-
-************************************
-Report Discussion Misuse
-************************************
-
-You can flag any post, response, or comment for a discussion moderator to
-review: view the contribution, click the "More" icon, and then click
-**Report**.
-
-.. image:: /Images/Discussion_reportmisuse.png
- :width: 500
- :alt: A post and a response with the "Report" link circled
-
-.. Future: DOC-121 As a course author, I need a template of discussion guidelines to give to students
\ No newline at end of file
diff --git a/lms/djangoapps/branding/__init__.py b/lms/djangoapps/branding/__init__.py
index 945fc6bcc5..afa590552d 100644
--- a/lms/djangoapps/branding/__init__.py
+++ b/lms/djangoapps/branding/__init__.py
@@ -5,6 +5,7 @@ from django.conf import settings
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from microsite_configuration import microsite
 
+
 def get_visible_courses():
     """
     Return the set of CourseDescriptors that should be visible in this branded instance
diff --git a/lms/djangoapps/branding/tests.py b/lms/djangoapps/branding/tests.py
index 0c369e52ee..a18c2afad3 100644
--- a/lms/djangoapps/branding/tests.py
+++ b/lms/djangoapps/branding/tests.py
@@ -33,7 +33,7 @@ class AnonymousIndexPageTest(ModuleStoreTestCase):
         self.factory = RequestFactory()
         self.course = CourseFactory.create(
             days_early_for_beta=5,
-            enrollment_start=datetime.datetime.now(UTC)+datetime.timedelta(days=3),
+            enrollment_start=datetime.datetime.now(UTC) + datetime.timedelta(days=3),
             user_id=self.user.id,
         )
 
diff --git a/lms/djangoapps/branding/views.py b/lms/djangoapps/branding/views.py
index 98b31339fa..249c581070 100644
--- a/lms/djangoapps/branding/views.py
+++ b/lms/djangoapps/branding/views.py
@@ -44,9 +44,10 @@ def index(request):
         # courses in his/her dashboard. Otherwise UX is a bit cryptic.
         # In this case, we want to have the user stay on a course catalog
         # page to make it easier to browse for courses (and register)
-        if microsite.get_value('ALWAYS_REDIRECT_HOMEPAGE_TO_DASHBOARD_FOR_AUTHENTICATED_USER', \
-            settings.FEATURES.get('ALWAYS_REDIRECT_HOMEPAGE_TO_DASHBOARD_FOR_AUTHENTICATED_USER', True)) or \
-            get_course_enrollments(request.user):
+        if microsite.get_value(
+                'ALWAYS_REDIRECT_HOMEPAGE_TO_DASHBOARD_FOR_AUTHENTICATED_USER',
+                settings.FEATURES.get('ALWAYS_REDIRECT_HOMEPAGE_TO_DASHBOARD_FOR_AUTHENTICATED_USER', True)
+        ) or get_course_enrollments(request.user):
 
             return redirect(reverse('dashboard'))
 
diff --git a/lms/djangoapps/bulk_email/forms.py b/lms/djangoapps/bulk_email/forms.py
index 27681e1856..65872f18e0 100644
--- a/lms/djangoapps/bulk_email/forms.py
+++ b/lms/djangoapps/bulk_email/forms.py
@@ -21,6 +21,7 @@ class CourseEmailTemplateForm(forms.ModelForm):  # pylint: disable=R0924
     """Form providing validation of CourseEmail templates."""
 
     name = forms.CharField(required=False)
+
     class Meta:  # pylint: disable=C0111
         model = CourseEmailTemplate
         fields = ('html_template', 'plain_template', 'name')
diff --git a/lms/djangoapps/bulk_email/models.py b/lms/djangoapps/bulk_email/models.py
index 66c4403541..d3ce60d750 100644
--- a/lms/djangoapps/bulk_email/models.py
+++ b/lms/djangoapps/bulk_email/models.py
@@ -130,6 +130,7 @@ class CourseEmail(Email):
         """
         return CourseEmailTemplate.get_template(name=self.template_name)
 
+
 class Optout(models.Model):
     """
     Stores users that have opted out of receiving emails from a course.
diff --git a/lms/djangoapps/certificates/management/commands/fix_ungraded_certs.py b/lms/djangoapps/certificates/management/commands/fix_ungraded_certs.py
index 4492c0dc36..3994012846 100644
--- a/lms/djangoapps/certificates/management/commands/fix_ungraded_certs.py
+++ b/lms/djangoapps/certificates/management/commands/fix_ungraded_certs.py
@@ -13,25 +13,29 @@ class Command(BaseCommand):
     """
 
     option_list = BaseCommand.option_list + (
-        make_option('-n', '--noop',
+        make_option(
+            '-n',
+            '--noop',
             action='store_true',
             dest='noop',
             default=False,
-            help="Print but do not update the GeneratedCertificate table"),
-        make_option('-c', '--course',
+            help="Print but do not update the GeneratedCertificate table"
+        ),
+        make_option(
+            '-c',
+            '--course',
             metavar='COURSE_ID',
             dest='course',
             default=False,
-            help='Grade ungraded users for this course'),
-
-        )
+            help='Grade ungraded users for this course'
+        ),
+    )
 
     def handle(self, *args, **options):
-
         course_id = options['course']
         print "Fetching ungraded students for {0}".format(course_id)
         ungraded = GeneratedCertificate.objects.filter(
-                course_id__exact=course_id).filter(grade__exact='')
+            course_id__exact=course_id).filter(grade__exact='')
         course = courses.get_course_by_id(course_id)
         factory = RequestFactory()
         request = factory.get('/')
diff --git a/lms/djangoapps/certificates/models.py b/lms/djangoapps/certificates/models.py
index 8ec9ccd05e..0b02ed3728 100644
--- a/lms/djangoapps/certificates/models.py
+++ b/lms/djangoapps/certificates/models.py
@@ -49,20 +49,20 @@ Eligibility:
        If the user and course is present in the certificate whitelist table
        then the student will be issued a certificate regardless of his grade,
        unless he has allow_certificate set to False.
-
 """
 
 
 class CertificateStatuses(object):
-    deleted      = 'deleted'
-    deleting     = 'deleting'
+    deleted = 'deleted'
+    deleting = 'deleting'
     downloadable = 'downloadable'
-    error        = 'error'
-    generating   = 'generating'
-    notpassing   = 'notpassing'
+    error = 'error'
+    generating = 'generating'
+    notpassing = 'notpassing'
     regenerating = 'regenerating'
-    restricted   = 'restricted'
-    unavailable  = 'unavailable'
+    restricted = 'restricted'
+    unavailable = 'unavailable'
+
 
 class CertificateWhitelist(models.Model):
     """
@@ -88,7 +88,7 @@ class GeneratedCertificate(models.Model):
     course_id = CourseKeyField(max_length=255, blank=True, default=None)
     verify_uuid = models.CharField(max_length=32, blank=True, default='')
     download_uuid = models.CharField(max_length=32, blank=True, default='')
-    download_url = models.CharField(max_length=128, blank=True,  default='')
+    download_url = models.CharField(max_length=128, blank=True, default='')
     grade = models.CharField(max_length=5, blank=True, default='')
     key = models.CharField(max_length=32, blank=True, default='')
     distinction = models.BooleanField(default=False)
@@ -117,6 +117,7 @@ class GeneratedCertificate(models.Model):
 
         return None
 
+
 def certificate_status_for_student(student, course_id):
     '''
     This returns a dictionary with a key for status, and other information.
diff --git a/lms/djangoapps/certificates/tests/factories.py b/lms/djangoapps/certificates/tests/factories.py
index 3d6d92ef8c..38527f92c4 100644
--- a/lms/djangoapps/certificates/tests/factories.py
+++ b/lms/djangoapps/certificates/tests/factories.py
@@ -4,6 +4,7 @@ from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
 from certificates.models import GeneratedCertificate, CertificateStatuses
 
+
 # Factories don't have __init__ methods, and are self documenting
 # pylint: disable=W0232
 class GeneratedCertificateFactory(DjangoModelFactory):
diff --git a/lms/djangoapps/certificates/views.py b/lms/djangoapps/certificates/views.py
index 7ad5aeb8ef..e2d5f49f5f 100644
--- a/lms/djangoapps/certificates/views.py
+++ b/lms/djangoapps/certificates/views.py
@@ -92,7 +92,6 @@ def update_certificate(request):
                 #  HTTP error (reason=error(32, 'Broken pipe'), filename=None) :
                 #  certificate_agent.py:175
 
-
                 cert.error_reason = xqueue_body['error_reason']
         else:
             if cert.status in [status.generating, status.regenerating]:
@@ -105,10 +104,13 @@ def update_certificate(request):
             else:
                 logger.critical('Invalid state for cert update: {0}'.format(
                     cert.status))
-                return HttpResponse(json.dumps({
-                            'return_code': 1,
-                            'content': 'invalid cert status'}),
-                             mimetype='application/json')
+                return HttpResponse(
+                    json.dumps({
+                        'return_code': 1,
+                        'content': 'invalid cert status'
+                    }),
+                    mimetype='application/json'
+                )
 
         dog_stats_api.increment(XQUEUE_METRIC_NAME, tags=[
             u'action:update_certificate',
diff --git a/lms/djangoapps/class_dashboard/dashboard_data.py b/lms/djangoapps/class_dashboard/dashboard_data.py
index 5a4ba202aa..12af052924 100644
--- a/lms/djangoapps/class_dashboard/dashboard_data.py
+++ b/lms/djangoapps/class_dashboard/dashboard_data.py
@@ -17,6 +17,7 @@ from opaque_keys.edx.locations import Location
 # Used to limit the length of list displayed to the screen.
 MAX_SCREEN_LIST_LENGTH = 250
 
+
 def get_problem_grade_distribution(course_id):
     """
     Returns the grade distribution per problem for the course
diff --git a/lms/djangoapps/course_wiki/tests/test_access.py b/lms/djangoapps/course_wiki/tests/test_access.py
index bc501fa0ee..c4bf9e5091 100644
--- a/lms/djangoapps/course_wiki/tests/test_access.py
+++ b/lms/djangoapps/course_wiki/tests/test_access.py
@@ -9,7 +9,7 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 
 from django.test.utils import override_settings
 from courseware.tests.factories import InstructorFactory, StaffFactory
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 
 from wiki.models import URLPath
 from course_wiki.views import get_or_create_root
@@ -17,7 +17,7 @@ from course_wiki.utils import user_is_article_course_staff, course_wiki_slug
 from course_wiki import settings
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestWikiAccessBase(ModuleStoreTestCase):
     """Base class for testing wiki access."""
     def setUp(self):
@@ -53,7 +53,6 @@ class TestWikiAccessBase(ModuleStoreTestCase):
         ]
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
 class TestWikiAccess(TestWikiAccessBase):
     """Test wiki access for course staff."""
     def setUp(self):
@@ -114,7 +113,6 @@ class TestWikiAccess(TestWikiAccessBase):
             self.assertFalse(user_is_article_course_staff(course_staff, self.wiki_310b.article))
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
 class TestWikiAccessForStudent(TestWikiAccessBase):
     """Test access for students."""
     def setUp(self):
@@ -130,7 +128,6 @@ class TestWikiAccessForStudent(TestWikiAccessBase):
             self.assertFalse(user_is_article_course_staff(self.student, page.article))
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
 class TestWikiAccessForNumericalCourseNumber(TestWikiAccessBase):
     """Test staff has access if course number is numerical and wiki slug has an underscore appended."""
     def setUp(self):
@@ -150,7 +147,6 @@ class TestWikiAccessForNumericalCourseNumber(TestWikiAccessBase):
                 self.assertTrue(user_is_article_course_staff(course_staff, page.article))
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
 class TestWikiAccessForOldFormatCourseStaffGroups(TestWikiAccessBase):
     """Test staff has access if course group has old format."""
     def setUp(self):
diff --git a/lms/djangoapps/course_wiki/tests/test_middleware.py b/lms/djangoapps/course_wiki/tests/test_middleware.py
index d8373407ea..28e548996e 100644
--- a/lms/djangoapps/course_wiki/tests/test_middleware.py
+++ b/lms/djangoapps/course_wiki/tests/test_middleware.py
@@ -10,11 +10,11 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
 from courseware.tests.factories import InstructorFactory
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 from course_wiki.views import get_or_create_root
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestWikiAccessMiddleware(ModuleStoreTestCase):
     """Tests for WikiAccessMiddleware."""
 
diff --git a/lms/djangoapps/course_wiki/tests/tests.py b/lms/djangoapps/course_wiki/tests/tests.py
index d12bdda138..30e57774b1 100644
--- a/lms/djangoapps/course_wiki/tests/tests.py
+++ b/lms/djangoapps/course_wiki/tests/tests.py
@@ -2,21 +2,24 @@ from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
 
 from courseware.tests.tests import LoginEnrollmentTestCase
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
-from xmodule.modulestore.django import modulestore
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
+from xmodule.modulestore.tests.factories import CourseFactory
 
 from mock import patch
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class WikiRedirectTestCase(LoginEnrollmentTestCase):
+    """
+    Tests for wiki course redirection.
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        cls.toy = CourseFactory.create(org='edX', course='toy', display_name='2012_Fall')
 
     def setUp(self):
 
-        # Load the toy course
-        self.toy = modulestore().get_course(SlashSeparatedCourseKey('edX', 'toy', '2012_Fall'))
-
         # Create two accounts
         self.student = 'view@test.com'
         self.instructor = 'view2@test.com'
diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index c29d76e533..93bcbf7c1f 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -8,7 +8,9 @@ import pytz
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
 
-from xmodule.course_module import CourseDescriptor
+from xmodule.course_module import (
+    CourseDescriptor, CATALOG_VISIBILITY_CATALOG_AND_ABOUT,
+    CATALOG_VISIBILITY_ABOUT)
 from xmodule.error_module import ErrorDescriptor
 from xmodule.x_module import XModule
 
@@ -110,6 +112,8 @@ def _has_access_course_desc(user, action, course):
                   ACCESS_REQUIRE_STAFF_FOR_COURSE,
     'see_exists' -- can see that the course exists.
     'staff' -- staff access to course.
+    'see_in_catalog' -- user is able to see the course listed in the course catalog.
+    'see_about_page' -- user is able to see the course about page.
     """
     def can_load():
         """
@@ -204,6 +208,29 @@ def _has_access_course_desc(user, action, course):
 
         return can_enroll() or can_load()
 
+    def can_see_in_catalog():
+        """
+        Implements the "can see course in catalog" logic if a course should be visible in the main course catalog
+        In this case we use the catalog_visibility property on the course descriptor
+        but also allow course staff to see this.
+        """
+        return (
+            course.catalog_visibility == CATALOG_VISIBILITY_CATALOG_AND_ABOUT or
+            _has_staff_access_to_descriptor(user, course, course.id)
+        )
+
+    def can_see_about_page():
+        """
+        Implements the "can see course about page" logic if a course about page should be visible
+        In this case we use the catalog_visibility property on the course descriptor
+        but also allow course staff to see this.
+        """
+        return (
+            course.catalog_visibility == CATALOG_VISIBILITY_CATALOG_AND_ABOUT or
+            course.catalog_visibility == CATALOG_VISIBILITY_ABOUT or
+            _has_staff_access_to_descriptor(user, course, course.id)
+        )
+
     checkers = {
         'load': can_load,
         'load_forum': can_load_forum,
@@ -211,6 +238,8 @@ def _has_access_course_desc(user, action, course):
         'see_exists': see_exists,
         'staff': lambda: _has_staff_access_to_descriptor(user, course, course.id),
         'instructor': lambda: _has_instructor_access_to_descriptor(user, course, course.id),
+        'see_in_catalog': can_see_in_catalog,
+        'see_about_page': can_see_about_page,
     }
 
     return _dispatch(checkers, action, user, course)
diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py
index 27ceb530f3..33b8548067 100644
--- a/lms/djangoapps/courseware/courses.py
+++ b/lms/djangoapps/courseware/courses.py
@@ -16,6 +16,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError
 from static_replace import replace_static_urls
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.x_module import STUDENT_VIEW
+from microsite_configuration import microsite
 
 from courseware.access import has_access
 from courseware.model_data import FieldDataCache
@@ -256,7 +257,7 @@ def get_course_info_section_module(request, course, section_key):
         log_if_not_found=False,
         wrap_xmodule_display=False,
         static_asset_path=course.static_asset_path
-    )    
+    )
 
 def get_course_info_section(request, course, section_key):
     """
@@ -345,7 +346,13 @@ def get_courses(user, domain=None):
     Returns a list of courses available, sorted by course.number
     '''
     courses = branding.get_visible_courses()
-    courses = [c for c in courses if has_access(user, 'see_exists', c)]
+
+    permission_name = microsite.get_value(
+        'COURSE_CATALOG_VISIBILITY_PERMISSION',
+        settings.COURSE_CATALOG_VISIBILITY_PERMISSION
+    )
+
+    courses = [c for c in courses if has_access(user, permission_name, c)]
 
     courses = sorted(courses, key=lambda course: course.number)
 
diff --git a/lms/djangoapps/courseware/features/problems.feature b/lms/djangoapps/courseware/features/problems.feature
index 9f9c03ef30..1faea5eba9 100644
--- a/lms/djangoapps/courseware/features/problems.feature
+++ b/lms/djangoapps/courseware/features/problems.feature
@@ -19,7 +19,7 @@ Feature: LMS.Answer problems
         | multiple choice   |
         | checkbox          |
         | radio             |
-        | string            |
+        #| string            |
         | numerical         |
         | formula           |
         | script            |
@@ -41,7 +41,7 @@ Feature: LMS.Answer problems
         | multiple choice   |
         | checkbox          |
         | radio             |
-        | string            |
+        #| string            |
         | numerical         |
         | formula           |
         | script            |
@@ -62,7 +62,7 @@ Feature: LMS.Answer problems
         | multiple choice   |
         | checkbox          |
         | radio             |
-        | string            |
+        #| string            |
         | numerical         |
         | formula           |
         | script            |
@@ -88,8 +88,8 @@ Feature: LMS.Answer problems
         | checkbox          | incorrect     | always        |
         | radio             | correct       | always        |
         | radio             | incorrect     | always        |
-        | string            | correct       | always        |
-        | string            | incorrect     | always        |
+        #| string            | correct       | always        |
+        #| string            | incorrect     | always        |
         | numerical         | correct       | always        |
         | numerical         | incorrect     | always        |
         | formula           | correct       | always        |
@@ -113,11 +113,10 @@ Feature: LMS.Answer problems
         Examples:
         | ProblemType       | Correctness   | Randomization   |
         | drop down         | incorrect     | never           |
-        | drop down         | incorrect     | never           |
         | multiple choice   | incorrect     | never           |
         | checkbox          | incorrect     | never           |
         | radio             | incorrect     | never           |
-        | string            | incorrect     | never           |
+        #| string            | incorrect     | never           |
         | numerical         | incorrect     | never           |
         | formula           | incorrect     | never           |
         | script            | incorrect     | never           |
@@ -136,7 +135,7 @@ Feature: LMS.Answer problems
         | multiple choice   | correct       | never           |
         | checkbox          | correct       | never           |
         | radio             | correct       | never           |
-        | string            | correct       | never           |
+        #| string            | correct       | never           |
         | numerical         | correct       | never           |
         | formula           | correct       | never           |
         | script            | correct       | never           |
@@ -200,8 +199,8 @@ Feature: LMS.Answer problems
         | checkbox          | incorrect     | 1 point possible    | 1 point possible   |
         | radio             | correct       | 1/1 point           | 1 point possible   |
         | radio             | incorrect     | 1 point possible    | 1 point possible   |
-        | string            | correct       | 1/1 point           | 1 point possible   |
-        | string            | incorrect     | 1 point possible    | 1 point possible   |
+        #| string            | correct       | 1/1 point           | 1 point possible   |
+        #| string            | incorrect     | 1 point possible    | 1 point possible   |
         | numerical         | correct       | 1/1 point           | 1 point possible   |
         | numerical         | incorrect     | 1 point possible    | 1 point possible   |
         | formula           | correct       | 1/1 point           | 1 point possible   |
@@ -228,8 +227,8 @@ Feature: LMS.Answer problems
         | checkbox          | incorrect     | 1 point possible    | 1 point possible   | never         |
         | radio             | correct       | 1/1 point           | 1 point possible   | never         |
         | radio             | incorrect     | 1 point possible    | 1 point possible   | never         |
-        | string            | correct       | 1/1 point           | 1 point possible   | never         |
-        | string            | incorrect     | 1 point possible    | 1 point possible   | never         |
+        #| string            | correct       | 1/1 point           | 1 point possible   | never         |
+        #| string            | incorrect     | 1 point possible    | 1 point possible   | never         |
         | numerical         | correct       | 1/1 point           | 1 point possible   | never         |
         | numerical         | incorrect     | 1 point possible    | 1 point possible   | never         |
         | formula           | correct       | 1/1 point           | 1 point possible   | never         |
@@ -250,7 +249,7 @@ Feature: LMS.Answer problems
         | multiple choice   | 1 point possible   |
         | checkbox          | 1 point possible   |
         | radio             | 1 point possible   |
-        | string            | 1 point possible   |
+        #| string            | 1 point possible   |
         | numerical         | 1 point possible   |
         | formula           | 1 point possible   |
         | script            | 2 points possible  |
@@ -271,8 +270,8 @@ Feature: LMS.Answer problems
         | drop down       | incorrect          | correct          |
         | checkbox        | correct            | incorrect        |
         | checkbox        | incorrect          | correct          |
-        | string          | correct            | incorrect        |
-        | string          | incorrect          | correct          |
+        #| string          | correct            | incorrect        |
+        #| string          | incorrect          | correct          |
         | numerical       | correct            | incorrect        |
         | numerical       | incorrect          | correct          |
         | formula         | correct            | incorrect        |
@@ -314,7 +313,7 @@ Feature: LMS.Answer problems
         | multiple choice   |
         | checkbox          |
         | radio             |
-        | string            |
+        #| string            |
         | numerical         |
         | formula           |
         | script            |
diff --git a/lms/djangoapps/courseware/features/video.py b/lms/djangoapps/courseware/features/video.py
index e7587f612b..889a77b9d1 100644
--- a/lms/djangoapps/courseware/features/video.py
+++ b/lms/djangoapps/courseware/features/video.py
@@ -105,6 +105,7 @@ class RequestHandlerWithSessionId(object):
             return True
         return False
 
+
 def get_metadata(parent_location, player_mode, data, display_name='Video'):
     kwargs = {
         'parent_location': parent_location,
@@ -316,7 +317,7 @@ def reload_the_page_with_video(_step):
 
 @step('youtube stub server (.*) YouTube API')
 def configure_youtube_api(_step, action):
-    action=action.strip()
+    action = action.strip()
     if action == 'proxies':
         world.youtube.config['youtube_api_blocked'] = False
     elif action == 'blocks':
@@ -569,7 +570,7 @@ def video_alignment(_step, transcript_visibility):
 
     set_window_dimensions(300, 600)
     real, expected = get_all_dimensions()
-    width = round(100 * real['width']/expected['width']) == wrapper_width
+    width = round(100 * real['width'] / expected['width']) == wrapper_width
 
     set_window_dimensions(600, 300)
     real, expected = get_all_dimensions()
@@ -659,7 +660,6 @@ def is_hidden_button(_step, button, state):
 def i_see_active_button(_step, button, state):
     selector = VIDEO_BUTTONS[button]
     if state == 'active':
-       assert world.css_has_class(selector, 'active')
+        assert world.css_has_class(selector, 'active')
     else:
-       assert not world.css_has_class(selector, 'active')
-
+        assert not world.css_has_class(selector, 'active')
diff --git a/lms/djangoapps/courseware/management/commands/clean_history.py b/lms/djangoapps/courseware/management/commands/clean_history.py
index 4286e17658..2a3a28592f 100644
--- a/lms/djangoapps/courseware/management/commands/clean_history.py
+++ b/lms/djangoapps/courseware/management/commands/clean_history.py
@@ -160,11 +160,11 @@ class StudentModuleHistoryCleaner(object):
 
         """
         start = self.next_student_module_id
-        for smid in range(start, start+batch_size):
+        for smid in range(start, start + batch_size):
             if smid > self.last_student_module_id:
                 break
             yield smid
-            self.next_student_module_id = smid+1
+            self.next_student_module_id = smid + 1
 
     def get_history_for_student_modules(self, student_module_id):
         """
@@ -177,7 +177,8 @@ class StudentModuleHistoryCleaner(object):
 
         """
         cursor = connection.cursor()
-        cursor.execute("""
+        cursor.execute(
+            """
             SELECT id, created FROM courseware_studentmodulehistory
             WHERE student_module_id = %s
             ORDER BY created, id
@@ -196,7 +197,8 @@ class StudentModuleHistoryCleaner(object):
         """
         assert ids_to_delete
         cursor = connection.cursor()
-        cursor.execute("""
+        cursor.execute(
+            """
             DELETE FROM courseware_studentmodulehistory
             WHERE id IN ({ids})
             """.format(ids=",".join(str(i) for i in ids_to_delete))
diff --git a/lms/djangoapps/courseware/management/commands/clean_xml.py b/lms/djangoapps/courseware/management/commands/clean_xml.py
index bd9bf5e68e..2e87fc5cdf 100644
--- a/lms/djangoapps/courseware/management/commands/clean_xml.py
+++ b/lms/djangoapps/courseware/management/commands/clean_xml.py
@@ -12,7 +12,7 @@ from xmodule.modulestore.xml import XMLModuleStore
 
 
 def traverse_tree(course):
-    '''Load every descriptor in course.  Return bool success value.'''
+    """Load every descriptor in course.  Return bool success value."""
     queue = [course]
     while len(queue) > 0:
         node = queue.pop()
@@ -56,9 +56,11 @@ def import_with_checks(course_dir, verbose=True):
 
     # No default class--want to complain if it doesn't find plugins for any
     # module.
-    modulestore = XMLModuleStore(data_dir,
-                   default_class=None,
-                   course_dirs=course_dirs)
+    modulestore = XMLModuleStore(
+        data_dir,
+        default_class=None,
+        course_dirs=course_dirs
+    )
 
     def str_of_err(tpl):
         (msg, exc_str) = tpl
@@ -83,11 +85,10 @@ def import_with_checks(course_dir, verbose=True):
         print "=" * 40
         print '\n'
 
-
-    #print course
+    # print course
     validators = (
         traverse_tree,
-        )
+    )
 
     print "=" * 40
     print "Running validators..."
@@ -96,7 +97,6 @@ def import_with_checks(course_dir, verbose=True):
         print 'Running {0}'.format(validate.__name__)
         all_ok = validate(course) and all_ok
 
-
     if all_ok:
         print 'Course passes all checks!'
     else:
@@ -105,7 +105,7 @@ def import_with_checks(course_dir, verbose=True):
 
 
 def check_roundtrip(course_dir):
-    '''Check that import->export leaves the course the same'''
+    """Check that import->export leaves the course the same"""
 
     print "====== Roundtrip import ======="
     (ok, course) = import_with_checks(course_dir)
@@ -135,7 +135,6 @@ def clean_xml(course_dir, export_dir, force):
         print "Did NOT export"
 
 
-
 class Command(BaseCommand):
     help = """Imports specified course.xml, validate it, then exports in
     a canonical format.
@@ -145,6 +144,7 @@ Usage: clean_xml PATH-TO-COURSE-DIR PATH-TO-OUTPUT-DIR [force]
 If 'force' is specified as the last argument, exports even if there
 were import errors.
 """
+
     def handle(self, *args, **options):
         n = len(args)
         if n < 2 or n > 3:
diff --git a/lms/djangoapps/courseware/management/commands/export_course.py b/lms/djangoapps/courseware/management/commands/export_course.py
index b5387db378..836c4e0f6f 100644
--- a/lms/djangoapps/courseware/management/commands/export_course.py
+++ b/lms/djangoapps/courseware/management/commands/export_course.py
@@ -72,7 +72,7 @@ def export_course_to_tarfile(course_key, filename):
         course_dir = export_course_to_directory(course_key, tmp_dir)
         compress_directory(course_dir, filename)
     finally:
-        shutil.rmtree(tmp_dir)
+        shutil.rmtree(tmp_dir, ignore_errors=True)
 
 
 def export_course_to_directory(course_key, root_dir):
@@ -83,7 +83,7 @@ def export_course_to_directory(course_key, root_dir):
         raise CommandError("Invalid course_id")
 
     # The safest characters are A-Z, a-z, 0-9, <underscore>, <period> and <hyphen>.
-    # We represent the first four with \w.  
+    # We represent the first four with \w.
     # TODO: Once we support courses with unicode characters, we will need to revisit this.
     replacement_char = u'-'
     course_dir = replacement_char.join([course.id.org, course.id.course, course.id.run])
diff --git a/lms/djangoapps/courseware/management/commands/metadata_to_json.py b/lms/djangoapps/courseware/management/commands/metadata_to_json.py
index a52b7ad5dc..45070bb17b 100644
--- a/lms/djangoapps/courseware/management/commands/metadata_to_json.py
+++ b/lms/djangoapps/courseware/management/commands/metadata_to_json.py
@@ -21,9 +21,11 @@ def import_course(course_dir, verbose=True):
 
     # No default class--want to complain if it doesn't find plugins for any
     # module.
-    modulestore = XMLModuleStore(data_dir,
-                   default_class=None,
-                   course_dirs=course_dirs)
+    modulestore = XMLModuleStore(
+        data_dir,
+        default_class=None,
+        course_dirs=course_dirs
+    )
 
     def str_of_err(tpl):
         (msg, exc_str) = tpl
@@ -89,6 +91,7 @@ Usage: metadata_to_json PATH-TO-COURSE-DIR OUTPUT-PATH
 
 if OUTPUT-PATH isn't given, print to stdout.
 """
+
     def handle(self, *args, **options):
         n = len(args)
         if n < 1 or n > 2:
diff --git a/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py b/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py
index 286ab1bada..433a494c84 100644
--- a/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py
+++ b/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py
@@ -24,8 +24,9 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.modulestore.xml_importer import import_from_xml
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from django.conf import settings
 
-DATA_DIR = 'common/test/data/'
+DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 
 TEST_COURSE_ID = 'edX/simple/2012_Fall'
 
diff --git a/lms/djangoapps/courseware/tests/__init__.py b/lms/djangoapps/courseware/tests/__init__.py
index e0a0d0ee6a..29f07391d5 100644
--- a/lms/djangoapps/courseware/tests/__init__.py
+++ b/lms/djangoapps/courseware/tests/__init__.py
@@ -13,7 +13,7 @@ from django.test.client import Client
 
 from edxmako.shortcuts import render_to_string
 from student.tests.factories import UserFactory, CourseEnrollmentFactory
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 from xblock.field_data import DictFieldData
 from xmodule.tests import get_test_system, get_test_descriptor_system
 from opaque_keys.edx.locations import Location
@@ -24,7 +24,7 @@ from lms.lib.xblock.field_data import LmsFieldData
 from lms.lib.xblock.runtime import quote_slashes
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class BaseTestXmodule(ModuleStoreTestCase):
     """Base class for testing Xmodules with mongo store.
 
diff --git a/lms/djangoapps/courseware/tests/test_about.py b/lms/djangoapps/courseware/tests/test_about.py
index c02ae50c08..bd4cb51013 100644
--- a/lms/djangoapps/courseware/tests/test_about.py
+++ b/lms/djangoapps/courseware/tests/test_about.py
@@ -11,33 +11,56 @@ from django.conf import settings
 
 from .helpers import LoginEnrollmentTestCase
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE, TEST_DATA_MIXED_MODULESTORE
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from student.tests.factories import UserFactory, CourseEnrollmentAllowedFactory
+from course_modes.models import CourseMode
+from student.models import CourseEnrollment
+
+from shoppingcart.models import Order, PaidCourseRegistration
+
+from xmodule.course_module import CATALOG_VISIBILITY_ABOUT, CATALOG_VISIBILITY_NONE
 
 # HTML for registration button
 REG_STR = "<form id=\"class_enroll_form\" method=\"post\" data-remote=\"true\" action=\"/change_enrollment\">"
 SHIB_ERROR_STR = "The currently logged-in user account does not have permission to enroll in this course."
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class AboutTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
+    """
+    Tests about xblock.
+    """
+
     def setUp(self):
         self.course = CourseFactory.create()
         self.about = ItemFactory.create(
             category="about", parent_location=self.course.location,
             data="OOGIE BLOOGIE", display_name="overview"
         )
+        self.course_without_about = CourseFactory.create(catalog_visibility=CATALOG_VISIBILITY_NONE)
+        self.about = ItemFactory.create(
+            category="about", parent_location=self.course_without_about.location,
+            data="WITHOUT ABOUT", display_name="overview"
+        )
+        self.course_with_about = CourseFactory.create(catalog_visibility=CATALOG_VISIBILITY_ABOUT)
+        self.about = ItemFactory.create(
+            category="about", parent_location=self.course_with_about.location,
+            data="WITH ABOUT", display_name="overview"
+        )
 
-    def test_logged_in(self):
-        self.setup_user()
-        url = reverse('about_course', args=[self.course.id.to_deprecated_string()])
-        resp = self.client.get(url)
-        self.assertEqual(resp.status_code, 200)
-        self.assertIn("OOGIE BLOOGIE", resp.content)
+        self.purchase_course = CourseFactory.create(org='MITx', number='buyme', display_name='Course To Buy')
+        self.course_mode = CourseMode(course_id=self.purchase_course.id,
+                                      mode_slug="honor",
+                                      mode_display_name="honor cert",
+                                      min_price=10)
+        self.course_mode.save()
 
     def test_anonymous_user(self):
+        """
+        This test asserts that a non-logged in user can visit the course about page
+        """
         url = reverse('about_course', args=[self.course.id.to_deprecated_string()])
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
@@ -46,7 +69,44 @@ class AboutTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
         # Check that registration button is present
         self.assertIn(REG_STR, resp.content)
 
-    @patch.dict(settings.FEATURES, {'ENABLE_MKTG_SITE': True})    
+    def test_logged_in(self):
+        """
+        This test asserts that a logged-in user can visit the course about page
+        """
+        self.setup_user()
+        url = reverse('about_course', args=[self.course.id.to_deprecated_string()])
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn("OOGIE BLOOGIE", resp.content)
+
+    def test_already_enrolled(self):
+        """
+        Asserts that the end user sees the appropriate messaging
+        when he/she visits the course about page, but is already enrolled
+        """
+        self.setup_user()
+        self.enroll(self.course, True)
+        url = reverse('about_course', args=[self.course.id.to_deprecated_string()])
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn("You are registered for this course", resp.content)
+        self.assertIn("View Courseware", resp.content)
+
+    @override_settings(COURSE_ABOUT_VISIBILITY_PERMISSION="see_about_page")
+    def test_visible_about_page_settings(self):
+        """
+        Verify that the About Page honors the permission settings in the course module
+        """
+        url = reverse('about_course', args=[self.course_with_about.id.to_deprecated_string()])
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn("WITH ABOUT", resp.content)
+
+        url = reverse('about_course', args=[self.course_without_about.id.to_deprecated_string()])
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 404)
+
+    @patch.dict(settings.FEATURES, {'ENABLE_MKTG_SITE': True})
     def test_logged_in_marketing(self):
         self.setup_user()
         url = reverse('about_course', args=[self.course.id.to_deprecated_string()])
@@ -87,7 +147,7 @@ class AboutTestCaseXML(LoginEnrollmentTestCase, ModuleStoreTestCase):
         self.assertIn(self.xml_data, resp.content)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class AboutWithCappedEnrollmentsTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
     """
     This test case will check the About page when a course has a capped enrollment
@@ -137,7 +197,7 @@ class AboutWithCappedEnrollmentsTestCase(LoginEnrollmentTestCase, ModuleStoreTes
         self.assertNotIn(REG_STR, resp.content)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class AboutWithInvitationOnly(ModuleStoreTestCase):
     """
     This test case will check the About page when a course is invitation only.
@@ -184,7 +244,7 @@ class AboutWithInvitationOnly(ModuleStoreTestCase):
 
 
 @patch.dict(settings.FEATURES, {'RESTRICT_ENROLL_BY_REG_METHOD': True})
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class AboutTestCaseShibCourse(LoginEnrollmentTestCase, ModuleStoreTestCase):
     """
     Test cases covering about page behavior for courses that use shib enrollment domain ("shib courses")
@@ -223,7 +283,7 @@ class AboutTestCaseShibCourse(LoginEnrollmentTestCase, ModuleStoreTestCase):
         self.assertIn(REG_STR, resp.content)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class AboutWithClosedEnrollment(ModuleStoreTestCase):
     """
     This test case will check the About page for a course that has enrollment start/end
@@ -257,3 +317,155 @@ class AboutWithClosedEnrollment(ModuleStoreTestCase):
 
         # Check that registration button is not present
         self.assertNotIn(REG_STR, resp.content)
+
+
+@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@patch.dict(settings.FEATURES, {'ENABLE_SHOPPING_CART': True})
+@patch.dict(settings.FEATURES, {'ENABLE_PAID_COURSE_REGISTRATION': True})
+class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
+    """
+    This test class runs through a suite of verifications regarding
+    purchaseable courses
+    """
+    def setUp(self):
+        super(AboutPurchaseCourseTestCase, self).setUp()
+        self.course = CourseFactory.create(org='MITx', number='buyme', display_name='Course To Buy')
+        self._set_ecomm(self.course)
+
+    def _set_ecomm(self, course):
+        """
+        Helper method to turn on ecommerce on the course
+        """
+        course_mode = CourseMode(
+            course_id=course.id,
+            mode_slug="honor",
+            mode_display_name="honor cert",
+            min_price=10,
+        )
+        course_mode.save()
+
+    def test_anonymous_user(self):
+        """
+        Make sure an anonymous user sees the purchase button
+        """
+        url = reverse('about_course', args=[self.course.id.to_deprecated_string()])
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn("Add buyme to Cart ($10)", resp.content)
+
+    def test_logged_in(self):
+        """
+        Make sure a logged in user sees the purchase button
+        """
+        self.setup_user()
+        url = reverse('about_course', args=[self.course.id.to_deprecated_string()])
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn("Add buyme to Cart ($10)", resp.content)
+
+    def test_already_in_cart(self):
+        """
+        This makes sure if a user has this course in the cart, that the expected message
+        appears
+        """
+        self.setup_user()
+        cart = Order.get_cart_for_user(self.user)
+        PaidCourseRegistration.add_to_order(cart, self.course.id)
+
+        url = reverse('about_course', args=[self.course.id.to_deprecated_string()])
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn("This course is in your", resp.content)
+        self.assertNotIn("Add buyme to Cart ($10)", resp.content)
+
+    def test_already_enrolled(self):
+        """
+        This makes sure that the already enrolled message appears for paywalled courses
+        """
+        self.setup_user()
+
+        # note that we can't call self.enroll here since that goes through
+        # the Django student views, which doesn't allow for enrollments
+        # for paywalled courses
+        CourseEnrollment.enroll(self.user, self.course.id)
+
+        url = reverse('about_course', args=[self.course.id.to_deprecated_string()])
+
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn("You are registered for this course", resp.content)
+        self.assertIn("View Courseware", resp.content)
+        self.assertNotIn("Add buyme to Cart ($10)", resp.content)
+
+    def test_closed_enrollment(self):
+        """
+        This makes sure that paywalled courses also honor the registration
+        window
+        """
+        self.setup_user()
+        now = datetime.datetime.now(pytz.UTC)
+        tomorrow = now + datetime.timedelta(days=1)
+        nextday = tomorrow + datetime.timedelta(days=1)
+
+        self.course.enrollment_start = tomorrow
+        self.course.enrollment_end = nextday
+        self.course = self.update_course(self.course, self.user.id)
+
+        url = reverse('about_course', args=[self.course.id.to_deprecated_string()])
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn("Enrollment is Closed", resp.content)
+        self.assertNotIn("Add buyme to Cart ($10)", resp.content)
+
+    def test_invitation_only(self):
+        """
+        This makes sure that the invitation only restirction takes prescendence over
+        any purchase enablements
+        """
+        course = CourseFactory.create(metadata={"invitation_only": True})
+        self._set_ecomm(course)
+        self.setup_user()
+
+        url = reverse('about_course', args=[course.id.to_deprecated_string()])
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn("Enrollment in this course is by invitation only", resp.content)
+
+    def test_enrollment_cap(self):
+        """
+        Make sure that capped enrollments work even with
+        paywalled courses
+        """
+        course = CourseFactory.create(
+            metadata={
+                "max_student_enrollments_allowed": 1,
+                "display_coursenumber": "buyme",
+            }
+        )
+        self._set_ecomm(course)
+
+        self.setup_user()
+        url = reverse('about_course', args=[course.id.to_deprecated_string()])
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn("Add buyme to Cart ($10)", resp.content)
+
+        # note that we can't call self.enroll here since that goes through
+        # the Django student views, which doesn't allow for enrollments
+        # for paywalled courses
+        CourseEnrollment.enroll(self.user, course.id)
+
+        # create a new account since the first account is already registered for the course
+        email = 'foo_second@test.com'
+        password = 'bar'
+        username = 'test_second'
+        self.create_account(username,
+                            email, password)
+        self.activate_user(email)
+        self.login(email, password)
+
+        # Get the about page again and make sure that the page says that the course is full
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn("Course is full", resp.content)
+        self.assertNotIn("Add buyme to Cart ($10)", resp.content)
diff --git a/lms/djangoapps/courseware/tests/test_access.py b/lms/djangoapps/courseware/tests/test_access.py
index aa92ce31d6..928fcb6c26 100644
--- a/lms/djangoapps/courseware/tests/test_access.py
+++ b/lms/djangoapps/courseware/tests/test_access.py
@@ -5,17 +5,19 @@ import mock
 from mock import Mock
 
 from django.test import TestCase
-from django.test.utils import override_settings
 
 from courseware.tests.factories import UserFactory, StaffFactory, InstructorFactory
 from student.tests.factories import AnonymousUserFactory, CourseEnrollmentAllowedFactory
-from courseware.tests.tests import TEST_DATA_MIXED_MODULESTORE
 import pytz
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
+from xmodule.course_module import (
+    CATALOG_VISIBILITY_CATALOG_AND_ABOUT, CATALOG_VISIBILITY_ABOUT,
+    CATALOG_VISIBILITY_NONE)
+
+# pylint: disable=C0111
+# pylint: disable=W0212
 
-# pylint: disable=protected-access
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
 class AccessTestCase(TestCase):
     """
     Tests for the various access controls on the student dashboard
@@ -204,6 +206,43 @@ class AccessTestCase(TestCase):
         """Ensure has_access handles a user being passed as null"""
         access.has_access(None, 'staff', 'global', None)
 
+    def test__catalog_visibility(self):
+        """
+        Tests the catalog visibility tri-states
+        """
+        user = UserFactory.create()
+        course_id = SlashSeparatedCourseKey('edX', 'test', '2012_Fall')
+        staff = StaffFactory.create(course_key=course_id)
+
+        course = Mock(
+            id=course_id,
+            catalog_visibility=CATALOG_VISIBILITY_CATALOG_AND_ABOUT
+        )
+        self.assertTrue(access._has_access_course_desc(user, 'see_in_catalog', course))
+        self.assertTrue(access._has_access_course_desc(user, 'see_about_page', course))
+        self.assertTrue(access._has_access_course_desc(staff, 'see_in_catalog', course))
+        self.assertTrue(access._has_access_course_desc(staff, 'see_about_page', course))
+
+        # Now set visibility to just about page
+        course = Mock(
+            id=SlashSeparatedCourseKey('edX', 'test', '2012_Fall'),
+            catalog_visibility=CATALOG_VISIBILITY_ABOUT
+        )
+        self.assertFalse(access._has_access_course_desc(user, 'see_in_catalog', course))
+        self.assertTrue(access._has_access_course_desc(user, 'see_about_page', course))
+        self.assertTrue(access._has_access_course_desc(staff, 'see_in_catalog', course))
+        self.assertTrue(access._has_access_course_desc(staff, 'see_about_page', course))
+
+        # Now set visibility to none, which means neither in catalog nor about pages
+        course = Mock(
+            id=SlashSeparatedCourseKey('edX', 'test', '2012_Fall'),
+            catalog_visibility=CATALOG_VISIBILITY_NONE
+        )
+        self.assertFalse(access._has_access_course_desc(user, 'see_in_catalog', course))
+        self.assertFalse(access._has_access_course_desc(user, 'see_about_page', course))
+        self.assertTrue(access._has_access_course_desc(staff, 'see_in_catalog', course))
+        self.assertTrue(access._has_access_course_desc(staff, 'see_about_page', course))
+
 
 class UserRoleTestCase(TestCase):
     """
diff --git a/lms/djangoapps/courseware/tests/test_course_survey.py b/lms/djangoapps/courseware/tests/test_course_survey.py
new file mode 100644
index 0000000000..ba79989f76
--- /dev/null
+++ b/lms/djangoapps/courseware/tests/test_course_survey.py
@@ -0,0 +1,157 @@
+"""
+Python tests for the Survey workflows
+"""
+
+from collections import OrderedDict
+
+from django.core.urlresolvers import reverse
+
+from survey.models import SurveyForm
+
+from xmodule.modulestore.tests.factories import CourseFactory
+from courseware.tests.helpers import LoginEnrollmentTestCase
+
+
+class SurveyViewsTests(LoginEnrollmentTestCase):
+    """
+    All tests for the views.py file
+    """
+
+    STUDENT_INFO = [('view@test.com', 'foo')]
+
+    def setUp(self):
+        """
+        Set up the test data used in the specific tests
+        """
+        super(SurveyViewsTests, self).setUp()
+
+        self.test_survey_name = 'TestSurvey'
+        self.test_form = '<input name="field1"></input>'
+
+        self.survey = SurveyForm.create(self.test_survey_name, self.test_form)
+
+        self.student_answers = OrderedDict({
+            u'field1': u'value1',
+            u'field2': u'value2',
+        })
+
+        self.course = CourseFactory.create(
+            course_survey_required=True,
+            course_survey_name=self.test_survey_name
+        )
+
+        self.course_with_bogus_survey = CourseFactory.create(
+            course_survey_required=True,
+            course_survey_name="DoesNotExist"
+        )
+
+        self.course_without_survey = CourseFactory.create()
+
+        # Create student accounts and activate them.
+        for i in range(len(self.STUDENT_INFO)):
+            email, password = self.STUDENT_INFO[i]
+            username = 'u{0}'.format(i)
+            self.create_account(username, email, password)
+            self.activate_user(email)
+
+        email, password = self.STUDENT_INFO[0]
+        self.login(email, password)
+        self.enroll(self.course, True)
+        self.enroll(self.course_without_survey, True)
+        self.enroll(self.course_with_bogus_survey, True)
+
+        self.view_url = reverse('view_survey', args=[self.test_survey_name])
+        self.postback_url = reverse('submit_answers', args=[self.test_survey_name])
+
+    def _assert_survey_redirect(self, course):
+        """
+        Helper method to assert that all known redirect points do redirect as expected
+        """
+        for view_name in ['courseware', 'info', 'progress']:
+            resp = self.client.get(
+                reverse(
+                    view_name,
+                    kwargs={'course_id': unicode(course.id)}
+                )
+            )
+            self.assertRedirects(
+                resp,
+                reverse('course_survey', kwargs={'course_id': unicode(course.id)})
+            )
+
+    def _assert_no_redirect(self, course):
+        """
+        Helper method to asswer that all known conditionally redirect points do
+        not redirect as expected
+        """
+        for view_name in ['courseware', 'info', 'progress']:
+            resp = self.client.get(
+                reverse(
+                    view_name,
+                    kwargs={'course_id': unicode(course.id)}
+                )
+            )
+            self.assertEquals(resp.status_code, 200)
+
+    def test_visiting_course_without_survey(self):
+        """
+        Verifies that going to the courseware which does not have a survey does
+        not redirect to a survey
+        """
+        self._assert_no_redirect(self.course_without_survey)
+
+    def test_visiting_course_with_survey_redirects(self):
+        """
+        Verifies that going to the courseware with an unanswered survey, redirects to the survey
+        """
+        self._assert_survey_redirect(self.course)
+
+    def test_visiting_course_with_existing_answers(self):
+        """
+        Verifies that going to the courseware with an answered survey, there is no redirect
+        """
+        resp = self.client.post(
+            self.postback_url,
+            self.student_answers
+        )
+        self.assertEquals(resp.status_code, 200)
+
+        self._assert_no_redirect(self.course)
+
+    def test_visiting_course_with_bogus_survey(self):
+        """
+        Verifies that going to the courseware with a required, but non-existing survey, does not redirect
+        """
+        self._assert_no_redirect(self.course_with_bogus_survey)
+
+    def test_visiting_survey_with_bogus_survey_name(self):
+        """
+        Verifies that going to the courseware with a required, but non-existing survey, does not redirect
+        """
+
+        resp = self.client.get(
+            reverse(
+                'course_survey',
+                kwargs={'course_id': unicode(self.course_with_bogus_survey.id)}
+            )
+        )
+        self.assertRedirects(
+            resp,
+            reverse('info', kwargs={'course_id': unicode(self.course_with_bogus_survey.id)})
+        )
+
+    def test_visiting_survey_with_no_course_survey(self):
+        """
+        Verifies that going to the courseware with a required, but non-existing survey, does not redirect
+        """
+
+        resp = self.client.get(
+            reverse(
+                'course_survey',
+                kwargs={'course_id': unicode(self.course_without_survey.id)}
+            )
+        )
+        self.assertRedirects(
+            resp,
+            reverse('info', kwargs={'course_id': unicode(self.course_without_survey.id)})
+        )
diff --git a/lms/djangoapps/courseware/tests/test_lti_integration.py b/lms/djangoapps/courseware/tests/test_lti_integration.py
index 43b673cfee..03b9e576c4 100644
--- a/lms/djangoapps/courseware/tests/test_lti_integration.py
+++ b/lms/djangoapps/courseware/tests/test_lti_integration.py
@@ -21,6 +21,7 @@ from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
 from courseware.views import get_course_lti_endpoints
 from lms.lib.xblock.runtime import quote_slashes
 
+
 class TestLTI(BaseTestXmodule):
     """
     Integration test for lti xmodule.
@@ -107,7 +108,7 @@ class TestLTI(BaseTestXmodule):
             old_parsed[u'OAuth oauth_nonce'] = mocked_nonce
             old_parsed[u'oauth_timestamp'] = mocked_timestamp
             old_parsed[u'oauth_signature'] = mocked_signature_after_sign
-            headers[u'Authorization'] = ', '.join([k+'="'+v+'"' for k, v in old_parsed.items()])
+            headers[u'Authorization'] = ', '.join([k + '="' + v + '"' for k, v in old_parsed.items()])
             return None, headers, None
 
         patcher = mock.patch.object(oauthlib.oauth1.Client, "sign", mocked_sign)
diff --git a/lms/djangoapps/courseware/tests/test_microsites.py b/lms/djangoapps/courseware/tests/test_microsites.py
index 8f58828cb5..2f34de8e14 100644
--- a/lms/djangoapps/courseware/tests/test_microsites.py
+++ b/lms/djangoapps/courseware/tests/test_microsites.py
@@ -11,6 +11,8 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from helpers import LoginEnrollmentTestCase
 from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
 
+from xmodule.course_module import (
+    CATALOG_VISIBILITY_CATALOG_AND_ABOUT, CATALOG_VISIBILITY_NONE)
 
 @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
 class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase):
@@ -42,6 +44,20 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase):
 
         self.course_outside_microsite = CourseFactory.create(display_name='Robot_Course_Outside_Microsite', org='FooX')
 
+        # have a course which explicitly sets visibility in catalog to False
+        self.course_hidden_visibility = CourseFactory.create(
+            display_name='Hidden_course',
+            org='TestMicrositeX',
+            catalog_visibility=CATALOG_VISIBILITY_NONE,
+        )
+
+        # have a course which explicitly sets visibility in catalog and about to true
+        self.course_with_visibility = CourseFactory.create(
+            display_name='visible_course',
+            org='TestMicrositeX',
+            catalog_visibility=CATALOG_VISIBILITY_CATALOG_AND_ABOUT,
+        )
+
     def setup_users(self):
         # Create student accounts and activate them.
         for i in range(len(self.STUDENT_INFO)):
@@ -71,9 +87,15 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase):
         # assert that test course display name is visible
         self.assertContains(resp, 'Robot_Super_Course')
 
+        # assert that test course with 'visible_in_catalog' to True is showing up
+        self.assertContains(resp, 'visible_course')
+
         # assert that test course that is outside microsite is not visible
         self.assertNotContains(resp, 'Robot_Course_Outside_Microsite')
 
+        # assert that a course that has visible_in_catalog=False is not visible
+        self.assertNotContains(resp, 'Hidden_course')
+
         # assert that footer template has been properly overriden on homepage
         self.assertContains(resp, 'This is a Test Microsite footer')
 
@@ -153,3 +175,17 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase):
         resp = self.client.get(reverse('dashboard'))
         self.assertNotContains(resp, 'Robot_Super_Course')
         self.assertContains(resp, 'Robot_Course_Outside_Microsite')
+
+    @override_settings(SITE_NAME=settings.MICROSITE_TEST_HOSTNAME)
+    def test_visible_about_page_settings(self):
+        """
+        Make sure the Microsite is honoring the visible_about_page permissions that is
+        set in configuration
+        """
+        url = reverse('about_course', args=[self.course_with_visibility.id.to_deprecated_string()])
+        resp = self.client.get(url, HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME)
+        self.assertEqual(resp.status_code, 200)
+
+        url = reverse('about_course', args=[self.course_hidden_visibility.id.to_deprecated_string()])
+        resp = self.client.get(url, HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME)
+        self.assertEqual(resp.status_code, 404)
diff --git a/lms/djangoapps/courseware/tests/test_model_data.py b/lms/djangoapps/courseware/tests/test_model_data.py
index b9bc5b2f6a..185806411f 100644
--- a/lms/djangoapps/courseware/tests/test_model_data.py
+++ b/lms/djangoapps/courseware/tests/test_model_data.py
@@ -18,7 +18,7 @@ from courseware.tests.factories import StudentPrefsFactory, StudentInfoFactory
 from xblock.fields import Scope, BlockScope, ScopeIds
 from django.test import TestCase
 from django.db import DatabaseError
-from xblock.core import KeyValueMultiSaveError
+from xblock.exceptions import KeyValueMultiSaveError
 
 
 def mock_field(scope, name):
diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py
index cc500dd4b4..7de4d93108 100644
--- a/lms/djangoapps/courseware/tests/test_module_render.py
+++ b/lms/djangoapps/courseware/tests/test_module_render.py
@@ -17,6 +17,7 @@ from capa.tests.response_xml_factory import OptionResponseXMLFactory
 from xblock.field_data import FieldData
 from xblock.runtime import Runtime
 from xblock.fields import ScopeIds
+from xblock.core import XBlock
 from xmodule.lti_module import LTIDescriptor
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -41,6 +42,14 @@ from lms.lib.xblock.runtime import quote_slashes
 from xmodule.modulestore import ModuleStoreEnum
 
 
+class PureXBlock(XBlock):
+    """
+    Pure XBlock to use in tests.
+    """
+    pass
+
+
+@ddt.ddt
 @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
 class ModuleRenderTestCase(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
@@ -161,6 +170,17 @@ class ModuleRenderTestCase(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertEquals(403, response.status_code)
         self.assertEquals('Unauthenticated', response.content)
 
+    @ddt.data('pure', 'vertical')
+    @XBlock.register_temp_plugin(PureXBlock, identifier='pure')
+    def test_rebinding_same_user(self, block_type):
+        request = self.request_factory.get('')
+        request.user = self.mock_user
+        course = CourseFactory()
+        descriptor = ItemFactory(category=block_type, parent=course)
+        field_data_cache = FieldDataCache([self.toy_course, descriptor], self.toy_course.id, self.mock_user)
+        render.get_module_for_descriptor(self.mock_user, request, descriptor, field_data_cache, self.toy_course.id)
+        render.get_module_for_descriptor(self.mock_user, request, descriptor, field_data_cache, self.toy_course.id)
+
 
 @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
 class TestHandleXBlockCallback(ModuleStoreTestCase, LoginEnrollmentTestCase):
@@ -364,7 +384,7 @@ class TestTOC(ModuleStoreTestCase):
                             'format': '', 'due': None, 'active': False}],
                           'url_name': 'secret:magic', 'display_name': 'secret:magic'}])
 
-            with check_mongo_calls(toc_finds, 0):
+            with check_mongo_calls(toc_finds):
                 actual = render.toc_for_course(
                     self.request.user, self.request, self.toy_course, self.chapter, None, self.field_data_cache
                 )
@@ -403,7 +423,7 @@ class TestTOC(ModuleStoreTestCase):
                             'format': '', 'due': None, 'active': False}],
                           'url_name': 'secret:magic', 'display_name': 'secret:magic'}])
 
-            with check_mongo_calls(toc_finds, 0):
+            with check_mongo_calls(toc_finds):
                 actual = render.toc_for_course(self.request.user, self.request, self.toy_course, self.chapter, section, self.field_data_cache)
             for toc_section in expected:
                 self.assertIn(toc_section, actual)
diff --git a/lms/djangoapps/courseware/tests/test_registration_extra_vars.py b/lms/djangoapps/courseware/tests/test_registration_extra_vars.py
index 35730e89da..174ec66440 100644
--- a/lms/djangoapps/courseware/tests/test_registration_extra_vars.py
+++ b/lms/djangoapps/courseware/tests/test_registration_extra_vars.py
@@ -10,6 +10,7 @@ from mock import patch
 from bs4 import BeautifulSoup
 from django.utils import translation
 
+
 class TestSortedCountryList(TestCase):
     """
     Test that country list is always sorted alphabetically
@@ -48,7 +49,7 @@ class TestSortedCountryList(TestCase):
         self.assertLess(options[1].text, options[10].text)
 
     @patch.dict(settings.REGISTRATION_EXTRA_FIELDS, {'country': 'required'})
-    def test_country_sorting_french (self):
+    def test_country_sorting_french(self):
         """
         Test that country list is always sorted alphabetically in French
         """
@@ -73,7 +74,8 @@ class TestSortedCountryList(TestCase):
             self.assertLess(af_index, us_index)
             # testing two option elements to be in alphabetical order
             self.assertLess(options[1].text, options[10].text)
-        
+
+
 class TestExtraRegistrationVariables(TestCase):
     """
     Test that extra registration variables are properly checked according to settings
diff --git a/lms/djangoapps/courseware/tests/test_video_handlers.py b/lms/djangoapps/courseware/tests/test_video_handlers.py
index b8203b5f8d..8fee82ed05 100644
--- a/lms/djangoapps/courseware/tests/test_video_handlers.py
+++ b/lms/djangoapps/courseware/tests/test_video_handlers.py
@@ -58,6 +58,7 @@ def _check_asset(location, asset_name):
     else:
         return True
 
+
 def _clear_assets(location):
     """
     Clear all assets for location.
@@ -154,6 +155,7 @@ class TestVideo(BaseTestXmodule):
     def tearDown(self):
         _clear_assets(self.item_descriptor.location)
 
+
 class TestTranscriptAvailableTranslationsDispatch(TestVideo):
     """
     Test video handler that provide available translations info.
@@ -336,8 +338,9 @@ class TestTranscriptTranslationGetDispatch(TestVideo):
             u'end': [100],
             u'start': [12],
             u'text': [
-            u'\u041f\u0440\u0438\u0432\u0456\u0442, edX \u0432\u0456\u0442\u0430\u0454 \u0432\u0430\u0441.'
-        ]}
+                u'\u041f\u0440\u0438\u0432\u0456\u0442, edX \u0432\u0456\u0442\u0430\u0454 \u0432\u0430\u0441.'
+            ]
+        }
         self.non_en_file.seek(0)
         _upload_file(self.non_en_file, self.item_descriptor.location, os.path.split(self.non_en_file.name)[1])
         subs_id = _get_subs_id(self.non_en_file.name)
@@ -580,7 +583,7 @@ class TestStudioTranscriptTranslationPostDispatch(TestVideo):
         # No language is passed.
         request = Request.blank('/translation', POST={'file': ('filename', SRT_content)})
         response = self.item_descriptor.studio_transcript(request=request, dispatch='translation')
-        self.assertEqual(response.status,  '400 Bad Request')
+        self.assertEqual(response.status, '400 Bad Request')
 
         # Language, good filename and good content.
         request = Request.blank('/translation/uk', POST={'file': ('filename.srt', SRT_content)})
diff --git a/lms/djangoapps/courseware/tests/test_video_mongo.py b/lms/djangoapps/courseware/tests/test_video_mongo.py
index 60ae01fda7..50d2a6f134 100644
--- a/lms/djangoapps/courseware/tests/test_video_mongo.py
+++ b/lms/djangoapps/courseware/tests/test_video_mongo.py
@@ -372,7 +372,6 @@ class TestGetHtmlMethod(BaseTestXmodule):
                 self.item_descriptor.xmodule_runtime.render_template('video.html', expected_context)
             )
 
-
     def test_get_html_with_non_existant_edx_video_id(self):
         """
         Tests the VideoModule get_html where a edx_video_id is given but a video is not found
@@ -395,7 +394,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
             <source src="example.mp4"/>
             <source src="example.webm"/>
             """,
-            'edx_video_id':"meow",
+            'edx_video_id': "meow",
             'result': {
                 'download_video_link': u'example_source.mp4',
                 'sources': json.dumps([u'example.mp4', u'example.webm']),
@@ -416,7 +415,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
     @mock.patch('edxval.api.get_video_info')
     def test_get_html_with_mocked_edx_video_id(self, mock_get_video_info):
         mock_get_video_info.return_value = {
-            'url' : '/edxval/video/example',
+            'url': '/edxval/video/example',
             'edx_video_id': u'example',
             'duration': 111.0,
             'client_video_id': u'The example video',
@@ -556,7 +555,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
                 <source src="example.mp4"/>
                 <source src="example.webm"/>
             """,
-            'edx_video_id':"thundercats",
+            'edx_video_id': "thundercats",
             'result': {
                 'download_video_link': u'http://fake-video.edx.org/thundercats.mp4',
                 'sources': json.dumps([u'example.mp4', u'example.webm']),
@@ -624,8 +623,8 @@ class TestGetHtmlMethod(BaseTestXmodule):
         """
         def side_effect(*args, **kwargs):
             cdn = {
-            'http://example.com/example.mp4': 'http://cdn_example.com/example.mp4',
-            'http://example.com/example.webm': 'http://cdn_example.com/example.webm',
+                'http://example.com/example.mp4': 'http://cdn_example.com/example.mp4',
+                'http://example.com/example.webm': 'http://cdn_example.com/example.webm',
             }
             return cdn.get(args[1])
 
@@ -717,7 +716,6 @@ class TestGetHtmlMethod(BaseTestXmodule):
                 self.item_descriptor.xmodule_runtime.render_template('video.html', expected_context)
             )
 
-
     @patch('xmodule.video_module.video_module.get_video_from_cdn')
     def test_get_html_cdn_source(self, mocked_get_video):
         """
@@ -725,8 +723,8 @@ class TestGetHtmlMethod(BaseTestXmodule):
         """
         def side_effect(*args, **kwargs):
             cdn = {
-            'http://example.com/example.mp4': 'http://cdn_example.com/example.mp4',
-            'http://example.com/example.webm': 'http://cdn_example.com/example.webm',
+                'http://example.com/example.mp4': 'http://cdn_example.com/example.mp4',
+                'http://example.com/example.webm': 'http://cdn_example.com/example.webm',
             }
             return cdn.get(args[1])
 
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 520c2f7db4..6cb05bd0a9 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -55,6 +55,11 @@ from microsite_configuration import microsite
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from instructor.enrollment import uses_shib
 
+from util.db import commit_on_success_with_read_committed
+
+import survey.utils
+import survey.views
+
 from util.views import ensure_valid_course_key
 log = logging.getLogger("edx.courseware")
 
@@ -248,6 +253,7 @@ def chat_settings(course, user):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @ensure_valid_course_key
+@commit_on_success_with_read_committed
 def index(request, course_id, chapter=None, section=None,
           position=None):
     """
@@ -301,6 +307,7 @@ def index(request, course_id, chapter=None, section=None,
 
 def _index_bulk_op(request, user, course_key, chapter, section, position):
     course = get_course_with_access(user, 'load', course_key, depth=2)
+
     staff_access = has_access(user, 'staff', course)
     registered = registered_for_course(course, user)
     if not registered:
@@ -308,6 +315,11 @@ def _index_bulk_op(request, user, course_key, chapter, section, position):
         log.debug(u'User %s tried to view course %s but is not enrolled', user, course.location.to_deprecated_string())
         return redirect(reverse('about_course', args=[course_key.to_deprecated_string()]))
 
+    # check to see if there is a required survey that must be taken before
+    # the user can access the course.
+    if survey.utils.must_answer_survey(course, user):
+        return redirect(reverse('course_survey', args=[unicode(course.id)]))
+
     masq = setup_masquerade(request, staff_access)
 
     try:
@@ -571,6 +583,12 @@ def course_info(request, course_id):
 
     with modulestore().bulk_operations(course_key):
         course = get_course_with_access(request.user, 'load', course_key)
+
+        # check to see if there is a required survey that must be taken before
+        # the user can access the course.
+        if survey.utils.must_answer_survey(course, request.user):
+            return redirect(reverse('course_survey', args=[unicode(course.id)]))
+
         staff_access = has_access(request.user, 'staff', course)
         masq = setup_masquerade(request, staff_access)    # allow staff to toggle masquerade on info page
         reverifications = fetch_reverify_banner_info(request, course_key)
@@ -683,7 +701,12 @@ def course_about(request, course_id):
     """
 
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
-    course = get_course_with_access(request.user, 'see_exists', course_key)
+
+    permission_name = microsite.get_value(
+        'COURSE_ABOUT_VISIBILITY_PERMISSION',
+        settings.COURSE_ABOUT_VISIBILITY_PERMISSION
+    )
+    course = get_course_with_access(request.user, permission_name, course_key)
 
     if microsite.get_value(
         'ENABLE_MKTG_SITE',
@@ -692,6 +715,7 @@ def course_about(request, course_id):
         return redirect(reverse('info', args=[course.id.to_deprecated_string()]))
 
     registered = registered_for_course(course, request.user)
+
     staff_access = has_access(request.user, 'staff', course)
     studio_url = get_studio_url(course, 'settings/details')
 
@@ -764,8 +788,12 @@ def mktg_course_about(request, course_id):
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
 
     try:
-        course = get_course_with_access(request.user, 'see_exists', course_key)
-    except (ValueError, Http404) as e:
+        permission_name = microsite.get_value(
+            'COURSE_ABOUT_VISIBILITY_PERMISSION',
+            settings.COURSE_ABOUT_VISIBILITY_PERMISSION
+        )
+        course = get_course_with_access(request.user, permission_name, course_key)
+    except (ValueError, Http404):
         # if a course does not exist yet, display a coming
         # soon button
         return render_to_response(
@@ -836,6 +864,12 @@ def _progress(request, course_key, student_id):
     Course staff are allowed to see the progress of students in their class.
     """
     course = get_course_with_access(request.user, 'load', course_key, depth=None, check_if_enrolled=True)
+
+    # check to see if there is a required survey that must be taken before
+    # the user can access the course.
+    if survey.utils.must_answer_survey(course, request.user):
+        return redirect(reverse('course_survey', args=[unicode(course.id)]))
+
     staff_access = has_access(request.user, 'staff', course)
 
     if student_id is None or student_id == request.user.id:
@@ -1059,3 +1093,30 @@ def get_course_lti_endpoints(request, course_id):
     ]
 
     return HttpResponse(json.dumps(endpoints), content_type='application/json')
+
+
+@login_required
+def course_survey(request, course_id):
+    """
+    URL endpoint to present a survey that is associated with a course_id
+    Note that the actual implementation of course survey is handled in the
+    views.py file in the Survey Djangoapp
+    """
+
+    course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
+    course = get_course_with_access(request.user, 'load', course_key)
+
+    redirect_url = reverse('info', args=[course_id])
+
+    # if there is no Survey associated with this course,
+    # then redirect to the course instead
+    if not course.course_survey_name:
+        return redirect(redirect_url)
+
+    return survey.views.view_student_survey(
+        request.user,
+        course.course_survey_name,
+        course=course,
+        redirect_url=redirect_url,
+        is_required=course.course_survey_required,
+    )
diff --git a/lms/djangoapps/dashboard/tests/test_sysadmin.py b/lms/djangoapps/dashboard/tests/test_sysadmin.py
index d2ad4a9280..7d3ee10225 100644
--- a/lms/djangoapps/dashboard/tests/test_sysadmin.py
+++ b/lms/djangoapps/dashboard/tests/test_sysadmin.py
@@ -19,7 +19,7 @@ from django.utils.timezone import utc as UTC
 from util.date_utils import get_time_display, DEFAULT_DATE_TIME_FORMAT
 
 from student.roles import CourseStaffRole, GlobalStaff
-from courseware.tests.modulestore_config import TEST_DATA_XML_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_DIR
 from dashboard.models import CourseImportLog
 from dashboard.sysadmin import Users
 from dashboard.git_import import GitImportError
@@ -31,6 +31,9 @@ from xmodule.modulestore.xml import XMLModuleStore
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from xmodule.modulestore.tests.mongo_connection import MONGO_PORT_NUM, MONGO_HOST
 
+from xmodule.modulestore.tests.django_utils import xml_store_config
+TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR, ['empty'])
+
 
 TEST_MONGODB_LOG = {
     'host': MONGO_HOST,
diff --git a/lms/djangoapps/django_comment_client/base/tests.py b/lms/djangoapps/django_comment_client/base/tests.py
index 5c3d06b682..55753411fb 100644
--- a/lms/djangoapps/django_comment_client/base/tests.py
+++ b/lms/djangoapps/django_comment_client/base/tests.py
@@ -10,7 +10,7 @@ from mock import patch, ANY, Mock
 from nose.tools import assert_true, assert_equal  # pylint: disable=E0611
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 from django_comment_client.base import views
 from django_comment_client.tests.group_id import CohortedTopicGroupIdTestMixin, NonCohortedTopicGroupIdTestMixin, GroupIdAssertionMixin
 from django_comment_client.tests.utils import CohortedContentTestCase
@@ -27,6 +27,8 @@ log = logging.getLogger(__name__)
 
 CS_PREFIX = "http://localhost:4567/api/v1"
 
+# pylint: disable=C0111
+
 
 class MockRequestSetupMixin(object):
     def _create_response_mock(self, data):
@@ -160,7 +162,7 @@ class ThreadActionGroupIdTestCase(
         )
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 @patch('lms.lib.comment_client.utils.requests.request')
 class ViewsTestCase(UrlResetMixin, ModuleStoreTestCase, MockRequestSetupMixin):
 
@@ -748,7 +750,7 @@ class ViewsTestCase(UrlResetMixin, ModuleStoreTestCase, MockRequestSetupMixin):
 
 
 @patch("lms.lib.comment_client.utils.requests.request")
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class ViewPermissionsTestCase(UrlResetMixin, ModuleStoreTestCase, MockRequestSetupMixin):
     @patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
     def setUp(self):
@@ -842,7 +844,7 @@ class ViewPermissionsTestCase(UrlResetMixin, ModuleStoreTestCase, MockRequestSet
         self.assertEqual(response.status_code, 200)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class CreateThreadUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, MockRequestSetupMixin):
     def setUp(self):
         self.course = CourseFactory.create()
@@ -864,7 +866,7 @@ class CreateThreadUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, MockReq
         self.assertEqual(mock_request.call_args[1]["data"]["title"], text)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class UpdateThreadUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, MockRequestSetupMixin):
     def setUp(self):
         self.course = CourseFactory.create()
@@ -892,7 +894,7 @@ class UpdateThreadUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, MockReq
         self.assertEqual(mock_request.call_args[1]["data"]["commentable_id"], "test_commentable")
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class CreateCommentUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, MockRequestSetupMixin):
     def setUp(self):
         self.course = CourseFactory.create()
@@ -915,7 +917,7 @@ class CreateCommentUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, MockRe
         self.assertEqual(mock_request.call_args[1]["data"]["body"], text)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class UpdateCommentUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, MockRequestSetupMixin):
     def setUp(self):
         self.course = CourseFactory.create()
@@ -939,7 +941,7 @@ class UpdateCommentUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, MockRe
         self.assertEqual(mock_request.call_args[1]["data"]["body"], text)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class CreateSubCommentUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, MockRequestSetupMixin):
     def setUp(self):
         self.course = CourseFactory.create()
@@ -963,7 +965,7 @@ class CreateSubCommentUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, Moc
         self.assertEqual(mock_request.call_args[1]["data"]["body"], text)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class UsersEndpointTestCase(ModuleStoreTestCase, MockRequestSetupMixin):
 
     def set_post_counts(self, mock_request, threads_count=1, comments_count=1):
diff --git a/lms/djangoapps/django_comment_client/forum/tests.py b/lms/djangoapps/django_comment_client/forum/tests.py
index 5dedd84a1e..7855271be0 100644
--- a/lms/djangoapps/django_comment_client/forum/tests.py
+++ b/lms/djangoapps/django_comment_client/forum/tests.py
@@ -7,7 +7,7 @@ from django.test.client import Client, RequestFactory
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from student.tests.factories import UserFactory, CourseEnrollmentFactory
 from edxmako.tests import mako_middleware_process_request
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, mixed_store_config
 from django.core.urlresolvers import reverse
 from util.testing import UrlResetMixin
 from django_comment_client.tests.group_id import (
@@ -19,17 +19,21 @@ from django_comment_client.tests.utils import CohortedContentTestCase
 from django_comment_client.forum import views
 from django_comment_client.utils import strip_none
 
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_DIR
 from courseware.courses import UserNotEnrolled
 from nose.tools import assert_true  # pylint: disable=E0611
 from mock import patch, Mock, ANY, call
 
 from course_groups.models import CourseUserGroup
 
+TEST_DATA_MONGO_MODULESTORE = mixed_store_config(TEST_DATA_DIR, {}, include_xml=False)
+
 log = logging.getLogger(__name__)
 
+# pylint: disable=C0111
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class ViewsExceptionTestCase(UrlResetMixin, ModuleStoreTestCase):
 
     @patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
@@ -167,7 +171,7 @@ class PartialDictMatcher(object):
         ])
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 @patch('requests.request')
 class SingleThreadTestCase(ModuleStoreTestCase):
     def setUp(self):
@@ -276,7 +280,7 @@ class SingleThreadTestCase(ModuleStoreTestCase):
         )
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 @patch('requests.request')
 class SingleCohortedThreadTestCase(CohortedContentTestCase):
     def _create_mock_cohorted_thread(self, mock_request):
@@ -768,7 +772,7 @@ class FollowedThreadsDiscussionGroupIdTestCase(CohortedContentTestCase, Cohorted
         )
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class InlineDiscussionTestCase(ModuleStoreTestCase):
     def setUp(self):
         self.course = CourseFactory.create(org="TestX", number="101", display_name="Test Course")
@@ -798,7 +802,7 @@ class InlineDiscussionTestCase(ModuleStoreTestCase):
         self.assertEqual(response_data["discussion_data"][0]["courseware_title"], expected_courseware_title)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 @patch('requests.request')
 class UserProfileTestCase(ModuleStoreTestCase):
 
@@ -910,7 +914,7 @@ class UserProfileTestCase(ModuleStoreTestCase):
         self.assertEqual(response.status_code, 405)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 @patch('requests.request')
 class CommentsServiceRequestHeadersTestCase(UrlResetMixin, ModuleStoreTestCase):
     @patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
@@ -971,7 +975,7 @@ class CommentsServiceRequestHeadersTestCase(UrlResetMixin, ModuleStoreTestCase):
         self.assert_all_calls_have_header(mock_request, "X-Edx-Api-Key", "test_api_key")
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class InlineDiscussionUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin):
     def setUp(self):
         self.course = CourseFactory.create()
@@ -991,7 +995,7 @@ class InlineDiscussionUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin):
         self.assertEqual(response_data["discussion_data"][0]["body"], text)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class ForumFormDiscussionUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin):
     def setUp(self):
         self.course = CourseFactory.create()
@@ -1011,7 +1015,8 @@ class ForumFormDiscussionUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin):
         self.assertEqual(response_data["discussion_data"][0]["title"], text)
         self.assertEqual(response_data["discussion_data"][0]["body"], text)
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class ForumDiscussionSearchUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin):
     def setUp(self):
         self.course = CourseFactory.create()
@@ -1035,7 +1040,8 @@ class ForumDiscussionSearchUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin
         self.assertEqual(response_data["discussion_data"][0]["title"], text)
         self.assertEqual(response_data["discussion_data"][0]["body"], text)
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class SingleThreadUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin):
     def setUp(self):
         self.course = CourseFactory.create()
@@ -1057,7 +1063,7 @@ class SingleThreadUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin):
         self.assertEqual(response_data["content"]["body"], text)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class UserProfileUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin):
     def setUp(self):
         self.course = CourseFactory.create()
@@ -1078,7 +1084,7 @@ class UserProfileUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin):
         self.assertEqual(response_data["discussion_data"][0]["body"], text)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class FollowedThreadsUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin):
     def setUp(self):
         self.course = CourseFactory.create()
@@ -1099,7 +1105,7 @@ class FollowedThreadsUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin):
         self.assertEqual(response_data["discussion_data"][0]["body"], text)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class EnrollmentTestCase(ModuleStoreTestCase):
     """
     Tests for the behavior of views depending on if the student is enrolled
diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index 5aba64ac1d..04c7e505eb 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -39,6 +39,7 @@ def _attr_safe_json(obj):
     """
     return saxutils.escape(json.dumps(obj), {'"': '&quot;'})
 
+
 @newrelic.agent.function_trace()
 def make_course_settings(course):
     """
@@ -56,6 +57,7 @@ def make_course_settings(course):
 
     return obj
 
+
 @newrelic.agent.function_trace()
 def get_threads(request, course_key, discussion_id=None, per_page=THREADS_PER_PAGE):
     """
@@ -156,6 +158,7 @@ def inline_discussion(request, course_id, discussion_id):
         'course_settings': make_course_settings(course)
     })
 
+
 @login_required
 def forum_form_discussion(request, course_id):
     """
@@ -212,7 +215,7 @@ def forum_form_discussion(request, course_id):
             'roles': _attr_safe_json(utils.get_role_ids(course_key)),
             'is_moderator': cached_has_permission(request.user, "see_all_cohorts", course_key),
             'cohorts': course_settings["cohorts"],  # still needed to render _thread_list_template
-            'user_cohort': user_cohort_id, # read from container in NewPostView
+            'user_cohort': user_cohort_id,  # read from container in NewPostView
             'is_course_cohorted': is_course_cohorted(course_key),  # still needed to render _thread_list_template
             'sort_preference': user.default_sort_key,
             'category_map': course_settings["category_map"],
@@ -314,6 +317,7 @@ def single_thread(request, course_id, discussion_id, thread_id):
         }
         return render_to_response('discussion/index.html', context)
 
+
 @require_GET
 @login_required
 def user_profile(request, course_id, user_id):
diff --git a/lms/djangoapps/django_comment_client/helpers.py b/lms/djangoapps/django_comment_client/helpers.py
index ce5f4d74a8..c0f7d751e0 100644
--- a/lms/djangoapps/django_comment_client/helpers.py
+++ b/lms/djangoapps/django_comment_client/helpers.py
@@ -9,12 +9,16 @@ def include_mustache_templates():
 
     def is_valid_file_name(file_name):
         return file_name.endswith('.mustache')
+
     def read_file(file_name):
         return open(mustache_dir / file_name, "r").read().decode('utf-8')
+
     def template_id_from_file_name(file_name):
         return file_name.rpartition('.')[0]
+
     def process_mako(template_content):
         return Template(template_content).render_unicode()
+
     def make_script_tag(id, content):
         return u"<script type='text/template' id='{0}'>{1}</script>".format(id, content)
 
diff --git a/lms/djangoapps/foldit/models.py b/lms/djangoapps/foldit/models.py
index d413731647..4f0b3d16f6 100644
--- a/lms/djangoapps/foldit/models.py
+++ b/lms/djangoapps/foldit/models.py
@@ -121,7 +121,6 @@ class PuzzleComplete(models.Model):
                  'subset': c.puzzle_subset,
                  'created': c.created} for c in complete]
 
-
     @staticmethod
     def is_level_complete(anonymous_user_id, level, sub_level, due=None):
         """
@@ -141,4 +140,3 @@ class PuzzleComplete(models.Model):
             complete = complete.filter(created__lte=due)
 
         return complete.exists()
-
diff --git a/lms/djangoapps/instructor/tests/test_access.py b/lms/djangoapps/instructor/tests/test_access.py
index cd25179be7..499a5c7158 100644
--- a/lms/djangoapps/instructor/tests/test_access.py
+++ b/lms/djangoapps/instructor/tests/test_access.py
@@ -8,7 +8,7 @@ from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 
 from django.test.utils import override_settings
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 from student.roles import CourseBetaTesterRole, CourseStaffRole
 
 from django_comment_common.models import (Role,
@@ -19,7 +19,7 @@ from instructor.access import (allow_access,
                                update_forum_role)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorAccessList(ModuleStoreTestCase):
     """ Test access listings. """
     def setUp(self):
@@ -41,7 +41,7 @@ class TestInstructorAccessList(ModuleStoreTestCase):
         self.assertEqual(set(beta_testers), set(self.beta_testers))
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorAccessAllow(ModuleStoreTestCase):
     """ Test access allow. """
     def setUp(self):
@@ -75,7 +75,7 @@ class TestInstructorAccessAllow(ModuleStoreTestCase):
         allow_access(self.course, user, 'staff')
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorAccessRevoke(ModuleStoreTestCase):
     """ Test access revoke. """
     def setUp(self):
@@ -109,7 +109,7 @@ class TestInstructorAccessRevoke(ModuleStoreTestCase):
         revoke_access(self.course, user, 'robot-not-a-level')
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorAccessForum(ModuleStoreTestCase):
     """
     Test forum access control.
diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index 3c529ec077..feda24b885 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -25,10 +25,12 @@ from django.utils.timezone import utc
 from django.test import RequestFactory
 
 from django.contrib.auth.models import User
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from courseware.tests.helpers import LoginEnrollmentTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
+from xmodule.modulestore import ModuleStoreEnum
+from xmodule.modulestore.django import modulestore
 from student.tests.factories import UserFactory
 from courseware.tests.factories import StaffFactory, InstructorFactory, BetaTesterFactory
 from student.roles import CourseBetaTesterRole
@@ -134,7 +136,7 @@ class TestCommonExceptions400(unittest.TestCase):
         self.assertIn("Task is already running", result["error"])
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 @patch.dict(settings.FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': False})
 class TestInstructorAPIDenyLevels(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
@@ -289,7 +291,7 @@ class TestInstructorAPIDenyLevels(ModuleStoreTestCase, LoginEnrollmentTestCase):
             )
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 @patch.dict(settings.FEATURES, {'ALLOW_AUTOMATED_SIGNUPS': True})
 class TestInstructorAPIBulkAccountCreationAndEnrollment(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
@@ -526,7 +528,7 @@ class TestInstructorAPIBulkAccountCreationAndEnrollment(ModuleStoreTestCase, Log
 
 
 @ddt.ddt
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorAPIEnrollment(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Test enrollment modification endpoint.
@@ -1050,7 +1052,7 @@ class TestInstructorAPIEnrollment(ModuleStoreTestCase, LoginEnrollmentTestCase):
 
 
 @ddt.ddt
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorAPIBulkBetaEnrollment(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Test bulk beta modify access endpoint.
@@ -1363,7 +1365,7 @@ class TestInstructorAPIBulkBetaEnrollment(ModuleStoreTestCase, LoginEnrollmentTe
         )
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorAPILevelsAccess(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Test endpoints whereby instructors can change permissions
@@ -1601,7 +1603,7 @@ class TestInstructorAPILevelsAccess(ModuleStoreTestCase, LoginEnrollmentTestCase
 
 
 @ddt.ddt
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorAPILevelsDataDump(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Test endpoints that show data without side effects.
@@ -2044,7 +2046,7 @@ class TestInstructorAPILevelsDataDump(ModuleStoreTestCase, LoginEnrollmentTestCa
         self.assertEqual(response.status_code, 400)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorAPIRegradeTask(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Test endpoints whereby instructors can change student grades.
@@ -2184,7 +2186,7 @@ class TestInstructorAPIRegradeTask(ModuleStoreTestCase, LoginEnrollmentTestCase)
         self.assertTrue(act.called)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 @patch.dict(settings.FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': False})
 class TestInstructorSendEmail(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
@@ -2266,7 +2268,7 @@ class MockCompletionInfo(object):
         return False, 'Task Errored In Some Way'
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorAPITaskLists(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Test instructor task list endpoint.
@@ -2428,7 +2430,7 @@ class TestInstructorAPITaskLists(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertEqual(actual_tasks, expected_tasks)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 @patch.object(instructor_task.api, 'get_instructor_task_history')
 class TestInstructorEmailContentList(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
@@ -2563,7 +2565,8 @@ class TestInstructorEmailContentList(ModuleStoreTestCase, LoginEnrollmentTestCas
         self.assertDictEqual(expected_info, returned_info)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@ddt.ddt
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 @override_settings(ANALYTICS_SERVER_URL="http://robotanalyticsserver.netbot:900/")
 @override_settings(ANALYTICS_API_KEY="robot_api_key")
 class TestInstructorAPIAnalyticsProxy(ModuleStoreTestCase, LoginEnrollmentTestCase):
@@ -2590,25 +2593,84 @@ class TestInstructorAPIAnalyticsProxy(ModuleStoreTestCase, LoginEnrollmentTestCa
         self.instructor = InstructorFactory(course_key=self.course.id)
         self.client.login(username=self.instructor.username, password='test')
 
+    @ddt.data((ModuleStoreEnum.Type.mongo, False), (ModuleStoreEnum.Type.split, True))
+    @ddt.unpack
     @patch.object(instructor.views.api.requests, 'get')
-    def test_analytics_proxy_url(self, act):
+    def test_analytics_proxy_url(self, store_type, assert_wo_encoding, act):
         """ Test legacy analytics proxy url generation. """
+        with modulestore().default_store(store_type):
+            course = CourseFactory.create()
+            instructor_local = InstructorFactory(course_key=course.id)
+            self.client.login(username=instructor_local.username, password='test')
+
+            act.return_value = self.FakeProxyResponse()
+
+            url = reverse('proxy_legacy_analytics', kwargs={'course_id': course.id.to_deprecated_string()})
+            response = self.client.get(url, {
+                'aname': 'ProblemGradeDistribution'
+            })
+            self.assertEqual(response.status_code, 200)
+
+            # Make request URL pattern - everything but course id.
+            url_pattern = "{url}get?aname={aname}&course_id={course_id}&apikey={api_key}".format(
+                url="http://robotanalyticsserver.netbot:900/",
+                aname="ProblemGradeDistribution",
+                course_id="{course_id!s}",
+                api_key="robot_api_key",
+            )
+
+            if assert_wo_encoding:
+                # Format url with no URL-encoding of parameters.
+                assert_url = url_pattern.format(course_id=course.id.to_deprecated_string())
+                with self.assertRaises(AssertionError):
+                    act.assert_called_once_with(assert_url)
+
+            # Format url *with* URL-encoding of parameters.
+            expected_url = url_pattern.format(course_id=quote(course.id.to_deprecated_string()))
+            act.assert_called_once_with(expected_url)
+
+    @override_settings(ANALYTICS_SERVER_URL="")
+    @patch.object(instructor.views.api.requests, 'get')
+    def test_analytics_proxy_server_url(self, act):
+        """
+        Test legacy analytics when empty server url.
+        """
         act.return_value = self.FakeProxyResponse()
 
         url = reverse('proxy_legacy_analytics', kwargs={'course_id': self.course.id.to_deprecated_string()})
         response = self.client.get(url, {
             'aname': 'ProblemGradeDistribution'
         })
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.status_code, 501)
 
-        # check request url
-        expected_url = "{url}get?aname={aname}&course_id={course_id!s}&apikey={api_key}".format(
-            url="http://robotanalyticsserver.netbot:900/",
-            aname="ProblemGradeDistribution",
-            course_id=self.course.id.to_deprecated_string(),
-            api_key="robot_api_key",
-        )
-        act.assert_called_once_with(expected_url)
+    @override_settings(ANALYTICS_API_KEY="")
+    @patch.object(instructor.views.api.requests, 'get')
+    def test_analytics_proxy_api_key(self, act):
+        """
+        Test legacy analytics when empty server API key.
+        """
+        act.return_value = self.FakeProxyResponse()
+
+        url = reverse('proxy_legacy_analytics', kwargs={'course_id': self.course.id.to_deprecated_string()})
+        response = self.client.get(url, {
+            'aname': 'ProblemGradeDistribution'
+        })
+        self.assertEqual(response.status_code, 501)
+
+    @override_settings(ANALYTICS_SERVER_URL="")
+    @override_settings(ANALYTICS_API_KEY="")
+    @patch.object(instructor.views.api.requests, 'get')
+    def test_analytics_proxy_empty_url_and_api_key(self, act):
+        """
+        Test legacy analytics when empty server url & API key.
+        """
+        act.return_value = self.FakeProxyResponse()
+
+        url = reverse('proxy_legacy_analytics', kwargs={'course_id': self.course.id.to_deprecated_string()})
+        response = self.client.get(url, {
+            'aname': 'ProblemGradeDistribution'
+        })
+        self.assertEqual(response.status_code, 501)
 
     @patch.object(instructor.views.api.requests, 'get')
     def test_analytics_proxy(self, act):
@@ -2686,7 +2748,7 @@ class TestInstructorAPIHelpers(TestCase):
         msk_from_problem_urlname(*args)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestDueDateExtensions(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Test data dumps for reporting.
@@ -2875,7 +2937,7 @@ class TestDueDateExtensions(ModuleStoreTestCase, LoginEnrollmentTestCase):
                 self.user1.profile.name, self.user1.username)})
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 @override_settings(REGISTRATION_CODE_LENGTH=8)
 class TestCourseRegistrationCodes(ModuleStoreTestCase):
     """
diff --git a/lms/djangoapps/instructor/tests/test_email.py b/lms/djangoapps/instructor/tests/test_email.py
index f19e062ac0..8fd3288bd4 100644
--- a/lms/djangoapps/instructor/tests/test_email.py
+++ b/lms/djangoapps/instructor/tests/test_email.py
@@ -13,7 +13,7 @@ from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
 from student.tests.factories import AdminFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 
 from mock import patch
 
@@ -110,7 +110,7 @@ class TestNewInstructorDashboardEmailViewMongoBacked(ModuleStoreTestCase):
         self.assertFalse(self.email_link in response.content)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestNewInstructorDashboardEmailViewXMLBacked(ModuleStoreTestCase):
     """
     Check for email view on the new instructor dashboard
diff --git a/lms/djangoapps/instructor/tests/test_enrollment.py b/lms/djangoapps/instructor/tests/test_enrollment.py
index 353b3e7927..505d1de45f 100644
--- a/lms/djangoapps/instructor/tests/test_enrollment.py
+++ b/lms/djangoapps/instructor/tests/test_enrollment.py
@@ -11,7 +11,7 @@ from django.test import TestCase
 from django.test.utils import override_settings
 from student.tests.factories import UserFactory
 from xmodule.modulestore.tests.factories import CourseFactory
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 
 from student.models import CourseEnrollment, CourseEnrollmentAllowed
 from instructor.enrollment import (
@@ -286,7 +286,7 @@ class TestInstructorUnenrollDB(TestEnrollmentChangeBase):
         return self._run_state_change_test(before_ideal, after_ideal, action)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorEnrollmentStudentModule(TestCase):
     """ Test student module manipulations. """
     def setUp(self):
@@ -431,7 +431,7 @@ class TestSendBetaRoleEmail(TestCase):
             send_beta_role_email(bad_action, self.user, self.email_params)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestGetEmailParams(ModuleStoreTestCase):
     """
     Test what URLs the function get_email_params returns under different
diff --git a/lms/djangoapps/instructor/tests/test_hint_manager.py b/lms/djangoapps/instructor/tests/test_hint_manager.py
index 3080abbeb4..a3446646f7 100644
--- a/lms/djangoapps/instructor/tests/test_hint_manager.py
+++ b/lms/djangoapps/instructor/tests/test_hint_manager.py
@@ -6,14 +6,16 @@ from mock import patch, MagicMock
 
 from courseware.models import XModuleUserStateSummaryField
 from courseware.tests.factories import UserStateSummaryFactory
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 import instructor.hint_manager as view
 from student.tests.factories import UserFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
+# pylint: disable=C0111
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class HintManagerTest(ModuleStoreTestCase):
 
     def setUp(self):
@@ -28,19 +30,25 @@ class HintManagerTest(ModuleStoreTestCase):
         self.c.login(username='robot', password='test')
         self.course_id = self.course.id
         self.problem_id = self.course_id.make_usage_key('crowdsource_hinter', 'crowdsource_hinter_001')
-        UserStateSummaryFactory.create(field_name='hints',
-                              usage_id=self.problem_id,
-                              value=json.dumps({'1.0': {'1': ['Hint 1', 2],
-                                                        '3': ['Hint 3', 12]},
-                                                '2.0': {'4': ['Hint 4', 3]}
-                                                }))
-        UserStateSummaryFactory.create(field_name='mod_queue',
-                              usage_id=self.problem_id,
-                              value=json.dumps({'2.0': {'2': ['Hint 2', 1]}}))
+        UserStateSummaryFactory.create(
+            field_name='hints',
+            usage_id=self.problem_id,
+            value=json.dumps({
+                '1.0': {'1': ['Hint 1', 2], '3': ['Hint 3', 12]},
+                '2.0': {'4': ['Hint 4', 3]}
+            })
+        )
+        UserStateSummaryFactory.create(
+            field_name='mod_queue',
+            usage_id=self.problem_id,
+            value=json.dumps({'2.0': {'2': ['Hint 2', 1]}})
+        )
 
-        UserStateSummaryFactory.create(field_name='hint_pk',
-                              usage_id=self.problem_id,
-                              value=5)
+        UserStateSummaryFactory.create(
+            field_name='hint_pk',
+            usage_id=self.problem_id,
+            value=5
+        )
         # Mock out location_to_problem_name, which ordinarily accesses the modulestore.
         # (I can't figure out how to get fake structures into the modulestore.)
         view.location_to_problem_name = lambda course_id, loc: "Test problem"
diff --git a/lms/djangoapps/instructor/tests/test_legacy_anon_csv.py b/lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
index ee157d27fd..68ad6a64f0 100644
--- a/lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
+++ b/lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
@@ -16,17 +16,16 @@ from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 
 from courseware.tests.helpers import LoginEnrollmentTestCase
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 import instructor.views.legacy
 from student.roles import CourseStaffRole
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.django import modulestore, clear_existing_modulestores
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from xmodule.modulestore.tests.factories import CourseFactory
 
 from mock import Mock, patch
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorDashboardAnonCSV(ModuleStoreTestCase, LoginEnrollmentTestCase):
     '''
     Check for download of csv
@@ -34,8 +33,8 @@ class TestInstructorDashboardAnonCSV(ModuleStoreTestCase, LoginEnrollmentTestCas
 
     # Note -- I copied this setUp from a similar test
     def setUp(self):
-        clear_existing_modulestores()
-        self.toy = modulestore().get_course(SlashSeparatedCourseKey("edX", "toy", "2012_Fall"))
+        # clear_existing_modulestores()
+        self.toy = CourseFactory.create(org='edX', course='toy', display_name='2012_Fall')
 
         # Create two accounts
         self.student = 'view@test.com'
diff --git a/lms/djangoapps/instructor/tests/test_legacy_download_csv.py b/lms/djangoapps/instructor/tests/test_legacy_download_csv.py
index 2e13df8f24..55704e3a39 100644
--- a/lms/djangoapps/instructor/tests/test_legacy_download_csv.py
+++ b/lms/djangoapps/instructor/tests/test_legacy_download_csv.py
@@ -16,22 +16,21 @@ from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 
 from courseware.tests.helpers import LoginEnrollmentTestCase
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 from student.roles import CourseStaffRole
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.django import modulestore, clear_existing_modulestores
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from xmodule.modulestore.tests.factories import CourseFactory
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorDashboardGradeDownloadCSV(ModuleStoreTestCase, LoginEnrollmentTestCase):
     '''
     Check for download of csv
     '''
 
     def setUp(self):
-        clear_existing_modulestores()
-        self.toy = modulestore().get_course(SlashSeparatedCourseKey("edX", "toy", "2012_Fall"))
+        # clear_existing_modulestores()
+        self.toy = CourseFactory.create(org='edX', course='toy', display_name='2012_Fall')
 
         # Create two accounts
         self.student = 'view@test.com'
diff --git a/lms/djangoapps/instructor/tests/test_legacy_enrollment.py b/lms/djangoapps/instructor/tests/test_legacy_enrollment.py
index e7a8887b65..bb7eb17748 100644
--- a/lms/djangoapps/instructor/tests/test_legacy_enrollment.py
+++ b/lms/djangoapps/instructor/tests/test_legacy_enrollment.py
@@ -10,7 +10,7 @@ from django.test.utils import override_settings
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from courseware.tests.helpers import LoginEnrollmentTestCase
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 from xmodule.modulestore.tests.factories import CourseFactory
 from student.tests.factories import UserFactory, CourseEnrollmentFactory, AdminFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -22,7 +22,7 @@ USER_COUNT = 4
 
 
 @ddt.ddt
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorEnrollsStudent(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Check Enrollment/Unenrollment with/without auto-enrollment on activation and with/without email notification
diff --git a/lms/djangoapps/instructor/tests/test_legacy_forum_admin.py b/lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
index 4dd0994fff..a51f9db518 100644
--- a/lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
+++ b/lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
@@ -14,11 +14,10 @@ from django_comment_common.models import Role, FORUM_ROLE_ADMINISTRATOR, \
 from django_comment_client.utils import has_forum_access
 
 from courseware.tests.helpers import LoginEnrollmentTestCase
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 from student.roles import CourseStaffRole
-from xmodule.modulestore.django import modulestore, clear_existing_modulestores
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
 
 
 FORUM_ROLES = [FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_MODERATOR, FORUM_ROLE_COMMUNITY_TA]
@@ -33,18 +32,14 @@ def action_name(operation, rolename):
         return '{0} forum {1}'.format(operation, FORUM_ADMIN_ACTION_SUFFIX[rolename])
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestInstructorDashboardForumAdmin(ModuleStoreTestCase, LoginEnrollmentTestCase):
     '''
     Check for change in forum admin role memberships
     '''
 
     def setUp(self):
-        clear_existing_modulestores()
-        courses = modulestore().get_courses()
-
-        self.course_id = SlashSeparatedCourseKey("edX", "toy", "2012_Fall")
-        self.toy = modulestore().get_course(self.course_id)
+        self.toy = CourseFactory.create(org='edX', course='toy', display_name='2012_Fall')
 
         # Create two accounts
         self.student = 'view@test.com'
diff --git a/lms/djangoapps/instructor/tests/test_legacy_reset.py b/lms/djangoapps/instructor/tests/test_legacy_reset.py
index a6a6beaecb..ecdd4ed5df 100644
--- a/lms/djangoapps/instructor/tests/test_legacy_reset.py
+++ b/lms/djangoapps/instructor/tests/test_legacy_reset.py
@@ -8,7 +8,7 @@ from django.test.utils import override_settings
 
 from courseware.tests.helpers import LoginEnrollmentTestCase
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 from xmodule.modulestore.tests.factories import CourseFactory
 from student.tests.factories import UserFactory, AdminFactory, CourseEnrollmentFactory
 
@@ -18,7 +18,7 @@ from submissions import api as sub_api
 from student.models import anonymous_id_for_user
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class InstructorResetStudentStateTest(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Reset student state from the legacy instructor dash.
diff --git a/lms/djangoapps/instructor/tests/test_legacy_xss.py b/lms/djangoapps/instructor/tests/test_legacy_xss.py
index 0c6ac436f8..bd0e75f7f7 100644
--- a/lms/djangoapps/instructor/tests/test_legacy_xss.py
+++ b/lms/djangoapps/instructor/tests/test_legacy_xss.py
@@ -7,7 +7,7 @@ from django.test.client import RequestFactory
 from django.test.utils import override_settings
 from markupsafe import escape
 
-from courseware.tests.tests import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
 from student.tests.factories import UserFactory, CourseEnrollmentFactory
 from edxmako.tests import mako_middleware_process_request
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -15,8 +15,10 @@ from xmodule.modulestore.tests.factories import CourseFactory
 
 from instructor.views import legacy
 
+# pylint: disable=C0111
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestXss(ModuleStoreTestCase):
     def setUp(self):
         self._request_factory = RequestFactory()
diff --git a/lms/djangoapps/instructor/tests/test_spoc_gradebook.py b/lms/djangoapps/instructor/tests/test_spoc_gradebook.py
index 63f7e9198c..d6a46d9004 100644
--- a/lms/djangoapps/instructor/tests/test_spoc_gradebook.py
+++ b/lms/djangoapps/instructor/tests/test_spoc_gradebook.py
@@ -7,7 +7,7 @@ from django.core.urlresolvers import reverse
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from student.tests.factories import UserFactory, CourseEnrollmentFactory, AdminFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from courseware.tests.tests import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
 from capa.tests.response_xml_factory import StringResponseXMLFactory
 from courseware.tests.factories import StudentModuleFactory
 from xmodule.modulestore.django import modulestore
@@ -16,7 +16,7 @@ from xmodule.modulestore.django import modulestore
 USER_COUNT = 11
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestGradebook(ModuleStoreTestCase):
     """
     Test functionality of the spoc gradebook. Sets up a course with assignments and
diff --git a/lms/djangoapps/instructor/tests/test_tools.py b/lms/djangoapps/instructor/tests/test_tools.py
index 35ca654255..edebd19c40 100644
--- a/lms/djangoapps/instructor/tests/test_tools.py
+++ b/lms/djangoapps/instructor/tests/test_tools.py
@@ -12,7 +12,7 @@ from django.test.utils import override_settings
 from django.utils.timezone import utc
 
 from courseware.models import StudentModule
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 from student.tests.factories import UserFactory
 from xmodule.fields import Date
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -97,7 +97,7 @@ class TestParseDatetime(unittest.TestCase):
             tools.parse_datetime('foo')
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestFindUnit(ModuleStoreTestCase):
     """
     Test the find_unit function.
@@ -130,7 +130,7 @@ class TestFindUnit(ModuleStoreTestCase):
             tools.find_unit(self.course, url)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestGetUnitsWithDueDate(ModuleStoreTestCase):
     """
     Test the get_units_with_due_date function.
@@ -178,7 +178,7 @@ class TestTitleOrUrl(unittest.TestCase):
         self.assertEquals(tools.title_or_url(unit), 'test:hello')
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestSetDueDateExtension(ModuleStoreTestCase):
     """
     Test the set_due_date_extensions function.
@@ -252,7 +252,7 @@ class TestSetDueDateExtension(ModuleStoreTestCase):
         self.assertEqual(self.extended_due(self.homework), None)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestDataDumps(ModuleStoreTestCase):
     """
     Test data dumps for reporting.
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 3d5bb7a566..901dab3533 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -25,6 +25,7 @@ from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbid
 from django.utils.html import strip_tags
 import string  # pylint: disable=W0402
 import random
+import urllib
 from util.json_request import JsonResponse
 from instructor.views.instructor_task_helpers import extract_email_features, extract_task_features
 
@@ -1696,7 +1697,7 @@ def send_email(request, course_id):
         course_id,
         request.user,
         send_to,
-        subject,message,
+        subject, message,
         template_name=template_name,
         from_addr=from_addr
     )
@@ -1791,13 +1792,15 @@ def proxy_legacy_analytics(request, course_id):
     analytics_name = request.GET.get('aname')
 
     # abort if misconfigured
-    if not (hasattr(settings, 'ANALYTICS_SERVER_URL') and hasattr(settings, 'ANALYTICS_API_KEY')):
+    if not (hasattr(settings, 'ANALYTICS_SERVER_URL') and
+            hasattr(settings, 'ANALYTICS_API_KEY') and
+            settings.ANALYTICS_SERVER_URL and settings.ANALYTICS_API_KEY):
         return HttpResponse("Analytics service not configured.", status=501)
 
     url = "{}get?aname={}&course_id={}&apikey={}".format(
         settings.ANALYTICS_SERVER_URL,
         analytics_name,
-        course_id.to_deprecated_string(),
+        urllib.quote(unicode(course_id)),
         settings.ANALYTICS_API_KEY,
     )
 
diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py
index cdcf2b4e31..8884adf796 100644
--- a/lms/djangoapps/instructor/views/instructor_dashboard.py
+++ b/lms/djangoapps/instructor/views/instructor_dashboard.py
@@ -15,7 +15,7 @@ from django.views.decorators.cache import cache_control
 from edxmako.shortcuts import render_to_response
 from django.core.urlresolvers import reverse
 from django.utils.html import escape
-from django.http import Http404, HttpResponse, HttpResponseNotFound
+from django.http import Http404
 from django.conf import settings
 from util.json_request import JsonResponse
 
@@ -35,13 +35,10 @@ from course_modes.models import CourseMode, CourseModesArchive
 from student.roles import CourseFinanceAdminRole
 
 from class_dashboard.dashboard_data import get_section_display_name, get_array_section_has_problem
-
-from analyticsclient.client import Client
-from analyticsclient.exceptions import ClientError
-
 from .tools import get_units_with_due_date, title_or_url, bulk_email_is_enabled_for_course
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
+
 log = logging.getLogger(__name__)
 
 
@@ -229,13 +226,13 @@ def _section_course_info(course, access):
     try:
         advance = lambda memo, (letter, score): "{}: {}, ".format(letter, score) + memo
         section_data['grade_cutoffs'] = reduce(advance, course.grade_cutoffs.items(), "")[:-2]
-    except Exception:
+    except Exception:  # pylint: disable=broad-except
         section_data['grade_cutoffs'] = "Not Available"
     # section_data['offline_grades'] = offline_grades_available(course_key)
 
     try:
         section_data['course_errors'] = [(escape(a), '') for (a, _unused) in modulestore().get_course_errors(course.id)]
-    except Exception:
+    except Exception:  # pylint: disable=broad-except
         section_data['course_errors'] = [('Error fetching errors', '')]
 
     return section_data
@@ -368,8 +365,13 @@ def _section_analytics(course, access):
         'proxy_legacy_analytics_url': reverse('proxy_legacy_analytics', kwargs={'course_id': course_key.to_deprecated_string()}),
     }
 
-    if settings.FEATURES.get('ENABLE_ANALYTICS_ACTIVE_COUNT'):
-        _update_active_students(course_key, section_data)
+    if settings.ANALYTICS_DASHBOARD_URL:
+        # Construct a URL to the external analytics dashboard
+        analytics_dashboard_url = '{0}/courses/{1}'.format(settings.ANALYTICS_DASHBOARD_URL, unicode(course_key))
+        dashboard_link = "<a href=\"{0}\" target=\"_blank\">{1}</a>".format(analytics_dashboard_url,
+                                                                            settings.ANALYTICS_DASHBOARD_NAME)
+        message = _("Demographic data is now available in {dashboard_link}.").format(dashboard_link=dashboard_link)
+        section_data['demographic_message'] = message
 
     return section_data
 
@@ -389,31 +391,3 @@ def _section_metrics(course, access):
         'post_metrics_data_csv_url': reverse('post_metrics_data_csv'),
     }
     return section_data
-
-
-def _update_active_students(course_key, section_data):
-    auth_token = settings.ANALYTICS_DATA_TOKEN
-    base_url = settings.ANALYTICS_DATA_URL
-
-    section_data['active_student_count'] = 'N/A'
-    section_data['active_student_count_start'] = 'N/A'
-    section_data['active_student_count_end'] = 'N/A'
-
-    try:
-        client = Client(base_url=base_url, auth_token=auth_token)
-        course = client.courses(unicode(course_key))
-
-        recent_activity = course.recent_activity()
-        section_data['active_student_count'] = recent_activity['count']
-
-        def format_date(value):
-            return value.split('T')[0]
-
-        start = recent_activity['interval_start']
-        end = recent_activity['interval_end']
-
-        section_data['active_student_count_start'] = format_date(start)
-        section_data['active_student_count_end'] = format_date(end)
-
-    except (ClientError, KeyError) as e:
-        log.exception(e)
diff --git a/lms/djangoapps/instructor/views/legacy.py b/lms/djangoapps/instructor/views/legacy.py
index 1e9b11acac..728b04777a 100644
--- a/lms/djangoapps/instructor/views/legacy.py
+++ b/lms/djangoapps/instructor/views/legacy.py
@@ -11,6 +11,7 @@ import logging
 import os
 import re
 import requests
+import urllib
 
 from collections import defaultdict, OrderedDict
 from markupsafe import escape
@@ -910,7 +911,7 @@ def instructor_dashboard(request, course_id):
         """
         url = settings.ANALYTICS_SERVER_URL + \
             u"get?aname={}&course_id={}&apikey={}".format(
-                analytics_name, course_key.to_deprecated_string(), settings.ANALYTICS_API_KEY
+                analytics_name, urllib.quote(unicode(course_key)), settings.ANALYTICS_API_KEY
             )
         try:
             res = requests.get(url)
diff --git a/lms/djangoapps/instructor_task/tests/test_api.py b/lms/djangoapps/instructor_task/tests/test_api.py
index ce2960307b..2d83091f38 100644
--- a/lms/djangoapps/instructor_task/tests/test_api.py
+++ b/lms/djangoapps/instructor_task/tests/test_api.py
@@ -23,6 +23,7 @@ from instructor_task.models import InstructorTask, PROGRESS
 from instructor_task.tests.test_base import (InstructorTaskTestCase,
                                              InstructorTaskCourseTestCase,
                                              InstructorTaskModuleTestCase,
+                                             TestReportMixin,
                                              TEST_COURSE_KEY)
 
 
@@ -158,7 +159,7 @@ class InstructorTaskModuleSubmitTest(InstructorTaskModuleTestCase):
         self._test_submit_task(submit_delete_problem_state_for_all_students)
 
 
-class InstructorTaskCourseSubmitTest(InstructorTaskCourseTestCase):
+class InstructorTaskCourseSubmitTest(TestReportMixin, InstructorTaskCourseTestCase):
     """Tests API methods that involve the submission of course-based background tasks."""
 
     def setUp(self):
diff --git a/lms/djangoapps/instructor_task/tests/test_base.py b/lms/djangoapps/instructor_task/tests/test_base.py
index 70372ce96b..78b63a3ff4 100644
--- a/lms/djangoapps/instructor_task/tests/test_base.py
+++ b/lms/djangoapps/instructor_task/tests/test_base.py
@@ -2,12 +2,16 @@
 Base test classes for LMS instructor-initiated background tasks
 
 """
+import os
+import shutil
+
 import json
 from uuid import uuid4
 from mock import Mock
 
 from celery.states import SUCCESS, FAILURE
 
+from django.conf import settings
 from django.test.testcases import TestCase
 from django.contrib.auth.models import User
 from django.test.utils import override_settings
@@ -21,7 +25,7 @@ from opaque_keys.edx.locations import Location, SlashSeparatedCourseKey
 
 from student.tests.factories import CourseEnrollmentFactory, UserFactory
 from courseware.model_data import StudentModule
-from courseware.tests.tests import LoginEnrollmentTestCase, TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.tests import LoginEnrollmentTestCase, TEST_DATA_MONGO_MODULESTORE
 
 from instructor_task.api_helper import encode_problem_and_student_input
 from instructor_task.models import PROGRESS, QUEUING
@@ -95,7 +99,7 @@ class InstructorTaskTestCase(TestCase):
         return self._create_entry(task_state=task_state, task_output=progress, student=student)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class InstructorTaskCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
     """
     Base test class for InstructorTask-related tests that require
@@ -104,14 +108,25 @@ class InstructorTaskCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase)
     course = None
     current_user = None
 
-    def initialize_course(self):
-        """Create a course in the store, with a chapter and section."""
+    def initialize_course(self, course_factory_kwargs=None):
+        """
+        Create a course in the store, with a chapter and section.
+
+        Arguments:
+            course_factory_kwargs (dict): kwargs dict to pass to
+            CourseFactory.create()
+        """
         self.module_store = modulestore()
 
         # Create the course
-        self.course = CourseFactory.create(org=TEST_COURSE_ORG,
-                                           number=TEST_COURSE_NUMBER,
-                                           display_name=TEST_COURSE_NAME)
+        course_args = {
+            "org": TEST_COURSE_ORG,
+            "number": TEST_COURSE_NUMBER,
+            "display_name": TEST_COURSE_NAME
+        }
+        if course_factory_kwargs is not None:
+            course_args.update(course_factory_kwargs)
+        self.course = CourseFactory.create(**course_args)
 
         # Add a chapter to the course
         chapter = ItemFactory.create(parent_location=self.course.location,
@@ -134,20 +149,21 @@ class InstructorTaskCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase)
             self.login(InstructorTaskCourseTestCase.get_user_email(username), "test")
             self.current_user = username
 
-    def _create_user(self, username, is_staff=False):
+    def _create_user(self, username, email=None, is_staff=False):
         """Creates a user and enrolls them in the test course."""
-        email = InstructorTaskCourseTestCase.get_user_email(username)
+        if email is None:
+            email = InstructorTaskCourseTestCase.get_user_email(username)
         thisuser = UserFactory.create(username=username, email=email, is_staff=is_staff)
         CourseEnrollmentFactory.create(user=thisuser, course_id=self.course.id)
         return thisuser
 
-    def create_instructor(self, username):
+    def create_instructor(self, username, email=None):
         """Creates an instructor for the test course."""
-        return self._create_user(username, is_staff=True)
+        return self._create_user(username, email, is_staff=True)
 
-    def create_student(self, username):
+    def create_student(self, username, email=None):
         """Creates a student for the test course."""
-        return self._create_user(username, is_staff=False)
+        return self._create_user(username, email, is_staff=False)
 
     @staticmethod
     def get_task_status(task_id):
@@ -168,7 +184,7 @@ class InstructorTaskCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase)
         return request
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class InstructorTaskModuleTestCase(InstructorTaskCourseTestCase):
     """
     Base test class for InstructorTask-related tests that require
@@ -184,16 +200,18 @@ class InstructorTaskModuleTestCase(InstructorTaskCourseTestCase):
         else:
             return TEST_COURSE_KEY.make_usage_key('problem', problem_url_name)
 
-    def define_option_problem(self, problem_url_name):
+    def define_option_problem(self, problem_url_name, parent=None):
         """Create the problem definition so the answer is Option 1"""
+        if parent is None:
+            parent = self.problem_section
         factory = OptionResponseXMLFactory()
         factory_args = {'question_text': 'The correct answer is {0}'.format(OPTION_1),
                         'options': [OPTION_1, OPTION_2],
                         'correct_option': OPTION_1,
                         'num_responses': 2}
         problem_xml = factory.build_xml(**factory_args)
-        ItemFactory.create(parent_location=self.problem_section.location,
-                           parent=self.problem_section,
+        ItemFactory.create(parent_location=parent.location,
+                           parent=parent,
                            category="problem",
                            display_name=str(problem_url_name),
                            data=problem_xml)
@@ -220,3 +238,13 @@ class InstructorTaskModuleTestCase(InstructorTaskCourseTestCase):
                                          module_type=descriptor.location.category,
                                          module_state_key=descriptor.location,
                                          )
+
+
+class TestReportMixin(object):
+    """
+    Cleans up after tests that place files in the reports directory.
+    """
+    def tearDown(self):
+        reports_download_path = settings.GRADES_DOWNLOAD['ROOT_PATH']
+        if os.path.exists(reports_download_path):
+            shutil.rmtree(reports_download_path)
diff --git a/lms/djangoapps/instructor_task/tests/test_integration.py b/lms/djangoapps/instructor_task/tests/test_integration.py
index b75190e290..a4ce56c3b9 100644
--- a/lms/djangoapps/instructor_task/tests/test_integration.py
+++ b/lms/djangoapps/instructor_task/tests/test_integration.py
@@ -5,6 +5,7 @@ Runs tasks on answers to course problems to validate that code
 paths actually work.
 
 """
+import csv
 import logging
 import json
 from mock import patch
@@ -16,8 +17,10 @@ from django.core.urlresolvers import reverse
 
 from capa.tests.response_xml_factory import (CodeResponseXMLFactory,
                                              CustomResponseXMLFactory)
+from user_api.tests.factories import UserCourseTagFactory
 from xmodule.modulestore.tests.factories import ItemFactory
 from xmodule.modulestore import ModuleStoreEnum
+from xmodule.partitions.partitions import Group, UserPartition
 
 from courseware.model_data import StudentModule
 
@@ -25,9 +28,10 @@ from instructor_task.api import (submit_rescore_problem_for_all_students,
                                  submit_rescore_problem_for_student,
                                  submit_reset_problem_attempts_for_all_students,
                                  submit_delete_problem_state_for_all_students)
-from instructor_task.models import InstructorTask
-from instructor_task.tests.test_base import (InstructorTaskModuleTestCase, TEST_COURSE_ORG, TEST_COURSE_NUMBER,
-                                             OPTION_1, OPTION_2)
+from instructor_task.models import InstructorTask, ReportStore
+from instructor_task.tasks_helper import upload_grades_csv
+from instructor_task.tests.test_base import (InstructorTaskModuleTestCase, TestReportMixin, TEST_COURSE_ORG,
+                                             TEST_COURSE_NUMBER, OPTION_1, OPTION_2)
 from capa.responsetypes import StudentInputError
 from lms.lib.xblock.runtime import quote_slashes
 
@@ -488,3 +492,201 @@ class TestDeleteProblemTask(TestIntegrationTask):
         instructor_task = self.delete_problem_state('instructor', location)
         instructor_task = InstructorTask.objects.get(id=instructor_task.id)
         self.assertEqual(instructor_task.task_state, SUCCESS)
+
+
+class TestGradeReportConditionalContent(TestReportMixin, TestIntegrationTask):
+    """
+    Check that grade export works when graded content exists within
+    split modules.
+    """
+    def setUp(self):
+        """
+        Set up a course with graded problems within a split test.
+
+        Course hierarchy is as follows (modeled after how split tests
+        are created in studio):
+        -> course
+            -> chapter
+                -> sequential (graded)
+                    -> vertical
+                        -> split_test
+                            -> vertical (Group A)
+                                -> problem
+                            -> vertical (Group B)
+                                -> problem
+        """
+        super(TestGradeReportConditionalContent, self).setUp()
+
+        # Create user partitions
+        self.user_partition_group_a = 0
+        self.user_partition_group_b = 1
+        self.partition = UserPartition(
+            0,
+            'first_partition',
+            'First Partition',
+            [
+                Group(self.user_partition_group_a, 'Group A'),
+                Group(self.user_partition_group_b, 'Group B')
+            ]
+        )
+
+        # Create course with group configurations and grading policy
+        self.initialize_course(
+            course_factory_kwargs={
+                'user_partitions': [self.partition],
+                'grading_policy': {
+                    "GRADER": [{
+                        "type": "Homework",
+                        "min_count": 1,
+                        "drop_count": 0,
+                        "short_label": "HW",
+                        "weight": 1.0
+                    }]
+                }
+            }
+        )
+
+        # Create users and partition them
+        self.student_a = self.create_student('student_a')
+        self.student_b = self.create_student('student_b')
+        UserCourseTagFactory(
+            user=self.student_a,
+            course_id=self.course.id,
+            key='xblock.partition_service.partition_{0}'.format(self.partition.id),  # pylint: disable=no-member
+            value=str(self.user_partition_group_a)
+        )
+        UserCourseTagFactory(
+            user=self.student_b,
+            course_id=self.course.id,
+            key='xblock.partition_service.partition_{0}'.format(self.partition.id),  # pylint: disable=no-member
+            value=str(self.user_partition_group_b)
+        )
+
+        # Create a vertical to contain our split test
+        problem_vertical = ItemFactory.create(
+            parent_location=self.problem_section.location,
+            category='vertical',
+            display_name='Problem Unit'
+        )
+
+        # Create the split test and child vertical containers
+        vertical_a_url = self.course.id.make_usage_key('vertical', 'split_test_vertical_a')
+        vertical_b_url = self.course.id.make_usage_key('vertical', 'split_test_vertical_b')
+        self.split_test = ItemFactory.create(
+            parent_location=problem_vertical.location,
+            category='split_test',
+            display_name='Split Test',
+            user_partition_id=self.partition.id,  # pylint: disable=no-member
+            group_id_to_child={str(index): url for index, url in enumerate([vertical_a_url, vertical_b_url])}
+        )
+        self.vertical_a = ItemFactory.create(
+            parent_location=self.split_test.location,
+            category='vertical',
+            display_name='Group A problem container',
+            location=vertical_a_url
+        )
+        self.vertical_b = ItemFactory.create(
+            parent_location=self.split_test.location,
+            category='vertical',
+            display_name='Group B problem container',
+            location=vertical_b_url
+        )
+
+    def verify_csv_task_success(self, task_result):
+        """
+        Verify that all students were successfully graded by
+        `upload_grades_csv`.
+
+        Arguments:
+            task_result (dict): Return value of `upload_grades_csv`.
+        """
+        self.assertDictContainsSubset({'attempted': 2, 'succeeded': 2, 'failed': 0}, task_result)
+
+    def verify_rows_in_csv(self, expected_rows):
+        """
+        Verify that the grades CSV contains the expected content.
+
+        Arguments:
+            expected_rows (iterable): An iterable of dictionaries, where
+                each dict represents a row of data in the grades
+                report CSV.  Each dict maps keys from the CSV header
+                to values in that row's corresponding cell.
+        """
+        report_store = ReportStore.from_config()
+        report_csv_filename = report_store.links_for(self.course.id)[0][0]
+        with open(report_store.path_to(self.course.id, report_csv_filename)) as csv_file:
+            # Expand the dict reader generator so we don't lose it's content
+            csv_rows = [row for row in csv.DictReader(csv_file)]
+            self.assertEqual(csv_rows, expected_rows)
+
+    def verify_grades_in_csv(self, students_grades):
+        """
+        Verify that the grades CSV contains the expected grades data.
+
+        Arguments:
+            students_grades (iterable): An iterable of dictionaries,
+                where each dict maps a student to another dict
+                representing their grades we expect to see in the CSV.
+                For example: [student_a: {'grade': 1.0, 'HW': 1.0}]
+        """
+        def merge_dicts(dict_1, dict_2):
+            """Return the union of dict_1 and dict_2"""
+            return dict(dict_1.items() + dict_2.items())
+
+        self.verify_rows_in_csv(
+            [
+                merge_dicts(
+                    {'id': str(student.id), 'username': student.username, 'email': student.email},
+                    grades
+                )
+                for student_grades in students_grades for student, grades in student_grades.iteritems()
+            ]
+        )
+
+    def test_both_groups_problems(self):
+        """
+        Verify that grade export works when each user partition
+        receives (different) problems.  Each user's grade on their
+        particular problem should show up in the grade report.
+        """
+        problem_a_url = 'problem_a_url'
+        problem_b_url = 'problem_b_url'
+        self.define_option_problem(problem_a_url, parent=self.vertical_a)
+        self.define_option_problem(problem_b_url, parent=self.vertical_b)
+        # student A will get 100%, student B will get 50% because
+        # OPTION_1 is the correct option, and OPTION_2 is the
+        # incorrect option
+        self.submit_student_answer(self.student_a.username, problem_a_url, [OPTION_1, OPTION_1])
+        self.submit_student_answer(self.student_b.username, problem_b_url, [OPTION_1, OPTION_2])
+
+        with patch('instructor_task.tasks_helper._get_current_task'):
+            result = upload_grades_csv(None, None, self.course.id, None, 'graded')
+            self.verify_csv_task_success(result)
+            self.verify_grades_in_csv(
+                [
+                    {self.student_a: {'grade': '1.0', 'HW': '1.0'}},
+                    {self.student_b: {'grade': '0.5', 'HW': '0.5'}}
+                ]
+            )
+
+    def test_one_group_problem(self):
+        """
+        Verify that grade export works when only the Group A user
+        partition receives a problem.  We expect to see a column for
+        the homework where student_a's entry includes their grade, and
+        student b's entry shows a 0.
+        """
+        problem_a_url = 'problem_a_url'
+        self.define_option_problem(problem_a_url, parent=self.vertical_a)
+
+        self.submit_student_answer(self.student_a.username, problem_a_url, [OPTION_1, OPTION_1])
+
+        with patch('instructor_task.tasks_helper._get_current_task'):
+            result = upload_grades_csv(None, None, self.course.id, None, 'graded')
+            self.verify_csv_task_success(result)
+            self.verify_grades_in_csv(
+                [
+                    {self.student_a: {'grade': '1.0', 'HW': '1.0'}},
+                    {self.student_b: {'grade': '0.0', 'HW': '0.0'}}
+                ]
+            )
diff --git a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
index cdaf037338..027e132cc9 100644
--- a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
+++ b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
@@ -4,13 +4,9 @@ Unit tests for LMS instructor-initiated background tasks helper functions.
 Tests that CSV grade report generation works with unicode emails.
 
 """
-import os
-import shutil
-
 import ddt
 from mock import Mock, patch
 
-from django.conf import settings
 from django.test.testcases import TestCase
 
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -20,30 +16,17 @@ from student.tests.factories import CourseEnrollmentFactory, UserFactory
 
 from instructor_task.models import ReportStore
 from instructor_task.tasks_helper import upload_grades_csv, upload_students_csv
+from instructor_task.tests.test_base import InstructorTaskCourseTestCase, TestReportMixin
 
 
-class TestReport(ModuleStoreTestCase):
+@ddt.ddt
+class TestInstructorGradeReport(TestReportMixin, InstructorTaskCourseTestCase):
     """
-    Base class for testing CSV download tasks.
+    Tests that CSV grade report generation works.
     """
     def setUp(self):
         self.course = CourseFactory.create()
 
-    def tearDown(self):
-        if os.path.exists(settings.GRADES_DOWNLOAD['ROOT_PATH']):
-            shutil.rmtree(settings.GRADES_DOWNLOAD['ROOT_PATH'])
-
-    def create_student(self, username, email):
-        student = UserFactory.create(username=username, email=email)
-        CourseEnrollmentFactory.create(user=student, course_id=self.course.id)
-        return student
-
-
-@ddt.ddt
-class TestInstructorGradeReport(TestReport):
-    """
-    Tests that CSV grade report generation works.
-    """
     @ddt.data([u'student@example.com', u'ni\xf1o@example.com'])
     def test_unicode_emails(self, emails):
         """
@@ -79,10 +62,13 @@ class TestInstructorGradeReport(TestReport):
 
 
 @ddt.ddt
-class TestStudentReport(TestReport):
+class TestStudentReport(TestReportMixin, InstructorTaskCourseTestCase):
     """
     Tests that CSV student profile report generation works.
     """
+    def setUp(self):
+        self.course = CourseFactory.create()
+
     def test_success(self):
         self.create_student('student', 'student@example.com')
         task_input = {'features': []}
diff --git a/lms/djangoapps/licenses/tests.py b/lms/djangoapps/licenses/tests.py
index d9f190826c..c3bb8ca7a3 100644
--- a/lms/djangoapps/licenses/tests.py
+++ b/lms/djangoapps/licenses/tests.py
@@ -15,7 +15,7 @@ from django.core.management import call_command
 from django.core.urlresolvers import reverse
 from nose.tools import assert_true  # pylint: disable=E0611
 
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 from licenses.models import CourseSoftware, UserLicense
 
 from student.tests.factories import UserFactory
@@ -144,7 +144,7 @@ class LicenseTestCase(TestCase):
         self.assertEqual(302, response.status_code)
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class CommandTest(ModuleStoreTestCase):
     '''Test management command for importing serial numbers'''
     def setUp(self):
diff --git a/lms/djangoapps/linkedin/management/commands/linkedin_mailusers.py b/lms/djangoapps/linkedin/management/commands/linkedin_mailusers.py
index afd81f08d0..6e88abc649 100644
--- a/lms/djangoapps/linkedin/management/commands/linkedin_mailusers.py
+++ b/lms/djangoapps/linkedin/management/commands/linkedin_mailusers.py
@@ -78,12 +78,11 @@ BULK_EMAIL_FAILURE_ERRORS = (
     SMTPException,
 )
 
-
-
 MAX_ATTEMPTS = 10
 
 log = logging.getLogger("linkedin")
 
+
 class Command(BaseCommand):
     """
     Django command for inviting users to add their course certificates to their
@@ -152,7 +151,6 @@ class Command(BaseCommand):
 
         transaction.commit()
 
-
     def certificate_url(self, certificate):
         """
         Generates a certificate URL based on LinkedIn's documentation.  The
@@ -230,7 +228,7 @@ class Command(BaseCommand):
         while i <= num_attempts:
             try:
                 msg.send()
-                return True # Happy path!
+                return True  # Happy path!
             except SINGLE_EMAIL_FAILURE_ERRORS:
                 # Something unrecoverable is wrong about the email acct we're sending to
                 log.exception(
diff --git a/lms/djangoapps/mobile_api/users/serializers.py b/lms/djangoapps/mobile_api/users/serializers.py
index 19014212d9..b0ae321a3c 100644
--- a/lms/djangoapps/mobile_api/users/serializers.py
+++ b/lms/djangoapps/mobile_api/users/serializers.py
@@ -44,7 +44,7 @@ class CourseField(serializers.RelatedField):
         return {
             "id": course_id,
             "name": course.display_name,
-            "number": course.number,
+            "number": course.display_number_with_default,
             "org": course.display_org_with_default,
             "start": course.start,
             "end": course.end,
diff --git a/lms/djangoapps/mobile_api/users/tests.py b/lms/djangoapps/mobile_api/users/tests.py
index d923aa3a90..8a851cd182 100644
--- a/lms/djangoapps/mobile_api/users/tests.py
+++ b/lms/djangoapps/mobile_api/users/tests.py
@@ -1,15 +1,21 @@
 """
 Tests for users API
 """
+
+import ddt
 from rest_framework.test import APITestCase
+from unittest import skip
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.django import modulestore
 from courseware.tests.factories import UserFactory
 from django.core.urlresolvers import reverse
 from mobile_api.users.serializers import CourseEnrollmentSerializer
 from student.models import CourseEnrollment
+from student import auth
 
 
+@ddt.ddt
 class TestUserApi(ModuleStoreTestCase, APITestCase):
     """
     Test the user info API
@@ -25,44 +31,70 @@ class TestUserApi(ModuleStoreTestCase, APITestCase):
         super(TestUserApi, self).tearDown()
         self.client.logout()
 
-    def _enroll(self):
+    def _enrollment_url(self):
+        """
+        api url that gets the current user's course enrollments
+        """
+        return reverse('courseenrollment-detail', kwargs={'username': self.user.username})
+
+    def _enroll(self, course):
         """
         enroll test user in test course
         """
         resp = self.client.post(reverse('change_enrollment'), {
             'enrollment_action': 'enroll',
-            'course_id': self.course.id.to_deprecated_string(),
+            'course_id': course.id.to_deprecated_string(),
             'check_access': True,
         })
         self.assertEqual(resp.status_code, 200)
 
-    def test_user_enrollments(self):
-        url = reverse('courseenrollment-detail', kwargs={'username': self.user.username})
+    def _verify_single_course_enrollment(self, course):
+        """
+        check that enrolling in course adds us to it
+        """
 
+        url = self._enrollment_url()
         self.client.login(username=self.username, password=self.password)
+        self._enroll(course)
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data, [])  # pylint: disable=E1103
 
-        self._enroll()
-        response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
-        courses = response.data  # pylint: disable=E1103
+        courses = response.data   # pylint: disable=maybe-no-member
+        self.assertEqual(len(courses), 1)
 
-        self.assertTrue(len(courses), 1)
-        course = courses[0]['course']
-        self.assertTrue('video_outline' in course)
-        self.assertTrue('course_handouts' in course)
-        self.assertEqual(course['id'], self.course.id.to_deprecated_string())
+        found_course = courses[0]['course']
+        self.assertTrue('video_outline' in found_course)
+        self.assertTrue('course_handouts' in found_course)
+        self.assertEqual(found_course['id'], unicode(course.id))
         self.assertEqual(courses[0]['mode'], 'honor')
 
+    def test_non_mobile_enrollments(self):
+        url = self._enrollment_url()
+        non_mobile_course = CourseFactory.create(mobile_available=False)
+        self.client.login(username=self.username, password=self.password)
+
+        self._enroll(non_mobile_course)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data, [])    # pylint: disable=maybe-no-member
+
+    @ddt.data(auth.CourseBetaTesterRole, auth.CourseStaffRole, auth.CourseInstructorRole)
+    def test_privileged_enrollments(self, role):
+        non_mobile_course = CourseFactory.create(mobile_available=False)
+        role(non_mobile_course.id).add_users(self.user)
+
+        self._verify_single_course_enrollment(non_mobile_course)
+
+    def test_mobile_enrollments(self):
+        self._verify_single_course_enrollment(self.course)
+
     def test_user_overview(self):
         self.client.login(username=self.username, password=self.password)
         url = reverse('user-detail', kwargs={'username': self.user.username})
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        data = response.data  # pylint: disable=E1103
+        data = response.data  # pylint: disable=maybe-no-member
         self.assertEqual(data['username'], self.user.username)
         self.assertEqual(data['email'], self.user.email)
 
@@ -89,7 +121,20 @@ class TestUserApi(ModuleStoreTestCase, APITestCase):
 
     def test_course_serializer(self):
         self.client.login(username=self.username, password=self.password)
-        self._enroll()
+        self._enroll(self.course)
         serialized = CourseEnrollmentSerializer(CourseEnrollment.enrollments_for_user(self.user)[0]).data  # pylint: disable=E1101
         self.assertEqual(serialized['course']['video_outline'], None)
         self.assertEqual(serialized['course']['name'], self.course.display_name)
+        self.assertEqual(serialized['course']['number'], self.course.id.course)
+        self.assertEqual(serialized['course']['org'], self.course.id.org)
+
+    def test_course_serializer_with_display_overrides(self):
+        self.course.display_coursenumber = "overridden_number"
+        self.course.display_organization = "overridden_org"
+        modulestore().update_item(self.course, self.user.id)
+
+        self.client.login(username=self.username, password=self.password)
+        self._enroll(self.course)
+        serialized = CourseEnrollmentSerializer(CourseEnrollment.enrollments_for_user(self.user)[0]).data  # pylint: disable=E1101
+        self.assertEqual(serialized['course']['number'], self.course.display_coursenumber)
+        self.assertEqual(serialized['course']['org'], self.course.display_organization)
diff --git a/lms/djangoapps/mobile_api/users/views.py b/lms/djangoapps/mobile_api/users/views.py
index 79080b5142..11d47f2cb8 100644
--- a/lms/djangoapps/mobile_api/users/views.py
+++ b/lms/djangoapps/mobile_api/users/views.py
@@ -8,8 +8,10 @@ from rest_framework.authentication import OAuth2Authentication, SessionAuthentic
 from rest_framework.decorators import api_view, authentication_classes, permission_classes
 from rest_framework.permissions import IsAuthenticated
 
-from courseware.access import has_access
+from courseware import access
 from student.models import CourseEnrollment, User
+from student.roles import CourseBetaTesterRole
+from student import auth
 
 from .serializers import CourseEnrollmentSerializer, UserSerializer
 
@@ -79,7 +81,7 @@ class UserCourseEnrollmentsList(generics.ListAPIView):
           certified.
         * is_active: Whether the course is currently active; true or false.
         * course: A collection of data about the course:
-        
+
           * course_about: The URI to get the data for the course About page.
           * course_updates: The URI to get data for course updates.
           * number: The course number.
@@ -119,12 +121,18 @@ def my_user_info(request):
 
 def mobile_course_enrollments(enrollments, user):
     """
-    Return enrollments only if courses are mobile_available (or if the user has staff access)
-    enrollments is a list of CourseEnrollments.
+    Return enrollments only if courses are mobile_available (or if the user has
+    privileged (beta, staff, instructor) access)
+
+    :param enrollments is a list of CourseEnrollments.
     """
     for enr in enrollments:
         course = enr.course
+
+        # Implicitly includes instructor role via the following has_access check
+        role = CourseBetaTesterRole(course.id)
+
         # The course doesn't always really exist -- we can have bad data in the enrollments
         # pointing to non-existent (or removed) courses, in which case `course` is None.
-        if course and (course.mobile_available or has_access(user, 'staff', course)):
+        if course and (course.mobile_available or auth.has_access(user, role) or access.has_access(user, 'staff', course)):
             yield enr
diff --git a/lms/djangoapps/mobile_api/video_outlines/serializers.py b/lms/djangoapps/mobile_api/video_outlines/serializers.py
index 1d312c599d..029e72a7e7 100644
--- a/lms/djangoapps/mobile_api/video_outlines/serializers.py
+++ b/lms/djangoapps/mobile_api/video_outlines/serializers.py
@@ -40,7 +40,8 @@ class BlockOutline(object):
                 block = child_to_parent[block]
                 if block is not self.start_block:
                     block_path.append({
-                        'name': block.display_name,
+                        # to be consistent with other edx-platform clients, return the defaulted display name
+                        'name': block.display_name_with_default,
                         'category': block.category,
                     })
             return reversed(block_path)
@@ -76,20 +77,30 @@ class BlockOutline(object):
                 kwargs=kwargs,
                 request=self.request,
             )
-            return unit_url, section_url
+            return unit_url, section_url, block_path
 
         user = self.request.user
 
         while stack:
             curr_block = stack.pop()
 
+            if curr_block.hide_from_toc:
+                # For now, if the 'hide_from_toc' setting is set on the block, do not traverse down
+                # the hierarchy.  The reason being is that these blocks may not have human-readable names
+                # to display on the mobile clients.
+                # Eventually, we'll need to figure out how we want these blocks to be displayed on the
+                # mobile clients.  As, they are still accessible in the browser, just not navigatable
+                # from the table-of-contents.
+                continue
+
             if curr_block.category in self.categories_to_outliner:
                 if not has_access(user, 'load', curr_block, course_key=self.course_id):
                     continue
 
                 summary_fn = self.categories_to_outliner[curr_block.category]
                 block_path = list(path(curr_block))
-                unit_url, section_url = find_urls(curr_block)
+                unit_url, section_url, _ = find_urls(curr_block)
+
                 yield {
                     "path": block_path,
                     "named_path": [b["name"] for b in block_path[:-1]],
@@ -145,7 +156,7 @@ def video_summary(course, course_id, video_descriptor, request, local_cache):
         "size": size,
         "name": video_descriptor.display_name,
         "transcripts": transcripts,
-        "language": video_descriptor.transcript_language,
+        "language": video_descriptor.get_default_transcript_language(),
         "category": video_descriptor.category,
         "id": unicode(video_descriptor.scope_ids.usage_id),
     }
diff --git a/lms/djangoapps/mobile_api/video_outlines/tests.py b/lms/djangoapps/mobile_api/video_outlines/tests.py
index 167359ca6b..134826552c 100644
--- a/lms/djangoapps/mobile_api/video_outlines/tests.py
+++ b/lms/djangoapps/mobile_api/video_outlines/tests.py
@@ -4,6 +4,7 @@ Tests for video outline API
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from xmodule.video_module import transcripts_utils
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.django import modulestore
 from courseware.tests.factories import UserFactory
 from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
 from django.core.urlresolvers import reverse
@@ -27,13 +28,13 @@ class TestVideoOutline(ModuleStoreTestCase, APITestCase):
         super(TestVideoOutline, self).setUp()
         self.user = UserFactory.create()
         self.course = CourseFactory.create(mobile_available=True)
-        section = ItemFactory.create(
+        self.section = ItemFactory.create(
             parent_location=self.course.location,
             category="chapter",
             display_name=u"test factory section omega \u03a9",
         )
         self.sub_section = ItemFactory.create(
-            parent_location=section.location,
+            parent_location=self.section.location,
             category="sequential",
             display_name=u"test subsection omega \u03a9",
         )
@@ -50,6 +51,12 @@ class TestVideoOutline(ModuleStoreTestCase, APITestCase):
             metadata={'graded': True, 'format': 'Homework'},
             display_name=u"test unit omega 2 \u03a9",
         )
+        self.nameless_unit = ItemFactory.create(
+            parent_location=self.sub_section.location,
+            category="vertical",
+            metadata={'graded': True, 'format': 'Homework'},
+            display_name=None,
+        )
 
         self.edx_video_id = 'testing-123'
 
@@ -90,15 +97,28 @@ class TestVideoOutline(ModuleStoreTestCase, APITestCase):
                 }
             ]})
 
-        subid = uuid4().hex
-        self.video = ItemFactory.create(
-            parent_location=self.unit.location,
-            category="video",
-            edx_video_id=self.edx_video_id,
-            display_name=u"test video omega \u03a9",
-            sub=subid
-        )
+        self.client.login(username=self.user.username, password='test')
 
+    def test_course_not_available(self):
+        nonmobile = CourseFactory.create()
+        url = reverse('video-summary-list', kwargs={'course_id': unicode(nonmobile.id)})
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 403)
+
+    def _get_video_summary_list(self):
+        """
+        Calls the video-summary-list endpoint, expecting a success response
+        """
+        url = reverse('video-summary-list', kwargs={'course_id': unicode(self.course.id)})
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        return response.data  # pylint: disable=E1103
+
+    def _create_video_with_subs(self):
+        """
+        Creates and returns a video with stored subtitles.
+        """
+        subid = uuid4().hex
         transcripts_utils.save_subs_to_store({
             'start': [100, 200, 240, 390, 1000],
             'end': [200, 240, 380, 1000, 1500],
@@ -111,16 +131,16 @@ class TestVideoOutline(ModuleStoreTestCase, APITestCase):
             ]},
             subid,
             self.course)
-
-        self.client.login(username=self.user.username, password='test')
-
-    def test_course_not_available(self):
-        nonmobile = CourseFactory.create()
-        url = reverse('video-summary-list', kwargs={'course_id': unicode(nonmobile.id)})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 403)
+        return ItemFactory.create(
+            parent_location=self.unit.location,
+            category="video",
+            edx_video_id=self.edx_video_id,
+            display_name=u"test video omega \u03a9",
+            sub=subid
+        )
 
     def test_course_list(self):
+        self._create_video_with_subs()
         ItemFactory.create(
             parent_location=self.other_unit.location,
             category="video",
@@ -133,7 +153,6 @@ class TestVideoOutline(ModuleStoreTestCase, APITestCase):
             display_name=u"test video omega 3 \u03a9",
             source=self.html5_video_url
         )
-
         ItemFactory.create(
             parent_location=self.unit.location,
             category="video",
@@ -142,11 +161,7 @@ class TestVideoOutline(ModuleStoreTestCase, APITestCase):
             visible_to_staff_only=True,
         )
 
-        url = reverse('video-summary-list', kwargs={'course_id': unicode(self.course.id)})
-        response = self.client.get(url)
-
-        self.assertEqual(response.status_code, 200)
-        course_outline = response.data  # pylint: disable=E1103
+        course_outline = self._get_video_summary_list()
         self.assertEqual(len(course_outline), 3)
         vid = course_outline[0]
         self.assertTrue('test_subsection_omega_%CE%A9' in vid['section_url'])
@@ -157,14 +172,77 @@ class TestVideoOutline(ModuleStoreTestCase, APITestCase):
         self.assertTrue('en' in vid['summary']['transcripts'])
         self.assertEqual(course_outline[1]['summary']['video_url'], self.html5_video_url)
         self.assertEqual(course_outline[1]['summary']['size'], 0)
+        self.assertEqual(course_outline[1]['path'][2]['name'], self.other_unit.display_name)
 
         self.assertEqual(course_outline[2]['summary']['video_url'], self.html5_video_url)
         self.assertEqual(course_outline[2]['summary']['size'], 0)
 
-    def test_transcripts(self):
+    def test_course_list_with_nameless_unit(self):
+        ItemFactory.create(
+            parent_location=self.nameless_unit.location,
+            category="video",
+            edx_video_id=self.edx_video_id,
+            display_name=u"test draft video omega 2 \u03a9"
+        )
+        course_outline = self._get_video_summary_list()
+        self.assertEqual(len(course_outline), 1)
+        self.assertEqual(course_outline[0]['path'][2]['name'], self.nameless_unit.location.block_id)
+
+    def test_course_list_with_hidden_blocks(self):
+        hidden_subsection = ItemFactory.create(
+            parent_location=self.section.location,
+            category="sequential",
+            hide_from_toc=True,
+        )
+        unit_within_hidden_subsection = ItemFactory.create(
+            parent_location=hidden_subsection.location,
+            category="vertical",
+        )
+        hidden_unit = ItemFactory.create(
+            parent_location=self.sub_section.location,
+            category="vertical",
+            hide_from_toc=True,
+        )
+        ItemFactory.create(
+            parent_location=unit_within_hidden_subsection.location,
+            category="video",
+            edx_video_id=self.edx_video_id,
+        )
+        ItemFactory.create(
+            parent_location=hidden_unit.location,
+            category="video",
+            edx_video_id=self.edx_video_id,
+        )
+        course_outline = self._get_video_summary_list()
+        self.assertEqual(len(course_outline), 0)
+
+    def test_course_list_transcripts(self):
+        video = ItemFactory.create(
+            parent_location=self.nameless_unit.location,
+            category="video",
+            edx_video_id=self.edx_video_id,
+            display_name=u"test draft video omega 2 \u03a9"
+        )
+        transcript_cases = [
+            ({}, "en"),
+            ({"en": 1}, "en"),
+            ({"lang1": 1}, "lang1"),
+            ({"lang1": 1, "en": 2}, "en"),
+            ({"lang1": 1, "lang2": 2}, "lang1"),
+        ]
+
+        for transcript_case in transcript_cases:
+            video.transcripts = transcript_case[0]
+            modulestore().update_item(video, self.user.id)
+            course_outline = self._get_video_summary_list()
+            self.assertEqual(len(course_outline), 1)
+            self.assertEqual(course_outline[0]['summary']['language'], transcript_case[1])
+
+    def test_transcripts_detail(self):
+        video = self._create_video_with_subs()
         kwargs = {
             'course_id': unicode(self.course.id),
-            'block_id': unicode(self.video.scope_ids.usage_id.block_id),
+            'block_id': unicode(video.scope_ids.usage_id.block_id),
             'lang': 'pl'
         }
         url = reverse('video-transcripts-detail', kwargs=kwargs)
diff --git a/lms/djangoapps/mobile_api/video_outlines/views.py b/lms/djangoapps/mobile_api/video_outlines/views.py
index 2efcdf3ddd..172a2c4fdc 100644
--- a/lms/djangoapps/mobile_api/video_outlines/views.py
+++ b/lms/djangoapps/mobile_api/video_outlines/views.py
@@ -104,7 +104,7 @@ class VideoTranscripts(generics.RetrieveAPIView):
     **Example request**:
 
         GET /api/mobile/v0.5/video_outlines/transcripts/{organization}/{course_number}/{course_run}/{video ID}/{language code}
-    
+
     **Response Values**
 
         An HttpResponse with an SRT file download.
diff --git a/lms/djangoapps/oauth2_handler/handlers.py b/lms/djangoapps/oauth2_handler/handlers.py
index 8ea7a6b54c..60591ec62e 100644
--- a/lms/djangoapps/oauth2_handler/handlers.py
+++ b/lms/djangoapps/oauth2_handler/handlers.py
@@ -1,6 +1,7 @@
 """ Handlers for OpenID Connect provider. """
 
 from django.conf import settings
+from django.core.cache import cache
 
 from courseware.access import has_access
 from student.models import anonymous_id_for_user
@@ -68,33 +69,34 @@ class CourseAccessHandler(object):
     valid only if the user is instructor or staff of at least one course.
 
     Each new scope has a corresponding claim: `instructor_courses` and
-    `staff_courses` that lists the course_ids for which the user as instructor
+    `staff_courses` that lists the course_ids for which the user has instructor
     or staff privileges.
 
-    The claims support claim request values. In other words, if no claim is
-    requested it returns all the courses for the corresponding privileges. If a
-    claim request is used, then it only returns the from the list of requested
-    values that have the corresponding privileges.
+    The claims support claim request values: if there is no claim request, the
+    value of the claim is the list all the courses for which the user has the
+    corresponding privileges. If a claim request is used, then the value of the
+    claim the list of courses from the requested values that have the
+    corresponding privileges.
 
     For example, if the user is staff of course_a and course_b but not
-    course_c, the request:
+    course_c, the claim corresponding to the scope request:
 
         scope = openid course_staff
 
-    will return:
+    has the value:
 
         {staff_courses: [course_a, course_b] }
 
-    If the request is:
+    For the claim request:
 
-        claims = {userinfo: {staff_courses=[course_b, course_d]}}
+        claims = {userinfo: {staff_courses: {values=[course_b, course_d]}}}
 
-    the result will be:
+    the corresponding claim will have the value:
 
         {staff_courses: [course_b] }.
 
-    This is useful to quickly determine if a user has the right
-    privileges for a given course.
+    This is useful to quickly determine if a user has the right privileges for a
+    given course.
 
     For a description of the function naming and arguments, see:
 
@@ -102,6 +104,11 @@ class CourseAccessHandler(object):
 
     """
 
+    COURSE_CACHE_TIMEOUT = getattr(settings, 'OIDC_COURSE_HANDLER_CACHE_TIMEOUT', 60)  # In seconds.
+
+    def __init__(self, *_args, **_kwargs):
+        self._course_cache = {}
+
     def scope_course_instructor(self, data):
         """
         Scope `course_instructor` valid only if the user is an instructor
@@ -109,7 +116,10 @@ class CourseAccessHandler(object):
 
         """
 
-        course_ids = self._courses_with_access_type(data, 'instructor')
+        # TODO: unfortunately there is not a faster and still correct way to
+        # check if a user is instructor of at least one course other than
+        # checking the access type against all known courses.
+        course_ids = self.find_courses(data['user'], 'instructor')
         return ['instructor_courses'] if course_ids else None
 
     def scope_course_staff(self, data):
@@ -118,8 +128,9 @@ class CourseAccessHandler(object):
         least one course.
 
         """
+        # TODO: see :method:CourseAccessHandler.scope_course_instructor
+        course_ids = self.find_courses(data['user'], 'staff')
 
-        course_ids = self._courses_with_access_type(data, 'staff')
         return ['staff_courses'] if course_ids else None
 
     def claim_instructor_courses(self, data):
@@ -128,7 +139,8 @@ class CourseAccessHandler(object):
         user has instructor privileges.
 
         """
-        return self._courses_with_access_type(data, 'instructor')
+
+        return self.find_courses(data['user'], 'instructor', data.get('values'))
 
     def claim_staff_courses(self, data):
         """
@@ -136,52 +148,66 @@ class CourseAccessHandler(object):
         has staff privileges.
 
         """
-        return self._courses_with_access_type(data, 'staff')
 
-    def _courses_with_access_type(self, data, access_type):
+        return self.find_courses(data['user'], 'staff', data.get('values'))
+
+    def find_courses(self, user, access_type, values=None):
         """
-        Utility function to list all courses for a user according to the
-        access type.
-
-        The field `data` follows the handler specification in:
-
-            `oauth2_provider/oidc/handlers.py`
+        Find all courses for which the user has the specified access type. If
+        `values` is specified, check only the courses from `values`.
 
         """
 
-        user = data['user']
-        values = set(data.get('values', []))
+        # Check the instance cache and update if not present.  The instance
+        # cache is useful since there are multiple scope and claims calls in the
+        # same request.
 
-        courses = _get_all_courses()
-        courses = (c for c in courses if has_access(user, access_type, c))
-        course_ids = (unicode(c.id) for c in courses)
-
-        # If values was provided, return only the requested authorized courses
-        if values:
-            return [c for c in course_ids if c in values]
+        key = (user.id, access_type)
+        if key in self._course_cache:
+            course_ids = self._course_cache[key]
         else:
-            return [c for c in course_ids]
+            course_ids = self._get_courses_with_access_type(user, access_type)
+            self._course_cache[key] = course_ids
+
+        # If values was specified, filter out other courses.
+        if values is not None:
+            course_ids = list(set(course_ids) & set(values))
+
+        return course_ids
+
+    # pylint: disable=missing-docstring
+    def _get_courses_with_access_type(self, user, access_type):
+
+        # Check the application cache and update if not present. The application
+        # cache is useful since there are calls to different endpoints in close
+        # succession, for example the id_token and user_info endpoins.
+
+        key = '-'.join([str(self.__class__), str(user.id), access_type])
+        course_ids = cache.get(key)
+
+        if course_ids is None:
+            course_ids = [unicode(course.id) for course in _get_all_courses()
+                          if has_access(user, access_type, course)]
+            cache.set(key, course_ids, self.COURSE_CACHE_TIMEOUT)
+
+        return course_ids
 
 
 class IDTokenHandler(OpenIDHandler, ProfileHandler, CourseAccessHandler):
-    """
-    Configure the ID Token handler for the LMS.
-
-    Note that the values of the claims `instructor_courses` and
-    `staff_courses` are not included in the ID Token. The rationale is
-    that for global staff, the list of courses returned could be very
-    large. Instead they could check for specific courses using the
-    UserInfo endpoint.
-
-    """
-
+    """ Configure the ID Token handler for the LMS. """
     def claim_instructor_courses(self, data):
-        # Don't return list of courses in ID Tokens
-        return None
+        # Don't return list of courses unless they are requested as essential.
+        if data.get('essential'):
+            return super(IDTokenHandler, self).claim_instructor_courses(data)
+        else:
+            return None
 
     def claim_staff_courses(self, data):
-        # Don't return list of courses in ID Tokens
-        return None
+        # Don't return list of courses unless they are requested as essential.
+        if data.get('essential'):
+            return super(IDTokenHandler, self).claim_staff_courses(data)
+        else:
+            return None
 
 
 class UserInfoHandler(OpenIDHandler, ProfileHandler, CourseAccessHandler):
@@ -194,6 +220,8 @@ def _get_all_courses():
     Utitilty function to list all available courses.
 
     """
+
     ms_courses = modulestore().get_courses()
     courses = [c for c in ms_courses if isinstance(c, CourseDescriptor)]
+
     return courses
diff --git a/lms/djangoapps/oauth2_handler/tests.py b/lms/djangoapps/oauth2_handler/tests.py
index b358e2648c..033c29dbb5 100644
--- a/lms/djangoapps/oauth2_handler/tests.py
+++ b/lms/djangoapps/oauth2_handler/tests.py
@@ -1,6 +1,6 @@
 # pylint: disable=missing-docstring
+from django.core.cache import cache
 from django.test.utils import override_settings
-from django.test import TestCase
 
 from courseware.tests.tests import TEST_DATA_MIXED_MODULESTORE
 from lang_pref import LANGUAGE_KEY
@@ -14,9 +14,11 @@ from user_api.models import UserPreference
 # Will also run default tests for IDTokens and UserInfo
 from oauth2_provider.tests import IDTokenTestCase, UserInfoTestCase
 
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+
 
 @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
-class BaseTestMixin(TestCase):
+class BaseTestMixin(ModuleStoreTestCase):
     profile = None
 
     def setUp(self):
@@ -34,8 +36,14 @@ class BaseTestMixin(TestCase):
 
 
 class IDTokenTest(BaseTestMixin, IDTokenTestCase):
+    def setUp(self):
+        super(IDTokenTest, self).setUp()
+
+        # CourseAccessHandler uses the application cache.
+        cache.clear()
+
     def test_sub_claim(self):
-        scopes, claims = self.get_new_id_token_values('openid')
+        scopes, claims = self.get_id_token_values('openid')
         self.assertIn('openid', scopes)
 
         sub = claims['sub']
@@ -44,7 +52,7 @@ class IDTokenTest(BaseTestMixin, IDTokenTestCase):
         self.assertEqual(sub, expected_sub)
 
     def test_user_name_claim(self):
-        _scopes, claims = self.get_new_id_token_values('openid profile')
+        _scopes, claims = self.get_id_token_values('openid profile')
         claim_name = claims['name']
 
         user_profile = UserProfile.objects.get(user=self.user)
@@ -54,14 +62,14 @@ class IDTokenTest(BaseTestMixin, IDTokenTestCase):
 
     @override_settings(LANGUAGE_CODE='en')
     def test_user_without_locale_claim(self):
-        scopes, claims = self.get_new_id_token_values('openid profile')
+        scopes, claims = self.get_id_token_values('openid profile')
         self.assertIn('profile', scopes)
         self.assertEqual(claims['locale'], 'en')
 
     def test_user_with_locale_claim(self):
         language = 'en'
         UserPreference.set_preference(self.user, LANGUAGE_KEY, language)
-        scopes, claims = self.get_new_id_token_values('openid profile')
+        scopes, claims = self.get_id_token_values('openid profile')
 
         self.assertIn('profile', scopes)
 
@@ -69,8 +77,7 @@ class IDTokenTest(BaseTestMixin, IDTokenTestCase):
         self.assertEqual(language, locale)
 
     def test_no_special_course_access(self):
-        scopes, claims = self.get_new_id_token_values('openid course_instructor course_staff')
-
+        scopes, claims = self.get_id_token_values('openid course_instructor course_staff')
         self.assertNotIn('course_staff', scopes)
         self.assertNotIn('staff_courses', claims)
 
@@ -80,7 +87,7 @@ class IDTokenTest(BaseTestMixin, IDTokenTestCase):
     def test_course_staff_courses(self):
         CourseStaffRole(self.course_key).add_users(self.user)
 
-        scopes, claims = self.get_new_id_token_values('openid course_staff')
+        scopes, claims = self.get_id_token_values('openid course_staff')
 
         self.assertIn('course_staff', scopes)
         self.assertNotIn('staff_courses', claims)  # should not return courses in id_token
@@ -88,11 +95,32 @@ class IDTokenTest(BaseTestMixin, IDTokenTestCase):
     def test_course_instructor_courses(self):
         CourseInstructorRole(self.course_key).add_users(self.user)
 
-        scopes, claims = self.get_new_id_token_values('openid course_instructor')
+        scopes, claims = self.get_id_token_values('openid course_instructor')
 
         self.assertIn('course_instructor', scopes)
         self.assertNotIn('instructor_courses', claims)   # should not return courses in id_token
 
+    def test_course_staff_courses_with_claims(self):
+        CourseStaffRole(self.course_key).add_users(self.user)
+
+        course_id = unicode(self.course_key)
+        nonexistent_course_id = 'some/other/course'
+
+        claims = {
+            'staff_courses': {
+                'values': [course_id, nonexistent_course_id],
+                'essential': True,
+            }
+        }
+
+        scopes, claims = self.get_id_token_values(scope='openid course_staff', claims=claims)
+
+        self.assertIn('course_staff', scopes)
+        self.assertIn('staff_courses', claims)
+        self.assertEqual(len(claims['staff_courses']), 1)
+        self.assertIn(course_id, claims['staff_courses'])
+        self.assertNotIn(nonexistent_course_id, claims['staff_courses'])
+
 
 class UserInfoTest(BaseTestMixin, UserInfoTestCase):
     def token_for_scope(self, scope):
diff --git a/lms/djangoapps/open_ended_grading/tests.py b/lms/djangoapps/open_ended_grading/tests.py
index 74bcc466b5..0f246324dc 100644
--- a/lms/djangoapps/open_ended_grading/tests.py
+++ b/lms/djangoapps/open_ended_grading/tests.py
@@ -68,35 +68,35 @@ class StudentProblemListMockQuery(object):
         @returns: grading status message dictionary.
         """
         return {
-                "version": 1,
-                "problem_list": [
-                    {
-                        "problem_name": "Test1",
-                        "grader_type": "IN",
-                        "eta_available": True,
-                        "state": "Finished",
-                        "eta": 259200,
-                        "location": "i4x://edX/open_ended/combinedopenended/SampleQuestion1Attempt"
-                    },
-                    {
-                        "problem_name": "Test2",
-                        "grader_type": "NA",
-                        "eta_available": True,
-                        "state": "Waiting to be Graded",
-                        "eta": 259200,
-                        "location": "i4x://edX/open_ended/combinedopenended/SampleQuestion"
-                    },
-                    {
-                        "problem_name": "Test3",
-                        "grader_type": "PE",
-                        "eta_available": True,
-                        "state": "Waiting to be Graded",
-                        "eta": 259200,
-                        "location": "i4x://edX/open_ended/combinedopenended/SampleQuestion454"
-                    },
-                ],
-                "success": True
-            }
+            "version": 1,
+            "problem_list": [
+                {
+                    "problem_name": "Test1",
+                    "grader_type": "IN",
+                    "eta_available": True,
+                    "state": "Finished",
+                    "eta": 259200,
+                    "location": "i4x://edX/open_ended/combinedopenended/SampleQuestion1Attempt"
+                },
+                {
+                    "problem_name": "Test2",
+                    "grader_type": "NA",
+                    "eta_available": True,
+                    "state": "Waiting to be Graded",
+                    "eta": 259200,
+                    "location": "i4x://edX/open_ended/combinedopenended/SampleQuestion"
+                },
+                {
+                    "problem_name": "Test3",
+                    "grader_type": "PE",
+                    "eta_available": True,
+                    "state": "Waiting to be Graded",
+                    "eta": 259200,
+                    "location": "i4x://edX/open_ended/combinedopenended/SampleQuestion454"
+                },
+            ],
+            "success": True
+        }
 
 
 @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
@@ -273,7 +273,7 @@ class TestPeerGradingService(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.location_string = self.course_id.make_usage_key('html', 'TestLocation').to_deprecated_string()
         self.toy = modulestore().get_course(self.course_id)
         location = "i4x://edX/toy/peergrading/init"
-        field_data = DictFieldData({'data': "<peergrading/>", 'location': location, 'category':'peergrading'})
+        field_data = DictFieldData({'data': "<peergrading/>", 'location': location, 'category': 'peergrading'})
         self.mock_service = peer_grading_service.MockPeerGradingService()
         self.system = LmsModuleSystem(
             static_url=settings.STATIC_URL,
@@ -321,7 +321,7 @@ class TestPeerGradingService(ModuleStoreTestCase, LoginEnrollmentTestCase):
             'feedback': 'feedback',
             'submission_flagged': 'false',
             'answer_unknown': 'false',
-            'rubric_scores_complete' : 'true'
+            'rubric_scores_complete': 'true'
         }
 
         qdict = MagicMock()
diff --git a/lms/djangoapps/open_ended_grading/views.py b/lms/djangoapps/open_ended_grading/views.py
index c24c0540a6..b8930cfcdd 100644
--- a/lms/djangoapps/open_ended_grading/views.py
+++ b/lms/djangoapps/open_ended_grading/views.py
@@ -61,6 +61,7 @@ ALERT_DICT = {
     'Flagged Submissions': _("Submissions have been flagged for review"),
 }
 
+
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 def staff_grading(request, course_id):
     """
@@ -133,6 +134,7 @@ def peer_grading(request, course_id):
 
     return HttpResponseRedirect(problem_url)
 
+
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 def student_problem_list(request, course_id):
     """
@@ -175,10 +177,11 @@ def student_problem_list(request, course_id):
         'error_text': error_text,
         # Checked above
         'staff_access': False,
-        }
+    }
 
     return render_to_response('open_ended_problems/open_ended_problems.html', context)
 
+
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 def flagged_problem_list(request, course_id):
     '''
@@ -336,4 +339,4 @@ def take_action_on_flags(request, course_id):
             'success': False,
             'error': STAFF_ERROR_MESSAGE
         }
-        return HttpResponse(json.dumps(response),mimetype="application/json")
+        return HttpResponse(json.dumps(response), mimetype="application/json")
diff --git a/lms/djangoapps/shoppingcart/context_processor.py b/lms/djangoapps/shoppingcart/context_processor.py
index df667569d0..e884bef7e3 100644
--- a/lms/djangoapps/shoppingcart/context_processor.py
+++ b/lms/djangoapps/shoppingcart/context_processor.py
@@ -7,6 +7,7 @@ navigation.  We want to do this in the context_processor to
 """
 from django.conf import settings
 import shoppingcart
+from microsite_configuration import microsite
 
 
 def user_has_cart_context_processor(request):
@@ -15,12 +16,24 @@ def user_has_cart_context_processor(request):
     be displayed.  Anonymous users don't.
     Adds `display_shopping_cart` to the context
     """
-    return {'display_shopping_cart': (
-        request.user.is_authenticated() and                                # user is logged in and
-        settings.FEATURES.get('ENABLE_PAID_COURSE_REGISTRATION') and  # settings enable paid course reg and
-        settings.FEATURES.get('ENABLE_SHOPPING_CART') and             # settings enable shopping cart and
+    display_shopping_cart = (
+        # user is logged in and
+        request.user.is_authenticated() and
+        # settings enable paid course reg
+        microsite.get_value(
+            'ENABLE_PAID_COURSE_REGISTRATION',
+            settings.FEATURES.get('ENABLE_PAID_COURSE_REGISTRATION')
+        ) and
+        # settings enable shopping cart
+        microsite.get_value(
+            'ENABLE_SHOPPING_CART',
+            settings.FEATURES.get('ENABLE_SHOPPING_CART')
+        ) and
+        # user's cart has PaidCourseRegistrations
         shoppingcart.models.Order.user_cart_has_items(
             request.user,
             [shoppingcart.models.PaidCourseRegistration, shoppingcart.models.CourseRegCodeItem]
-        )  # user's cart has PaidCourseRegistrations
-    )}
+        )
+    )
+
+    return {'display_shopping_cart': display_shopping_cart}
diff --git a/lms/djangoapps/shoppingcart/migrations/0021_auto__add_field_orderitem_created__add_field_orderitem_modified.py b/lms/djangoapps/shoppingcart/migrations/0021_auto__add_field_orderitem_created__add_field_orderitem_modified.py
new file mode 100644
index 0000000000..f6870ff5a4
--- /dev/null
+++ b/lms/djangoapps/shoppingcart/migrations/0021_auto__add_field_orderitem_created__add_field_orderitem_modified.py
@@ -0,0 +1,224 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'OrderItem.created'
+        db.add_column('shoppingcart_orderitem', 'created',
+                      self.gf('model_utils.fields.AutoCreatedField')(default=datetime.datetime.now),
+                      keep_default=False)
+
+        # Adding field 'OrderItem.modified'
+        db.add_column('shoppingcart_orderitem', 'modified',
+                      self.gf('model_utils.fields.AutoLastModifiedField')(default=datetime.datetime.now),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'OrderItem.created'
+        db.delete_column('shoppingcart_orderitem', 'created')
+
+        # Deleting field 'OrderItem.modified'
+        db.delete_column('shoppingcart_orderitem', 'modified')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'shoppingcart.certificateitem': {
+            'Meta': {'object_name': 'CertificateItem', '_ormbases': ['shoppingcart.OrderItem']},
+            'course_enrollment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['student.CourseEnrollment']"}),
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '128', 'db_index': 'True'}),
+            'mode': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
+            'orderitem_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['shoppingcart.OrderItem']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'shoppingcart.coupon': {
+            'Meta': {'object_name': 'Coupon'},
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 11, 6, 0, 0)'}),
+            'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'percentage_discount': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'shoppingcart.couponredemption': {
+            'Meta': {'object_name': 'CouponRedemption'},
+            'coupon': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['shoppingcart.Coupon']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'order': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['shoppingcart.Order']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'shoppingcart.courseregcodeitem': {
+            'Meta': {'object_name': 'CourseRegCodeItem', '_ormbases': ['shoppingcart.OrderItem']},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '128', 'db_index': 'True'}),
+            'mode': ('django.db.models.fields.SlugField', [], {'default': "'honor'", 'max_length': '50'}),
+            'orderitem_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['shoppingcart.OrderItem']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'shoppingcart.courseregcodeitemannotation': {
+            'Meta': {'object_name': 'CourseRegCodeItemAnnotation'},
+            'annotation': ('django.db.models.fields.TextField', [], {'null': 'True'}),
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'shoppingcart.courseregistrationcode': {
+            'Meta': {'object_name': 'CourseRegistrationCode'},
+            'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 11, 6, 0, 0)'}),
+            'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'created_by_user'", 'to': "orm['auth.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'invoice': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['shoppingcart.Invoice']", 'null': 'True'}),
+            'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'purchase_order'", 'null': 'True', 'to': "orm['shoppingcart.Order']"})
+        },
+        'shoppingcart.donation': {
+            'Meta': {'object_name': 'Donation', '_ormbases': ['shoppingcart.OrderItem']},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'donation_type': ('django.db.models.fields.CharField', [], {'default': "'general'", 'max_length': '32'}),
+            'orderitem_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['shoppingcart.OrderItem']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'shoppingcart.donationconfiguration': {
+            'Meta': {'object_name': 'DonationConfiguration'},
+            'change_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'changed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'on_delete': 'models.PROTECT'}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'shoppingcart.invoice': {
+            'Meta': {'object_name': 'Invoice'},
+            'address_line_1': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'address_line_2': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
+            'address_line_3': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
+            'company_contact_email': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'company_contact_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'company_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'customer_reference_number': ('django.db.models.fields.CharField', [], {'max_length': '63', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
+            'is_valid': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'recipient_email': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'recipient_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
+            'total_amount': ('django.db.models.fields.FloatField', [], {}),
+            'zip': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True'})
+        },
+        'shoppingcart.order': {
+            'Meta': {'object_name': 'Order'},
+            'bill_to_cardtype': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'bill_to_ccnum': ('django.db.models.fields.CharField', [], {'max_length': '8', 'blank': 'True'}),
+            'bill_to_city': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'bill_to_country': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'bill_to_first': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'bill_to_last': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'bill_to_postalcode': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}),
+            'bill_to_state': ('django.db.models.fields.CharField', [], {'max_length': '8', 'blank': 'True'}),
+            'bill_to_street1': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'bill_to_street2': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'company_contact_email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'company_contact_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'company_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'usd'", 'max_length': '8'}),
+            'customer_reference_number': ('django.db.models.fields.CharField', [], {'max_length': '63', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'order_type': ('django.db.models.fields.CharField', [], {'default': "'personal'", 'max_length': '32'}),
+            'processor_reply_dump': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'purchase_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'recipient_email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'recipient_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'refunded_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'cart'", 'max_length': '32'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'shoppingcart.orderitem': {
+            'Meta': {'object_name': 'OrderItem'},
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'usd'", 'max_length': '8'}),
+            'fulfilled_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'line_desc': ('django.db.models.fields.CharField', [], {'default': "'Misc. Item'", 'max_length': '1024'}),
+            'list_price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '30', 'decimal_places': '2'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'order': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['shoppingcart.Order']"}),
+            'qty': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'refund_requested_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
+            'report_comments': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'service_fee': ('django.db.models.fields.DecimalField', [], {'default': '0.0', 'max_digits': '30', 'decimal_places': '2'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'cart'", 'max_length': '32', 'db_index': 'True'}),
+            'unit_cost': ('django.db.models.fields.DecimalField', [], {'default': '0.0', 'max_digits': '30', 'decimal_places': '2'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'shoppingcart.paidcourseregistration': {
+            'Meta': {'object_name': 'PaidCourseRegistration', '_ormbases': ['shoppingcart.OrderItem']},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '128', 'db_index': 'True'}),
+            'mode': ('django.db.models.fields.SlugField', [], {'default': "'honor'", 'max_length': '50'}),
+            'orderitem_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['shoppingcart.OrderItem']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'shoppingcart.paidcourseregistrationannotation': {
+            'Meta': {'object_name': 'PaidCourseRegistrationAnnotation'},
+            'annotation': ('django.db.models.fields.TextField', [], {'null': 'True'}),
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'shoppingcart.registrationcoderedemption': {
+            'Meta': {'object_name': 'RegistrationCodeRedemption'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'order': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['shoppingcart.Order']", 'null': 'True'}),
+            'redeemed_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 11, 6, 0, 0)', 'null': 'True'}),
+            'redeemed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'registration_code': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['shoppingcart.CourseRegistrationCode']"})
+        },
+        'student.courseenrollment': {
+            'Meta': {'ordering': "('user', 'course_id')", 'unique_together': "(('user', 'course_id'),)", 'object_name': 'CourseEnrollment'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'mode': ('django.db.models.fields.CharField', [], {'default': "'honor'", 'max_length': '100'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['shoppingcart']
\ No newline at end of file
diff --git a/lms/djangoapps/shoppingcart/models.py b/lms/djangoapps/shoppingcart/models.py
index 928da2360e..37a32dfe0c 100644
--- a/lms/djangoapps/shoppingcart/models.py
+++ b/lms/djangoapps/shoppingcart/models.py
@@ -21,6 +21,7 @@ from django.db import transaction
 from django.db.models import Sum
 from django.core.urlresolvers import reverse
 from model_utils.managers import InheritanceManager
+from model_utils.models import TimeStampedModel
 from django.core.mail.message import EmailMessage
 
 from xmodule.modulestore.django import modulestore
@@ -434,7 +435,7 @@ class Order(models.Model):
         return instruction_dict, instruction_set
 
 
-class OrderItem(models.Model):
+class OrderItem(TimeStampedModel):
     """
     This is the basic interface for order items.
     Order items are line items that fill up the shopping carts and orders.
diff --git a/lms/djangoapps/shoppingcart/processors/CyberSource.py b/lms/djangoapps/shoppingcart/processors/CyberSource.py
index 1e2d665fa1..0b171ae8d1 100644
--- a/lms/djangoapps/shoppingcart/processors/CyberSource.py
+++ b/lms/djangoapps/shoppingcart/processors/CyberSource.py
@@ -242,15 +242,16 @@ def get_processor_decline_html(params):
     payment_support_email = microsite.get_value('payment_support_email', settings.PAYMENT_SUPPORT_EMAIL)
 
     msg = dedent(_(
-            """
-            <p class="error_msg">
-            Sorry! Our payment processor did not accept your payment.
-            The decision they returned was <span class="decision">{decision}</span>,
-            and the reason was <span class="reason">{reason_code}:{reason_msg}</span>.
-            You were not charged. Please try a different form of payment.
-            Contact us with payment-related questions at {email}.
-            </p>
-            """))
+        """
+        <p class="error_msg">
+        Sorry! Our payment processor did not accept your payment.
+        The decision they returned was <span class="decision">{decision}</span>,
+        and the reason was <span class="reason">{reason_code}:{reason_msg}</span>.
+        You were not charged. Please try a different form of payment.
+        Contact us with payment-related questions at {email}.
+        </p>
+        """
+    ))
 
     return msg.format(
         decision=params['decision'],
@@ -266,36 +267,39 @@ def get_processor_exception_html(exception):
     payment_support_email = microsite.get_value('payment_support_email', settings.PAYMENT_SUPPORT_EMAIL)
     if isinstance(exception, CCProcessorDataException):
         msg = dedent(_(
-                """
-                <p class="error_msg">
-                Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!
-                We apologize that we cannot verify whether the charge went through and take further action on your order.
-                The specific error message is: <span class="exception_msg">{msg}</span>.
-                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.
-                </p>
-                """.format(msg=exception.message, email=payment_support_email)))
+            """
+            <p class="error_msg">
+            Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!
+            We apologize that we cannot verify whether the charge went through and take further action on your order.
+            The specific error message is: <span class="exception_msg">{msg}</span>.
+            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.
+            </p>
+            """.format(msg=exception.message, email=payment_support_email)
+        ))
         return msg
     elif isinstance(exception, CCProcessorWrongAmountException):
         msg = dedent(_(
-                """
-                <p class="error_msg">
-                Sorry! Due to an error your purchase was charged for a different amount than the order total!
-                The specific error message is: <span class="exception_msg">{msg}</span>.
-                Your credit card has probably been charged. Contact us with payment-specific questions at {email}.
-                </p>
-                """.format(msg=exception.message, email=payment_support_email)))
+            """
+            <p class="error_msg">
+            Sorry! Due to an error your purchase was charged for a different amount than the order total!
+            The specific error message is: <span class="exception_msg">{msg}</span>.
+            Your credit card has probably been charged. Contact us with payment-specific questions at {email}.
+            </p>
+            """.format(msg=exception.message, email=payment_support_email)
+        ))
         return msg
     elif isinstance(exception, CCProcessorSignatureException):
         msg = dedent(_(
-                """
-                <p class="error_msg">
-                Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are
-                unable to validate that the message actually came from the payment processor.
-                The specific error message is: <span class="exception_msg">{msg}</span>.
-                We apologize that we cannot verify whether the charge went through and take further action on your order.
-                Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.
-                </p>
-                """.format(msg=exception.message, email=payment_support_email)))
+            """
+            <p class="error_msg">
+            Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are
+            unable to validate that the message actually came from the payment processor.
+            The specific error message is: <span class="exception_msg">{msg}</span>.
+            We apologize that we cannot verify whether the charge went through and take further action on your order.
+            Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}.
+            </p>
+            """.format(msg=exception.message, email=payment_support_email)
+        ))
         return msg
 
     # fallthrough case, which basically never happens
diff --git a/lms/djangoapps/shoppingcart/processors/CyberSource2.py b/lms/djangoapps/shoppingcart/processors/CyberSource2.py
index efd0b8f530..1d66138a96 100644
--- a/lms/djangoapps/shoppingcart/processors/CyberSource2.py
+++ b/lms/djangoapps/shoppingcart/processors/CyberSource2.py
@@ -25,6 +25,7 @@ import binascii
 import re
 import json
 import uuid
+import logging
 from textwrap import dedent
 from datetime import datetime
 from collections import OrderedDict, defaultdict
@@ -38,6 +39,8 @@ from shoppingcart.processors.exceptions import *
 from shoppingcart.processors.helpers import get_processor_config
 from microsite_configuration import microsite
 
+log = logging.getLogger(__name__)
+
 
 def process_postpay_callback(params):
     """
@@ -76,12 +79,19 @@ def process_postpay_callback(params):
                 'error_html': ''
             }
         else:
+            _record_payment_info(params, result['order'])
             return {
                 'success': False,
                 'order': result['order'],
                 'error_html': _get_processor_decline_html(params)
             }
     except CCProcessorException as error:
+        log.exception('error processing CyberSource postpay callback')
+        # if we have the order and the id, log it
+        if hasattr(error, 'order'):
+            _record_payment_info(params, error.order)
+        else:
+            log.info(json.dumps(params))
         return {
             'success': False,
             'order': None,  # due to exception we may not have the order
@@ -346,7 +356,7 @@ def _payment_accepted(order_id, auth_amount, currency, decision):
                 'order': order
             }
         else:
-            raise CCProcessorWrongAmountException(
+            ex = CCProcessorWrongAmountException(
                 _(
                     u"The amount charged by the processor {charged_amount} {charged_amount_currency} is different "
                     u"than the total cost of the order {total_cost} {total_cost_currency}."
@@ -357,6 +367,8 @@ def _payment_accepted(order_id, auth_amount, currency, decision):
                     total_cost_currency=order.currency
                 )
             )
+            ex.order = order
+            raise ex
     else:
         return {
             'accepted': False,
@@ -404,6 +416,20 @@ def _record_purchase(params, order):
     )
 
 
+def _record_payment_info(params, order):
+    """
+    Record the purchase and run purchased_callbacks
+
+    Args:
+        params (dict): The parameters we received from CyberSource.
+
+    Returns:
+        None
+    """
+    order.processor_reply_dump = json.dumps(params)
+    order.save()
+
+
 def _get_processor_decline_html(params):
     """
     Return HTML indicating that the user's payment was declined.
@@ -449,9 +475,9 @@ def _get_processor_exception_html(exception):
     if isinstance(exception, CCProcessorDataException):
         return _format_error_html(
             _(
-                u"Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!  "
-                u"We apologize that we cannot verify whether the charge went through and take further action on your order.  "
-                u"The specific error message is: {msg}  "
+                u"Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data! "
+                u"We apologize that we cannot verify whether the charge went through and take further action on your order. "
+                u"The specific error message is: {msg} "
                 u"Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}."
             ).format(
                 msg=u'<span class="exception_msg">{msg}</span>'.format(msg=exception.message),
@@ -461,8 +487,8 @@ def _get_processor_exception_html(exception):
     elif isinstance(exception, CCProcessorWrongAmountException):
         return _format_error_html(
             _(
-                u"Sorry! Due to an error your purchase was charged for a different amount than the order total!  "
-                u"The specific error message is: {msg}.  "
+                u"Sorry! Due to an error your purchase was charged for a different amount than the order total! "
+                u"The specific error message is: {msg}. "
                 u"Your credit card has probably been charged. Contact us with payment-specific questions at {email}."
             ).format(
                 msg=u'<span class="exception_msg">{msg}</span>'.format(msg=exception.message),
@@ -476,7 +502,7 @@ def _get_processor_exception_html(exception):
                 u"unable to validate that the message actually came from the payment processor. "
                 u"The specific error message is: {msg}. "
                 u"We apologize that we cannot verify whether the charge went through and take further action on your order. "
-                u"Your credit card may possibly have been charged.  Contact us with payment-specific questions at {email}."
+                u"Your credit card may possibly have been charged. Contact us with payment-specific questions at {email}."
             ).format(
                 msg=u'<span class="exception_msg">{msg}</span>'.format(msg=exception.message),
                 email=payment_support_email
@@ -495,7 +521,7 @@ def _get_processor_exception_html(exception):
     else:
         return _format_error_html(
             _(
-                u"Sorry!  Your payment could not be processed because an unexpected exception occurred.  "
+                u"Sorry! Your payment could not be processed because an unexpected exception occurred. "
                 u"Please contact us at {email} for assistance."
             ).format(email=payment_support_email)
         )
@@ -503,7 +529,7 @@ def _get_processor_exception_html(exception):
 
 def _format_error_html(msg):
     """ Format an HTML error message """
-    return '<p class="error_msg">{msg}</p>'.format(msg=msg)
+    return u'<p class="error_msg">{msg}</p>'.format(msg=msg)
 
 
 CARDTYPE_MAP = defaultdict(lambda: "UNKNOWN")
diff --git a/lms/djangoapps/shoppingcart/processors/exceptions.py b/lms/djangoapps/shoppingcart/processors/exceptions.py
index 2bcf35e50f..47a51a8b60 100644
--- a/lms/djangoapps/shoppingcart/processors/exceptions.py
+++ b/lms/djangoapps/shoppingcart/processors/exceptions.py
@@ -16,5 +16,6 @@ class CCProcessorDataException(CCProcessorException):
 class CCProcessorWrongAmountException(CCProcessorException):
     pass
 
+
 class CCProcessorUserCancelled(CCProcessorException):
     pass
diff --git a/lms/djangoapps/shoppingcart/processors/tests/test_CyberSource2.py b/lms/djangoapps/shoppingcart/processors/tests/test_CyberSource2.py
index 2636b44dc6..5a12fa5597 100644
--- a/lms/djangoapps/shoppingcart/processors/tests/test_CyberSource2.py
+++ b/lms/djangoapps/shoppingcart/processors/tests/test_CyberSource2.py
@@ -4,6 +4,7 @@ Tests for the newer CyberSource API implementation.
 """
 from mock import patch
 from django.test import TestCase
+from django.conf import settings
 import ddt
 
 from student.tests.factories import UserFactory
@@ -12,7 +13,13 @@ from shoppingcart.processors.CyberSource2 import (
     processor_hash,
     process_postpay_callback,
     render_purchase_form_html,
-    get_signed_purchase_params
+    get_signed_purchase_params,
+    _get_processor_exception_html
+)
+from shoppingcart.processors.exceptions import (
+    CCProcessorSignatureException,
+    CCProcessorDataException,
+    CCProcessorWrongAmountException
 )
 
 
@@ -42,6 +49,13 @@ class CyberSource2Test(TestCase):
             line_cost=self.COST
         )
 
+    def assert_dump_recorded(self, order):
+        """
+        Verify that this order does have a dump of information from the
+        payment processor.
+        """
+        self.assertNotEqual(order.processor_reply_dump, '')
+
     def test_render_purchase_form_html(self):
         # Verify that the HTML form renders with the payment URL specified
         # in the test settings.
@@ -124,6 +138,7 @@ class CyberSource2Test(TestCase):
 
         # Expect that the order has been marked as purchased
         self.assertEqual(result['order'].status, 'purchased')
+        self.assert_dump_recorded(result['order'])
 
     def test_process_payment_rejected(self):
         # Simulate a callback from CyberSource indicating that the payment was rejected
@@ -133,6 +148,7 @@ class CyberSource2Test(TestCase):
         # Expect that we get an error message
         self.assertFalse(result['success'])
         self.assertIn(u"did not accept your payment", result['error_html'])
+        self.assert_dump_recorded(result['order'])
 
     def test_process_payment_invalid_signature(self):
         # Simulate a callback from CyberSource indicating that the payment was rejected
@@ -160,6 +176,9 @@ class CyberSource2Test(TestCase):
         # Expect an error
         self.assertFalse(result['success'])
         self.assertIn(u"different amount than the order total", result['error_html'])
+        # refresh data for current order
+        order = Order.objects.get(id=self.order.id)
+        self.assert_dump_recorded(order)
 
     def test_process_amount_paid_not_decimal(self):
         # Change the payment amount to a non-decimal
@@ -195,6 +214,7 @@ class CyberSource2Test(TestCase):
             msg="Payment was not successful: {error}".format(error=result.get('error_html'))
         )
         self.assertEqual(result['error_html'], '')
+        self.assert_dump_recorded(result['order'])
 
         # Expect that the order has placeholders for the missing credit card digits
         self.assertEqual(result['order'].bill_to_ccnum, '####')
@@ -226,6 +246,20 @@ class CyberSource2Test(TestCase):
         # Verify that this executes without a unicode error
         result = process_postpay_callback(params)
         self.assertTrue(result['success'])
+        self.assert_dump_recorded(result['order'])
+
+    @ddt.data('string', u'üñîçø∂é')
+    def test_get_processor_exception_html(self, error_string):
+        """
+        Tests the processor exception html message
+        """
+        for exception_type in [CCProcessorSignatureException, CCProcessorWrongAmountException, CCProcessorDataException]:
+            error_msg = error_string
+            exception = exception_type(error_msg)
+            html = _get_processor_exception_html(exception)
+            self.assertIn(settings.PAYMENT_SUPPORT_EMAIL, html)
+            self.assertIn('Sorry!', html)
+            self.assertIn(error_msg, html)
 
     def _signed_callback_params(
         self, order_id, order_amount, paid_amount,
diff --git a/lms/djangoapps/shoppingcart/tests/test_views.py b/lms/djangoapps/shoppingcart/tests/test_views.py
index 5c1c16ddb9..873960f068 100644
--- a/lms/djangoapps/shoppingcart/tests/test_views.py
+++ b/lms/djangoapps/shoppingcart/tests/test_views.py
@@ -49,6 +49,7 @@ def mock_render_purchase_form_html(*args, **kwargs):
 
 form_mock = Mock(side_effect=mock_render_purchase_form_html)
 
+
 def mock_render_to_response(*args, **kwargs):
     return render_to_response(*args, **kwargs)
 
@@ -633,7 +634,6 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
         self.assertEqual(resp.status_code, 200)
         self.assertTrue(PaidCourseRegistration.contained_in_order(self.cart, self.course_key))
 
-
     @patch('shoppingcart.views.render_purchase_form_html', form_mock)
     @patch('shoppingcart.views.render_to_response', render_mock)
     def test_show_cart(self):
@@ -911,12 +911,10 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
         self.assertIn('FirstNameTesting123', resp.content)
         self.assertIn('80.00', resp.content)
 
-
         ((template, context), _) = render_mock.call_args
 
         # When we come from the upgrade flow, we get these context variables
 
-
         self.assertEqual(template, 'shoppingcart/receipt.html')
         self.assertEqual(context['order'], self.cart)
         self.assertIn(reg_item, context['shoppingcart_items'][0])
@@ -1167,7 +1165,6 @@ class DonationViewTest(ModuleStoreTestCase):
         )
         self.assertEqual(response.status_code, 405)
 
-
     def test_donations_disabled(self):
         config = DonationConfiguration.current()
         config.enabled = False
diff --git a/lms/djangoapps/staticbook/tests.py b/lms/djangoapps/staticbook/tests.py
index 5f76cea1b4..a611f37874 100644
--- a/lms/djangoapps/staticbook/tests.py
+++ b/lms/djangoapps/staticbook/tests.py
@@ -10,7 +10,7 @@ import requests
 from django.test.utils import override_settings
 from django.core.urlresolvers import reverse, NoReverseMatch
 
-from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE
 from student.tests.factories import UserFactory, CourseEnrollmentFactory
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -46,7 +46,7 @@ HTML_BOOK = {
 }
 
 
-@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class StaticBookTest(ModuleStoreTestCase):
     """
     Helpers for the static book tests.
diff --git a/lms/djangoapps/student_account/test/test_views.py b/lms/djangoapps/student_account/test/test_views.py
index b17543b31e..b293292f3f 100644
--- a/lms/djangoapps/student_account/test/test_views.py
+++ b/lms/djangoapps/student_account/test/test_views.py
@@ -264,7 +264,6 @@ class StudentAccountUpdateTest(UrlResetMixin, TestCase):
         result = self.client.login(username=self.USERNAME, password=self.NEW_PASSWORD)
         self.assertTrue(result)
 
-
     @ddt.data(True, False)
     def test_password_change_logged_out(self, send_email):
         # Log the user out
diff --git a/docs/en_us/course_authors/__init__.py b/lms/djangoapps/survey/__init__.py
similarity index 100%
rename from docs/en_us/course_authors/__init__.py
rename to lms/djangoapps/survey/__init__.py
diff --git a/lms/djangoapps/survey/admin.py b/lms/djangoapps/survey/admin.py
new file mode 100644
index 0000000000..3095c97001
--- /dev/null
+++ b/lms/djangoapps/survey/admin.py
@@ -0,0 +1,29 @@
+"""
+Provide accessors to these models via the Django Admin pages
+"""
+
+from django import forms
+from django.contrib import admin
+from survey.models import SurveyForm
+
+
+class SurveyFormAdminForm(forms.ModelForm):  # pylint: disable=R0924
+    """Form providing validation of SurveyForm content."""
+
+    class Meta:  # pylint: disable=C0111
+        model = SurveyForm
+        fields = ('name', 'form')
+
+    def clean_form(self):
+        """Validate the HTML template."""
+        form = self.cleaned_data["form"]
+        SurveyForm.validate_form_html(form)
+        return form
+
+
+class SurveyFormAdmin(admin.ModelAdmin):
+    """Admin for SurveyForm"""
+    form = SurveyFormAdminForm
+
+
+admin.site.register(SurveyForm, SurveyFormAdmin)
diff --git a/lms/djangoapps/survey/exceptions.py b/lms/djangoapps/survey/exceptions.py
new file mode 100644
index 0000000000..6b883b35bf
--- /dev/null
+++ b/lms/djangoapps/survey/exceptions.py
@@ -0,0 +1,17 @@
+"""
+Specialized exceptions for the Survey Djangoapp
+"""
+
+
+class SurveyFormNotFound(Exception):
+    """
+    Thrown when a SurveyForm is not found in the database
+    """
+    pass
+
+
+class SurveyFormNameAlreadyExists(Exception):
+    """
+    Thrown when a SurveyForm is created but that name already exists
+    """
+    pass
diff --git a/lms/djangoapps/survey/migrations/0001_initial.py b/lms/djangoapps/survey/migrations/0001_initial.py
new file mode 100644
index 0000000000..c2cb7f2307
--- /dev/null
+++ b/lms/djangoapps/survey/migrations/0001_initial.py
@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'SurveyForm'
+        db.create_table('survey_surveyform', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('created', self.gf('model_utils.fields.AutoCreatedField')(default=datetime.datetime.now)),
+            ('modified', self.gf('model_utils.fields.AutoLastModifiedField')(default=datetime.datetime.now)),
+            ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255, db_index=True)),
+            ('form', self.gf('django.db.models.fields.TextField')()),
+        ))
+        db.send_create_signal('survey', ['SurveyForm'])
+
+        # Adding model 'SurveyAnswer'
+        db.create_table('survey_surveyanswer', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('created', self.gf('model_utils.fields.AutoCreatedField')(default=datetime.datetime.now)),
+            ('modified', self.gf('model_utils.fields.AutoLastModifiedField')(default=datetime.datetime.now)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('form', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['survey.SurveyForm'])),
+            ('field_name', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('field_value', self.gf('django.db.models.fields.CharField')(max_length=1024)),
+        ))
+        db.send_create_signal('survey', ['SurveyAnswer'])
+
+    def backwards(self, orm):
+        # Deleting model 'SurveyForm'
+        db.delete_table('survey_surveyform')
+
+        # Deleting model 'SurveyAnswer'
+        db.delete_table('survey_surveyanswer')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'survey.surveyanswer': {
+            'Meta': {'object_name': 'SurveyAnswer'},
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'field_value': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'form': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['survey.SurveyForm']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'survey.surveyform': {
+            'Meta': {'object_name': 'SurveyForm'},
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'form': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
+        }
+    }
+
+    complete_apps = ['survey']
diff --git a/docs/en_us/data/__init__.py b/lms/djangoapps/survey/migrations/__init__.py
similarity index 100%
rename from docs/en_us/data/__init__.py
rename to lms/djangoapps/survey/migrations/__init__.py
diff --git a/lms/djangoapps/survey/models.py b/lms/djangoapps/survey/models.py
new file mode 100644
index 0000000000..40e176bee4
--- /dev/null
+++ b/lms/djangoapps/survey/models.py
@@ -0,0 +1,224 @@
+"""
+Models to support Course Surveys feature
+"""
+
+import logging
+from lxml import etree
+from collections import OrderedDict
+from django.db import models
+from student.models import User
+from django.core.exceptions import ValidationError
+
+from model_utils.models import TimeStampedModel
+
+from survey.exceptions import SurveyFormNameAlreadyExists, SurveyFormNotFound
+
+log = logging.getLogger("edx.survey")
+
+
+class SurveyForm(TimeStampedModel):
+    """
+    Model to define a Survey Form that contains the HTML form data
+    that is presented to the end user. A SurveyForm is not tied to
+    a particular run of a course, to allow for sharing of Surveys
+    across courses
+    """
+    name = models.CharField(max_length=255, db_index=True, unique=True)
+    form = models.TextField()
+
+    def __unicode__(self):
+        return self.name
+
+    def save(self, *args, **kwargs):
+        """
+        Override save method so we can validate that the form HTML is
+        actually parseable
+        """
+
+        self.validate_form_html(self.form)
+
+        # now call the actual save method
+        super(SurveyForm, self).save(*args, **kwargs)
+
+    @classmethod
+    def validate_form_html(cls, html):
+        """
+        Makes sure that the html that is contained in the form field is valid
+        """
+        try:
+            fields = cls.get_field_names_from_html(html)
+        except Exception as ex:
+            log.exception("Cannot parse SurveyForm html: {}".format(ex))
+            raise ValidationError("Cannot parse SurveyForm as HTML: {}".format(ex))
+
+        if not len(fields):
+            raise ValidationError("SurveyForms must contain at least one form input field")
+
+    @classmethod
+    def create(cls, name, form, update_if_exists=False):
+        """
+        Helper class method to create a new Survey Form.
+
+        update_if_exists=True means that if a form already exists with that name, then update it.
+        Otherwise throw an SurveyFormAlreadyExists exception
+        """
+
+        survey = cls.get(name, throw_if_not_found=False)
+        if not survey:
+            survey = SurveyForm(name=name, form=form)
+        else:
+            if update_if_exists:
+                survey.form = form
+            else:
+                raise SurveyFormNameAlreadyExists()
+
+        survey.save()
+        return survey
+
+    @classmethod
+    def get(cls, name, throw_if_not_found=True):
+        """
+        Helper class method to look up a Survey Form, throw FormItemNotFound if it does not exists
+        in the database, unless throw_if_not_found=False then we return None
+        """
+
+        survey = None
+        exists = SurveyForm.objects.filter(name=name).exists()
+        if exists:
+            survey = SurveyForm.objects.get(name=name)
+        elif throw_if_not_found:
+            raise SurveyFormNotFound()
+
+        return survey
+
+    def get_answers(self, user=None, limit_num_users=10000):
+        """
+        Returns all answers for all users for this Survey
+        """
+        return SurveyAnswer.get_answers(self, user, limit_num_users=limit_num_users)
+
+    def has_user_answered_survey(self, user):
+        """
+        Returns whether a given user has supplied answers to this
+        survey
+        """
+        return SurveyAnswer.do_survey_answers_exist(self, user)
+
+    def save_user_answers(self, user, answers):
+        """
+        Store answers to the form for a given user. Answers is a dict of simple
+        name/value pairs
+
+        IMPORTANT: There is no validaton of form answers at this point. All data
+        supplied to this method is presumed to be previously validated
+        """
+        SurveyAnswer.save_answers(self, user, answers)
+
+    def get_field_names(self):
+        """
+        Returns a list of defined field names for all answers in a survey. This can be
+        helpful for reporting like features, i.e. adding headers to the reports
+        This is taken from the set of <input> fields inside the form.
+        """
+
+        return SurveyForm.get_field_names_from_html(self.form)
+
+    @classmethod
+    def get_field_names_from_html(cls, html):
+        """
+        Returns a list of defined field names from a block of HTML
+        """
+        names = []
+
+        # make sure the form is wrap in some outer single element
+        # otherwise lxml can't parse it
+        # NOTE: This wrapping doesn't change the ability to query it
+        tree = etree.fromstring(u'<div>{}</div>'.format(html))
+
+        input_fields = tree.findall('.//input') + tree.findall('.//select')
+
+        for input_field in input_fields:
+            if 'name' in input_field.keys() and input_field.attrib['name'] not in names:
+                names.append(input_field.attrib['name'])
+
+        return names
+
+
+class SurveyAnswer(TimeStampedModel):
+    """
+    Model for the answers that a user gives for a particular form in a course
+    """
+    user = models.ForeignKey(User, db_index=True)
+    form = models.ForeignKey(SurveyForm, db_index=True)
+    field_name = models.CharField(max_length=255, db_index=True)
+    field_value = models.CharField(max_length=1024)
+
+    @classmethod
+    def do_survey_answers_exist(cls, form, user):
+        """
+        Returns whether a user has any answers for a given SurveyForm for a course
+        This can be used to determine if a user has taken a CourseSurvey.
+        """
+        return SurveyAnswer.objects.filter(form=form, user=user).exists()
+
+    @classmethod
+    def get_answers(cls, form, user=None, limit_num_users=10000):
+        """
+        Returns all answers a user (or all users, when user=None) has given to an instance of a SurveyForm
+
+        Return is a nested dict which are simple name/value pairs with an outer key which is the
+        user id. For example (where 'field3' is an optional field):
+
+        results = {
+            '1': {
+                'field1': 'value1',
+                'field2': 'value2',
+            },
+            '2': {
+                'field1': 'value3',
+                'field2': 'value4',
+                'field3': 'value5',
+            }
+            :
+            :
+        }
+
+        limit_num_users is to prevent an unintentional huge, in-memory dictionary.
+        """
+
+        if user:
+            answers = SurveyAnswer.objects.filter(form=form, user=user)
+        else:
+            answers = SurveyAnswer.objects.filter(form=form)
+
+        results = OrderedDict()
+        num_users = 0
+        for answer in answers:
+            user_id = answer.user.id
+            if user_id not in results and num_users < limit_num_users:
+                results[user_id] = OrderedDict()
+                num_users = num_users + 1
+
+            if user_id in results:
+                results[user_id][answer.field_name] = answer.field_value
+
+        return results
+
+    @classmethod
+    def save_answers(cls, form, user, answers):
+        """
+        Store answers to the form for a given user. Answers is a dict of simple
+        name/value pairs
+
+        IMPORTANT: There is no validaton of form answers at this point. All data
+        supplied to this method is presumed to be previously validated
+        """
+        for name in answers.keys():
+            value = answers[name]
+
+            # See if there is an answer stored for this user, form, field_name pair or not
+            # this will allow for update cases. This does include an additional lookup,
+            # but write operations will be relatively infrequent
+            answer, __ = SurveyAnswer.objects.get_or_create(user=user, form=form, field_name=name)
+            answer.field_value = value
+            answer.save()
diff --git a/docs/en_us/install_operations/__init__.py b/lms/djangoapps/survey/tests/__init__.py
similarity index 100%
rename from docs/en_us/install_operations/__init__.py
rename to lms/djangoapps/survey/tests/__init__.py
diff --git a/lms/djangoapps/survey/tests/test_models.py b/lms/djangoapps/survey/tests/test_models.py
new file mode 100644
index 0000000000..b33b783356
--- /dev/null
+++ b/lms/djangoapps/survey/tests/test_models.py
@@ -0,0 +1,224 @@
+"""
+Python tests for the Survey models
+"""
+
+from collections import OrderedDict
+
+from django.test import TestCase
+from django.test.client import Client
+from django.contrib.auth.models import User
+
+from survey.exceptions import SurveyFormNotFound, SurveyFormNameAlreadyExists
+from django.core.exceptions import ValidationError
+from survey.models import SurveyForm
+
+
+class SurveyModelsTests(TestCase):
+    """
+    All tests for the Survey models.py file
+    """
+    def setUp(self):
+        """
+        Set up the test data used in the specific tests
+        """
+        self.client = Client()
+
+        # Create two accounts
+        self.password = 'abc'
+        self.student = User.objects.create_user('student', 'student@test.com', self.password)
+        self.student2 = User.objects.create_user('student2', 'student2@test.com', self.password)
+
+        self.test_survey_name = 'TestForm'
+        self.test_form = '<li><input name="field1" /></li><li><input name="field2" /></li><li><select name="ddl"><option>1</option></select></li>'
+        self.test_form_update = '<input name="field1" />'
+
+        self.student_answers = OrderedDict({
+            'field1': 'value1',
+            'field2': 'value2',
+        })
+
+        self.student2_answers = OrderedDict({
+            'field1': 'value3'
+        })
+
+    def _create_test_survey(self):
+        """
+        Helper method to set up test form
+        """
+        return SurveyForm.create(self.test_survey_name, self.test_form)
+
+    def test_form_not_found_raise_exception(self):
+        """
+        Asserts that when looking up a form that does not exist
+        """
+
+        with self.assertRaises(SurveyFormNotFound):
+            SurveyForm.get(self.test_survey_name)
+
+    def test_form_not_found_none(self):
+        """
+        Asserts that when looking up a form that does not exist
+        """
+
+        self.assertIsNone(SurveyForm.get(self.test_survey_name, throw_if_not_found=False))
+
+    def test_create_new_form(self):
+        """
+        Make sure we can create a new form a look it up
+        """
+
+        survey = self._create_test_survey()
+        self.assertIsNotNone(survey)
+
+        new_survey = SurveyForm.get(self.test_survey_name)
+        self.assertIsNotNone(new_survey)
+        self.assertEqual(new_survey.form, self.test_form)
+
+    def test_unicode_rendering(self):
+        """
+        See if the survey form returns the expected unicode string
+        """
+        survey = self._create_test_survey()
+        self.assertIsNotNone(survey)
+        self.assertEquals(unicode(survey), self.test_survey_name)
+
+    def test_create_form_with_malformed_html(self):
+        """
+        Make sure that if a SurveyForm is saved with unparseable html
+        an exception is thrown
+        """
+        with self.assertRaises(ValidationError):
+            SurveyForm.create('badform', '<input name="oops" /><<<>')
+
+    def test_create_form_with_no_fields(self):
+        """
+        Make sure that if a SurveyForm is saved without any named fields
+        an exception is thrown
+        """
+        with self.assertRaises(ValidationError):
+            SurveyForm.create('badform', '<p>no input fields here</p>')
+
+        with self.assertRaises(ValidationError):
+            SurveyForm.create('badform', '<input id="input_without_name" />')
+
+    def test_create_form_already_exists(self):
+        """
+        Make sure we can't create two surveys of the same name
+        """
+
+        self._create_test_survey()
+        with self.assertRaises(SurveyFormNameAlreadyExists):
+            self._create_test_survey()
+
+    def test_create_form_update_existing(self):
+        """
+        Make sure we can update an existing form
+        """
+        survey = self._create_test_survey()
+        self.assertIsNotNone(survey)
+
+        survey = SurveyForm.create(self.test_survey_name, self.test_form_update, update_if_exists=True)
+        self.assertIsNotNone(survey)
+
+        survey = SurveyForm.get(self.test_survey_name)
+        self.assertIsNotNone(survey)
+        self.assertEquals(survey.form, self.test_form_update)
+
+    def test_survey_has_no_answers(self):
+        """
+        Create a new survey and assert that there are no answers to that survey
+        """
+
+        survey = self._create_test_survey()
+        self.assertEquals(len(survey.get_answers()), 0)
+
+    def test_user_has_no_answers(self):
+        """
+        Create a new survey with no answers in it and check that a user is determined to not have answered it
+        """
+
+        survey = self._create_test_survey()
+        self.assertFalse(survey.has_user_answered_survey(self.student))
+        self.assertEquals(len(survey.get_answers()), 0)
+
+    def test_single_user_answers(self):
+        """
+        Create a new survey and add answers to it
+        """
+
+        survey = self._create_test_survey()
+        self.assertIsNotNone(survey)
+
+        survey.save_user_answers(self.student, self.student_answers)
+
+        self.assertTrue(survey.has_user_answered_survey(self.student))
+
+        all_answers = survey.get_answers()
+        self.assertEquals(len(all_answers.keys()), 1)
+        self.assertTrue(self.student.id in all_answers)
+        self.assertEquals(all_answers[self.student.id], self.student_answers)
+
+        answers = survey.get_answers(self.student)
+        self.assertEquals(len(answers.keys()), 1)
+        self.assertTrue(self.student.id in answers)
+        self.assertEquals(all_answers[self.student.id], self.student_answers)
+
+    def test_multiple_user_answers(self):
+        """
+        Create a new survey and add answers to it
+        """
+
+        survey = self._create_test_survey()
+        self.assertIsNotNone(survey)
+
+        survey.save_user_answers(self.student, self.student_answers)
+        survey.save_user_answers(self.student2, self.student2_answers)
+
+        self.assertTrue(survey.has_user_answered_survey(self.student))
+
+        all_answers = survey.get_answers()
+        self.assertEquals(len(all_answers.keys()), 2)
+        self.assertTrue(self.student.id in all_answers)
+        self.assertTrue(self.student2.id in all_answers)
+        self.assertEquals(all_answers[self.student.id], self.student_answers)
+        self.assertEquals(all_answers[self.student2.id], self.student2_answers)
+
+        answers = survey.get_answers(self.student)
+        self.assertEquals(len(answers.keys()), 1)
+        self.assertTrue(self.student.id in answers)
+        self.assertEquals(all_answers[self.student.id], self.student_answers)
+
+        answers = survey.get_answers(self.student2)
+        self.assertEquals(len(answers.keys()), 1)
+        self.assertTrue(self.student2.id in answers)
+        self.assertEquals(all_answers[self.student2.id], self.student2_answers)
+
+    def test_limit_num_users(self):
+        """
+        Verify that the limit_num_users parameter to get_answers()
+        works as intended
+        """
+        survey = self._create_test_survey()
+
+        survey.save_user_answers(self.student, self.student_answers)
+        survey.save_user_answers(self.student2, self.student2_answers)
+
+        # even though we have 2 users submitted answers
+        # limit the result set to just 1
+        all_answers = survey.get_answers(limit_num_users=1)
+        self.assertEquals(len(all_answers.keys()), 1)
+
+    def test_get_field_names(self):
+        """
+        Create a new survey and add answers to it
+        """
+
+        survey = self._create_test_survey()
+        self.assertIsNotNone(survey)
+
+        survey.save_user_answers(self.student, self.student_answers)
+        survey.save_user_answers(self.student2, self.student2_answers)
+
+        names = survey.get_field_names()
+
+        self.assertEqual(sorted(names), ['ddl', 'field1', 'field2'])
diff --git a/lms/djangoapps/survey/tests/test_utils.py b/lms/djangoapps/survey/tests/test_utils.py
new file mode 100644
index 0000000000..e4472cd2ad
--- /dev/null
+++ b/lms/djangoapps/survey/tests/test_utils.py
@@ -0,0 +1,116 @@
+"""
+Python tests for the Survey models
+"""
+
+from collections import OrderedDict
+
+from django.test import TestCase
+from django.test.client import Client
+from django.contrib.auth.models import User
+
+from survey.models import SurveyForm
+
+from xmodule.modulestore.tests.factories import CourseFactory
+
+from survey.utils import is_survey_required_for_course, must_answer_survey
+
+
+class SurveyModelsTests(TestCase):
+    """
+    All tests for the utils.py file
+    """
+    def setUp(self):
+        """
+        Set up the test data used in the specific tests
+        """
+        self.client = Client()
+
+        # Create two accounts
+        self.password = 'abc'
+        self.student = User.objects.create_user('student', 'student@test.com', self.password)
+        self.student2 = User.objects.create_user('student2', 'student2@test.com', self.password)
+
+        self.staff = User.objects.create_user('staff', 'staff@test.com', self.password)
+        self.staff.is_staff = True
+        self.staff.save()
+
+        self.test_survey_name = 'TestSurvey'
+        self.test_form = '<input name="foo"></input>'
+
+        self.student_answers = OrderedDict({
+            'field1': 'value1',
+            'field2': 'value2',
+        })
+
+        self.student2_answers = OrderedDict({
+            'field1': 'value3'
+        })
+
+        self.course = CourseFactory.create(
+            course_survey_required=True,
+            course_survey_name=self.test_survey_name
+        )
+
+        self.survey = SurveyForm.create(self.test_survey_name, self.test_form)
+
+    def test_is_survey_required_for_course(self):
+        """
+        Assert the a requried course survey is when both the flags is set and a survey name
+        is set on the course descriptor
+        """
+        self.assertTrue(is_survey_required_for_course(self.course))
+
+    def test_is_survey_not_required_for_course(self):
+        """
+        Assert that if various data is not available or if the survey is not found
+        then the survey is not considered required
+        """
+        course = CourseFactory.create()
+        self.assertFalse(is_survey_required_for_course(course))
+
+        course = CourseFactory.create(
+            course_survey_required=False
+        )
+        self.assertFalse(is_survey_required_for_course(course))
+
+        course = CourseFactory.create(
+            course_survey_required=True,
+            course_survey_name="NonExisting"
+        )
+        self.assertFalse(is_survey_required_for_course(course))
+
+        course = CourseFactory.create(
+            course_survey_required=False,
+            course_survey_name=self.test_survey_name
+        )
+        self.assertFalse(is_survey_required_for_course(course))
+
+    def test_user_not_yet_answered_required_survey(self):
+        """
+        Assert that a new course which has a required survey but user has not answered it yet
+        """
+        self.assertTrue(must_answer_survey(self.course, self.student))
+
+        temp_course = CourseFactory.create(
+            course_survey_required=False
+        )
+        self.assertFalse(must_answer_survey(temp_course, self.student))
+
+        temp_course = CourseFactory.create(
+            course_survey_required=True,
+            course_survey_name="NonExisting"
+        )
+        self.assertFalse(must_answer_survey(temp_course, self.student))
+
+    def test_user_has_answered_required_survey(self):
+        """
+        Assert that a new course which has a required survey and user has answers for it
+        """
+        self.survey.save_user_answers(self.student, self.student_answers)
+        self.assertFalse(must_answer_survey(self.course, self.student))
+
+    def test_staff_must_answer_survey(self):
+        """
+        Assert that someone with staff level permissions does not have to answer the survey
+        """
+        self.assertFalse(must_answer_survey(self.course, self.staff))
diff --git a/lms/djangoapps/survey/tests/test_views.py b/lms/djangoapps/survey/tests/test_views.py
new file mode 100644
index 0000000000..ed0a506cb7
--- /dev/null
+++ b/lms/djangoapps/survey/tests/test_views.py
@@ -0,0 +1,152 @@
+"""
+Python tests for the Survey views
+"""
+
+import json
+from collections import OrderedDict
+
+from django.test import TestCase
+from django.test.client import Client
+from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
+
+from survey.models import SurveyForm
+
+from xmodule.modulestore.tests.factories import CourseFactory
+
+
+class SurveyViewsTests(TestCase):
+    """
+    All tests for the views.py file
+    """
+    def setUp(self):
+        """
+        Set up the test data used in the specific tests
+        """
+        self.client = Client()
+
+        # Create two accounts
+        self.password = 'abc'
+        self.student = User.objects.create_user('student', 'student@test.com', self.password)
+
+        self.test_survey_name = 'TestSurvey'
+        self.test_form = '<input name="field1" /><input name="field2" /><select name="ddl"><option>1</option></select>'
+
+        self.student_answers = OrderedDict({
+            u'field1': u'value1',
+            u'field2': u'value2',
+            u'ddl': u'1',
+        })
+
+        self.course = CourseFactory.create(
+            course_survey_required=True,
+            course_survey_name=self.test_survey_name
+        )
+
+        self.survey = SurveyForm.create(self.test_survey_name, self.test_form)
+
+        self.view_url = reverse('view_survey', args=[self.test_survey_name])
+        self.postback_url = reverse('submit_answers', args=[self.test_survey_name])
+
+        self.client.login(username=self.student.username, password=self.password)
+
+    def test_unauthenticated_survey_view(self):
+        """
+        Asserts that an unauthenticated user cannot access a survey
+        """
+        anon_user = Client()
+
+        resp = anon_user.get(self.view_url)
+        self.assertEquals(resp.status_code, 302)
+
+    def test_survey_not_found(self):
+        """
+        Asserts that if we ask for a Survey that does not exist, then we get a 302 redirect
+        """
+        resp = self.client.get(reverse('view_survey', args=['NonExisting']))
+        self.assertEquals(resp.status_code, 302)
+
+    def test_authenticated_survey_view(self):
+        """
+        Asserts that an authenticated user can see the survey
+        """
+        resp = self.client.get(self.view_url)
+        self.assertEquals(resp.status_code, 200)
+
+        # is the SurveyForm html present in the HTML response?
+        self.assertIn(self.test_form, resp.content)
+
+    def test_unautneticated_survey_postback(self):
+        """
+        Asserts that an anonymous user cannot answer a survey
+        """
+        anon_user = Client()
+        resp = anon_user.post(
+            self.postback_url,
+            self.student_answers
+        )
+        self.assertEquals(resp.status_code, 302)
+
+    def test_survey_postback_to_nonexisting_survey(self):
+        """
+        Asserts that any attempts to post back to a non existing survey returns a 404
+        """
+        resp = self.client.post(
+            reverse('submit_answers', args=['NonExisting']),
+            self.student_answers
+        )
+        self.assertEquals(resp.status_code, 404)
+
+    def test_survey_postback(self):
+        """
+        Asserts that a well formed postback of survey answers is properly stored in the
+        database
+        """
+        resp = self.client.post(
+            self.postback_url,
+            self.student_answers
+        )
+        self.assertEquals(resp.status_code, 200)
+        data = json.loads(resp.content)
+        self.assertIn('redirect_url', data)
+
+        answers = self.survey.get_answers(self.student)
+        self.assertEquals(answers[self.student.id], self.student_answers)
+
+    def test_strip_extra_fields(self):
+        """
+        Verify that any not expected field name in the post-back is not stored
+        in the database
+        """
+        data = dict.copy(self.student_answers)
+
+        data['csrfmiddlewaretoken'] = 'foo'
+        data['_redirect_url'] = 'bar'
+
+        resp = self.client.post(
+            self.postback_url,
+            data
+        )
+        self.assertEquals(resp.status_code, 200)
+        answers = self.survey.get_answers(self.student)
+        self.assertNotIn('csrfmiddlewaretoken', answers[self.student.id])
+        self.assertNotIn('_redirect_url', answers[self.student.id])
+
+    def test_encoding_answers(self):
+        """
+        Verify that if some potentially harmful input data is sent, that is is properly HTML encoded
+        """
+        data = dict.copy(self.student_answers)
+
+        data['field1'] = '<script type="javascript">alert("Deleting filesystem...")</script>'
+
+        resp = self.client.post(
+            self.postback_url,
+            data
+        )
+        self.assertEquals(resp.status_code, 200)
+        answers = self.survey.get_answers(self.student)
+        self.assertEqual(
+            '&lt;script type=&quot;javascript&quot;&gt;alert(&quot;Deleting filesystem...&quot;)&lt;/script&gt;',
+            answers[self.student.id]['field1']
+        )
diff --git a/lms/djangoapps/survey/urls.py b/lms/djangoapps/survey/urls.py
new file mode 100644
index 0000000000..727602e9d4
--- /dev/null
+++ b/lms/djangoapps/survey/urls.py
@@ -0,0 +1,11 @@
+"""
+URL mappings for the Survey feature
+"""
+
+from django.conf.urls import patterns, url
+
+
+urlpatterns = patterns('survey.views',  # nopep8
+    url(r'^(?P<survey_name>[0-9A-Za-z]+)/$', 'view_survey', name='view_survey'),
+    url(r'^(?P<survey_name>[0-9A-Za-z]+)/answers/$', 'submit_answers', name='submit_answers'),
+)
diff --git a/lms/djangoapps/survey/utils.py b/lms/djangoapps/survey/utils.py
new file mode 100644
index 0000000000..b71f8d7960
--- /dev/null
+++ b/lms/djangoapps/survey/utils.py
@@ -0,0 +1,37 @@
+"""
+Helper methods for Surveys
+"""
+
+from survey.models import SurveyForm, SurveyAnswer
+from courseware.access import has_access
+
+
+def is_survey_required_for_course(course_descriptor):
+    """
+    Returns whether a Survey is required for this course
+    """
+
+    # check to see that the Survey name has been defined in the CourseDescriptor
+    # and that the specified Survey exists
+
+    return course_descriptor.course_survey_required and \
+        SurveyForm.get(course_descriptor.course_survey_name, throw_if_not_found=False)
+
+
+def must_answer_survey(course_descriptor, user):
+    """
+    Returns whether a user needs to answer a required survey
+    """
+    if not is_survey_required_for_course(course_descriptor):
+        return False
+
+    # this will throw exception if not found, but a non existing survey name will
+    # be trapped in the above is_survey_required_for_course() method
+    survey = SurveyForm.get(course_descriptor.course_survey_name)
+
+    has_staff_access = has_access(user, 'staff', course_descriptor)
+
+    # survey is required and it exists, let's see if user has answered the survey
+    # course staff do not need to answer survey
+    answered_survey = SurveyAnswer.do_survey_answers_exist(survey, user)
+    return not answered_survey and not has_staff_access
diff --git a/lms/djangoapps/survey/views.py b/lms/djangoapps/survey/views.py
new file mode 100644
index 0000000000..0e98e441a2
--- /dev/null
+++ b/lms/djangoapps/survey/views.py
@@ -0,0 +1,109 @@
+"""
+View endpoints for Survey
+"""
+
+import logging
+import json
+
+from django.contrib.auth.decorators import login_required
+from django.http import (
+    HttpResponse, HttpResponseRedirect, HttpResponseNotFound
+)
+from django.core.urlresolvers import reverse
+from django.views.decorators.http import require_POST
+from django.conf import settings
+from django.utils.html import escape
+
+from edxmako.shortcuts import render_to_response
+from survey.models import SurveyForm
+from microsite_configuration import microsite
+
+log = logging.getLogger("edx.survey")
+
+
+@login_required
+def view_survey(request, survey_name):
+    """
+    View to render the survey to the end user
+    """
+    redirect_url = request.GET.get('redirect_url')
+
+    return view_student_survey(request.user, survey_name, redirect_url=redirect_url)
+
+
+def view_student_survey(user, survey_name, course=None, redirect_url=None, is_required=False, skip_redirect_url=None):
+    """
+    Shared utility method to render a survey form
+    NOTE: This method is shared between the Survey and Courseware Djangoapps
+    """
+
+    redirect_url = redirect_url if redirect_url else reverse('dashboard')
+    dashboard_redirect_url = reverse('dashboard')
+    skip_redirect_url = skip_redirect_url if skip_redirect_url else dashboard_redirect_url
+
+    survey = SurveyForm.get(survey_name, throw_if_not_found=False)
+    if not survey:
+        return HttpResponseRedirect(redirect_url)
+
+    # the result set from get_answers, has an outer key with the user_id
+    # just remove that outer key to make the JSON payload simplier
+    existing_answers = survey.get_answers(user=user).get(user.id, {})
+
+    context = {
+        'existing_data_json': json.dumps(existing_answers),
+        'postback_url': reverse('submit_answers', args=[survey_name]),
+        'redirect_url': redirect_url,
+        'skip_redirect_url': skip_redirect_url,
+        'dashboard_redirect_url': dashboard_redirect_url,
+        'survey_form': survey.form,
+        'is_required': is_required,
+        'mail_to_link': microsite.get_value('email_from_address', settings.CONTACT_EMAIL),
+        'course': course,
+    }
+
+    return render_to_response("survey/survey.html", context)
+
+
+@require_POST
+@login_required
+def submit_answers(request, survey_name):
+    """
+    Form submission post-back endpoint.
+
+    NOTE: We do not have a formal definition of a Survey Form, it's just some authored HTML
+    form fields (via Django Admin site). Therefore we do not do any validation of the submission server side. It is
+    assumed that all validation is done via JavaScript in the survey.html file
+    """
+    survey = SurveyForm.get(survey_name, throw_if_not_found=False)
+
+    if not survey:
+        return HttpResponseNotFound()
+
+    answers = {}
+    for key in request.POST.keys():
+        # support multi-SELECT form values, by string concatenating them with a comma separator
+        array_val = request.POST.getlist(key)
+        answers[key] = request.POST[key] if len(array_val) == 0 else ','.join(array_val)
+
+    # the URL we are supposed to redirect to is
+    # in a hidden form field
+    redirect_url = answers['_redirect_url'] if '_redirect_url' in answers else reverse('dashboard')
+
+    allowed_field_names = survey.get_field_names()
+
+    # scrub the answers to make sure nothing malicious from the user gets stored in
+    # our database, e.g. JavaScript
+    filtered_answers = {}
+    for answer_key in answers.keys():
+        # only allow known input fields
+        if answer_key in allowed_field_names:
+            filtered_answers[answer_key] = escape(answers[answer_key])
+
+    survey.save_user_answers(request.user, filtered_answers)
+
+    response_params = json.dumps({
+        # The HTTP end-point for the payment processor.
+        "redirect_url": redirect_url,
+    })
+
+    return HttpResponse(response_params, content_type="text/json")
diff --git a/lms/djangoapps/verify_student/ssencrypt.py b/lms/djangoapps/verify_student/ssencrypt.py
index bbf32d7a8b..a83b6f644f 100644
--- a/lms/djangoapps/verify_student/ssencrypt.py
+++ b/lms/djangoapps/verify_student/ssencrypt.py
@@ -205,4 +205,3 @@ def body_string(body_dict, prefix=""):
             body_list.append(u"{}{}:{}\n".format(prefix, key, value).encode('utf-8'))
 
     return "".join(body_list)  # Note that trailing \n's are important
-
diff --git a/lms/djangoapps/verify_student/tests/test_integration.py b/lms/djangoapps/verify_student/tests/test_integration.py
index 9d47222cfe..72ac2aa919 100644
--- a/lms/djangoapps/verify_student/tests/test_integration.py
+++ b/lms/djangoapps/verify_student/tests/test_integration.py
@@ -109,10 +109,10 @@ class TestProfEdVerification(ModuleStoreTestCase):
         # automatically in the course.
         self.assertFalse(CourseEnrollment.is_enrolled(self.user, self.course_key))
 
-        # Expect that the rendered page says that the student is "registering",
-        # not that they've already been registered.
-        self.assertIn("You are registering for", resp.content)
-        self.assertNotIn("You are now registered", resp.content)
+        # Expect that the rendered page says that the student is "enrolled",
+        # not that they've already been enrolled.
+        self.assertIn("You are enrolling", resp.content)
+        self.assertNotIn("You are now enrolled", resp.content)
 
     def _prices_on_page(self, page_content):
         """ Retrieve the available prices on the verify page. """
diff --git a/lms/djangoapps/verify_student/tests/test_models.py b/lms/djangoapps/verify_student/tests/test_models.py
index 3a6e710903..7717508126 100644
--- a/lms/djangoapps/verify_student/tests/test_models.py
+++ b/lms/djangoapps/verify_student/tests/test_models.py
@@ -75,6 +75,7 @@ class MockS3Connection(object):
     def get_bucket(self, bucket_name):
         return MockBucket(bucket_name)
 
+
 def mock_software_secure_post(url, headers=None, data=None, **kwargs):
     """
     Mocks our interface when we post to Software Secure. Does basic assertions
@@ -103,6 +104,7 @@ def mock_software_secure_post(url, headers=None, data=None, **kwargs):
 
     return response
 
+
 def mock_software_secure_post_error(url, headers=None, data=None, **kwargs):
     """
     Simulates what happens if our post to Software Secure is rejected, for
@@ -112,6 +114,7 @@ def mock_software_secure_post_error(url, headers=None, data=None, **kwargs):
     response.status_code = 400
     return response
 
+
 def mock_software_secure_post_unavailable(url, headers=None, data=None, **kwargs):
     """Simulates a connection failure when we try to submit to Software Secure."""
     raise requests.exceptions.ConnectionError
@@ -188,7 +191,7 @@ class TestPhotoVerification(TestCase):
         was when you submitted it.
         """
         user = UserFactory.create()
-        user.profile.name = u"Jack \u01B4" # gratuious non-ASCII char to test encodings
+        user.profile.name = u"Jack \u01B4"  # gratuious non-ASCII char to test encodings
 
         attempt = SoftwareSecurePhotoVerification(user=user)
         user.profile.name = u"Clyde \u01B4"
diff --git a/lms/djangoapps/verify_student/tests/test_views.py b/lms/djangoapps/verify_student/tests/test_views.py
index 1d45efe154..6026c62b24 100644
--- a/lms/djangoapps/verify_student/tests/test_views.py
+++ b/lms/djangoapps/verify_student/tests/test_views.py
@@ -186,12 +186,11 @@ class TestVerifyView(ModuleStoreTestCase):
         response = self.client.get(url)
         self.assertEquals(response.status_code, 302)
 
-    def test_valid_course_registration_text(self):
+    def test_valid_course_enrollment_text(self):
         url = reverse('verify_student_verify',
                       kwargs={"course_id": unicode(self.course_key)})
         response = self.client.get(url)
-
-        self.assertIn("You are now enrolled in the audit track", response.content)
+        self.assertIn("You are now enrolled in", response.content)
 
     def test_valid_course_upgrade_text(self):
         url = reverse('verify_student_verify',
diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py
index 8deb474079..51969c5d7e 100644
--- a/lms/djangoapps/verify_student/views.py
+++ b/lms/djangoapps/verify_student/views.py
@@ -46,6 +46,7 @@ EVENT_NAME_USER_ENTERED_MIDCOURSE_REVERIFY_VIEW = 'edx.course.enrollment.reverif
 EVENT_NAME_USER_SUBMITTED_MIDCOURSE_REVERIFY = 'edx.course.enrollment.reverify.submitted'
 EVENT_NAME_USER_REVERIFICATION_REVIEWED_BY_SOFTWARESECURE = 'edx.course.enrollment.reverify.reviewed'
 
+
 class VerifyView(View):
 
     @method_decorator(login_required)
@@ -134,7 +135,6 @@ class VerifiedView(View):
         if CourseEnrollment.enrollment_mode_for_user(request.user, course_id) == ('verified', True):
             return redirect(reverse('dashboard'))
 
-
         modes_dict = CourseMode.modes_for_course_dict(course_id)
 
         # we prefer professional over verify
@@ -335,8 +335,10 @@ def show_requirements(request, course_id):
         return redirect(reverse('dashboard'))
     if SoftwareSecurePhotoVerification.user_has_valid_or_pending(request.user):
         return redirect(
-            reverse('verify_student_verified',
-            kwargs={'course_id': course_id.to_deprecated_string()}) + "?upgrade={}".format(upgrade)
+            reverse(
+                'verify_student_verified',
+                kwargs={'course_id': course_id.to_deprecated_string()}
+            ) + "?upgrade={}".format(upgrade)
         )
 
     upgrade = request.GET.get('upgrade', False)
@@ -523,7 +525,6 @@ def toggle_failed_banner_off(request):
     return HttpResponse('Success')
 
 
-
 @login_required
 def reverification_submission_confirmation(_request):
     """
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 8f72b7ae0b..c6eb470058 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -300,14 +300,7 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
     AUTH_TOKENS = json.load(auth_file)
 
 ############### XBlock filesystem field config ##########
-if 'XBLOCK_FS_STORAGE_BUCKET' in ENV_TOKENS:
-    DJFS = {
-        'type' : 's3fs',
-        'bucket' : ENV_TOKENS.get('XBLOCK_FS_STORAGE_BUCKET', None),
-        'prefix' : ENV_TOKENS.get('XBLOCK_FS_STORAGE_PREFIX', '/xblock-storage/'),
-        'aws_access_key_id' : AUTH_TOKENS.get('AWS_ACCESS_KEY_ID', None),
-        'aws_secret_access_key' : AUTH_TOKENS.get('AWS_SECRET_ACCESS_KEY', None)
-    }
+DJFS = AUTH_TOKENS.get('DJFS', None)
 
 ############### Module Store Items ##########
 HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS = ENV_TOKENS.get('HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS', {})
@@ -403,9 +396,8 @@ STUDENT_FILEUPLOAD_MAX_SIZE = ENV_TOKENS.get("STUDENT_FILEUPLOAD_MAX_SIZE", STUD
 TRACKING_BACKENDS.update(AUTH_TOKENS.get("TRACKING_BACKENDS", {}))
 EVENT_TRACKING_BACKENDS.update(AUTH_TOKENS.get("EVENT_TRACKING_BACKENDS", {}))
 TRACKING_SEGMENTIO_WEBHOOK_SECRET = AUTH_TOKENS.get("TRACKING_SEGMENTIO_WEBHOOK_SECRET", TRACKING_SEGMENTIO_WEBHOOK_SECRET)
-TRACKING_SEGMENTIO_ALLOWED_ACTIONS = ENV_TOKENS.get("TRACKING_SEGMENTIO_ALLOWED_ACTIONS", TRACKING_SEGMENTIO_ALLOWED_ACTIONS)
-TRACKING_SEGMENTIO_ALLOWED_CHANNELS = ENV_TOKENS.get("TRACKING_SEGMENTIO_ALLOWED_CHANNELS", TRACKING_SEGMENTIO_ALLOWED_CHANNELS)
-
+TRACKING_SEGMENTIO_ALLOWED_TYPES = ENV_TOKENS.get("TRACKING_SEGMENTIO_ALLOWED_TYPES", TRACKING_SEGMENTIO_ALLOWED_TYPES)
+TRACKING_SEGMENTIO_SOURCE_MAP = ENV_TOKENS.get("TRACKING_SEGMENTIO_SOURCE_MAP", TRACKING_SEGMENTIO_SOURCE_MAP)
 
 # Student identity verification settings
 VERIFY_STUDENT = AUTH_TOKENS.get("VERIFY_STUDENT", VERIFY_STUDENT)
diff --git a/lms/envs/bok_choy.auth.json b/lms/envs/bok_choy.auth.json
index 67747f7b18..1d244c93e8 100644
--- a/lms/envs/bok_choy.auth.json
+++ b/lms/envs/bok_choy.auth.json
@@ -109,6 +109,13 @@
             "SOCIAL_AUTH_FACEBOOK_SECRET": "test"
         }
     },
+    "DJFS": {
+            "type": "s3fs",
+            "bucket": "test",
+            "prefix": "test",
+            "aws_access_key_id": "test",
+            "aws_secret_access_key": "test"
+    },
     "XQUEUE_INTERFACE": {
         "basic_auth": [
             "edx",
diff --git a/lms/envs/cms/acceptance.py b/lms/envs/cms/acceptance.py
index c1ba93f46f..8ed294e8bc 100644
--- a/lms/envs/cms/acceptance.py
+++ b/lms/envs/cms/acceptance.py
@@ -6,7 +6,7 @@ Toolbar. I it suitable to run against acceptance tests.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=W0401, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import, undefined-variable
 
 from .dev import *
 
@@ -15,7 +15,7 @@ from .dev import *
 INSTALLED_APPS = tuple(e for e in INSTALLED_APPS if e != 'debug_toolbar')
 INSTALLED_APPS = tuple(e for e in INSTALLED_APPS if e != 'debug_toolbar_mongo')
 
-MIDDLEWARE_CLASSES = tuple(e for e in MIDDLEWARE_CLASSES \
+MIDDLEWARE_CLASSES = tuple(e for e in MIDDLEWARE_CLASSES  # pylint: disable=used-before-assignment
                            if e != 'debug_toolbar.middleware.DebugToolbarMiddleware')
 
 
diff --git a/lms/envs/cms/dev.py b/lms/envs/cms/dev.py
index d975f52e68..260d9e269a 100644
--- a/lms/envs/cms/dev.py
+++ b/lms/envs/cms/dev.py
@@ -33,12 +33,12 @@ CONTENTSTORE = {
 INSTALLED_APPS += (
     # Mongo perf stats
     'debug_toolbar_mongo',
-    )
+)
 
 
 DEBUG_TOOLBAR_PANELS += (
-   'debug_toolbar_mongo.panel.MongoDebugPanel',
-   )
+    'debug_toolbar_mongo.panel.MongoDebugPanel',
+)
 
 # HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS defines, as dictionary of regex's, a set of mappings of HTTP request hostnames to
 # what the 'default' modulestore to use while processing the request
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 246c4c4666..ab2a14ba48 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -268,10 +268,6 @@ FEATURES = {
     # nonzero grade cutoff is met
     'SHOW_PROGRESS_SUCCESS_BUTTON': False,
 
-    # Analytics Data API (for active student count)
-    # Default to false here b/c dev environments won't have the api, will override in aws.py
-    'ENABLE_ANALYTICS_ACTIVE_COUNT': False,
-
     # When a logged in user goes to the homepage ('/') should the user be
     # redirected to the dashboard - this is default Open edX behavior. Set to
     # False to not redirect the user
@@ -281,10 +277,6 @@ FEATURES = {
     # ENABLE_OAUTH2_PROVIDER to True
     'ENABLE_MOBILE_REST_API': False,
 
-    # Video Abstraction Layer used to allow video teams to manage video assets
-    # independently of courseware. https://github.com/edx/edx-val
-    'ENABLE_VIDEO_ABSTRACTION_LAYER_API': False,
-
     # Enable the new dashboard, account, and profile pages
     'ENABLE_NEW_DASHBOARD': False,
 
@@ -295,6 +287,9 @@ FEATURES = {
     # to allow an upload of a CSV file that contains a list of new accounts to create
     # and register for course.
     'ALLOW_AUTOMATED_SIGNUPS': False,
+
+    # Display demographic data on the analytics tab in the instructor dashboard.
+    'DISPLAY_ANALYTICS_DEMOGRAPHICS': True
 }
 
 # Ignore static asset files on import which match this pattern
@@ -514,6 +509,9 @@ EVENT_TRACKING_BACKENDS = {
 EVENT_TRACKING_PROCESSORS = [
     {
         'ENGINE': 'track.shim.LegacyFieldMappingProcessor'
+    },
+    {
+        'ENGINE': 'track.shim.VideoEventProcessor'
     }
 ]
 
@@ -532,8 +530,11 @@ if FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
     })
 
 TRACKING_SEGMENTIO_WEBHOOK_SECRET = None
-TRACKING_SEGMENTIO_ALLOWED_ACTIONS = ['Track', 'Screen']
-TRACKING_SEGMENTIO_ALLOWED_CHANNELS = ['mobile']
+TRACKING_SEGMENTIO_ALLOWED_TYPES = ['track']
+TRACKING_SEGMENTIO_SOURCE_MAP = {
+    'analytics-android': 'mobile',
+    'analytics-ios': 'mobile',
+}
 
 ######################## GOOGLE ANALYTICS ###########################
 GOOGLE_ANALYTICS_ACCOUNT = None
@@ -667,7 +668,6 @@ MANAGERS = ADMINS
 
 # Static content
 STATIC_URL = '/static/'
-ADMIN_MEDIA_PREFIX = '/static/admin/'
 STATIC_ROOT = ENV_ROOT / "staticfiles"
 
 STATICFILES_DIRS = [
@@ -1264,7 +1264,7 @@ STATICFILES_IGNORE_PATTERNS = (
     "common_static",
 )
 
-PIPELINE_UGLIFYJS_BINARY='node_modules/.bin/uglifyjs'
+PIPELINE_UGLIFYJS_BINARY = 'node_modules/.bin/uglifyjs'
 
 # Setting that will only affect the edX version of django-pipeline until our changes are merged upstream
 PIPELINE_COMPILE_INPLACE = True
@@ -1501,6 +1501,9 @@ INSTALLED_APPS = (
 
     # edX Mobile API
     'mobile_api',
+
+    # Surveys
+    'survey',
 )
 
 ######################### MARKETING SITE ###############################
@@ -1853,7 +1856,7 @@ ADVANCED_SECURITY_CONFIG = {}
 SHIBBOLETH_DOMAIN_PREFIX = 'shib:'
 OPENID_DOMAIN_PREFIX = 'openid:'
 
-### Analytics data api settings
+### Analytics Data API + Dashboard (Insights) settings
 ANALYTICS_DATA_URL = ""
 ANALYTICS_DATA_TOKEN = ""
 ANALYTICS_DASHBOARD_URL = ""
@@ -1868,3 +1871,11 @@ INVOICE_PAYMENT_INSTRUCTIONS = "This is where you can\nput directions on how peo
 COUNTRIES_OVERRIDE = {
     "TW": _("Taiwan"),
 }
+
+# which access.py permission name to check in order to determine if a course is visible in
+# the course catalog. We default this to the legacy permission 'see_exists'.
+COURSE_CATALOG_VISIBILITY_PERMISSION = 'see_exists'
+
+# which access.py permission name to check in order to determine if a course about page is
+# visible. We default this to the legacy permission 'see_exists'.
+COURSE_ABOUT_VISIBILITY_PERMISSION = 'see_exists'
diff --git a/lms/envs/content.py b/lms/envs/content.py
index f85ae0b9cd..e00ad4d7f3 100644
--- a/lms/envs/content.py
+++ b/lms/envs/content.py
@@ -19,18 +19,18 @@ INSTALLED_APPS += ('debug_toolbar',)
 MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
 
 DEBUG_TOOLBAR_PANELS = (
-   'debug_toolbar.panels.version.VersionDebugPanel',
-   'debug_toolbar.panels.timer.TimerDebugPanel',
-   'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
-   'debug_toolbar.panels.headers.HeaderDebugPanel',
-   'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
-   'debug_toolbar.panels.sql.SQLDebugPanel',
-   'debug_toolbar.panels.signals.SignalDebugPanel',
-   'debug_toolbar.panels.logger.LoggingPanel',
+    'debug_toolbar.panels.version.VersionDebugPanel',
+    'debug_toolbar.panels.timer.TimerDebugPanel',
+    'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
+    'debug_toolbar.panels.headers.HeaderDebugPanel',
+    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
+    'debug_toolbar.panels.sql.SQLDebugPanel',
+    'debug_toolbar.panels.signals.SignalDebugPanel',
+    'debug_toolbar.panels.logger.LoggingPanel',
 
-#  Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
-#  Django=1.3.1/1.4 where requests to views get duplicated (your method gets
-#  hit twice). So you can uncomment when you need to diagnose performance
-#  problems, but you shouldn't leave it on.
-#  'debug_toolbar.panels.profiling.ProfilingDebugPanel',
+    #  Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
+    #  Django=1.3.1/1.4 where requests to views get duplicated (your method gets
+    #  hit twice). So you can uncomment when you need to diagnose performance
+    #  problems, but you shouldn't leave it on.
+    #  'debug_toolbar.panels.profiling.ProfilingDebugPanel',
 )
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 6432027b73..8318cc26be 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -171,12 +171,12 @@ EDX_PLATFORM_VERSION_STRING = os.popen('cd %s; git describe' % REPO_ROOT).read()
 ############################ Open ended grading config  #####################
 
 OPEN_ENDED_GRADING_INTERFACE = {
-    'url' : 'http://127.0.0.1:3033/',
-    'username' : 'lms',
-    'password' : 'abcd',
-    'staff_grading' : 'staff_grading',
-    'peer_grading' : 'peer_grading',
-    'grading_controller' : 'grading_controller'
+    'url': 'http://127.0.0.1:3033/',
+    'username': 'lms',
+    'password': 'abcd',
+    'staff_grading': 'staff_grading',
+    'peer_grading': 'peer_grading',
+    'grading_controller': 'grading_controller'
 }
 
 ############################## LMS Migration ##################################
@@ -230,20 +230,20 @@ MIDDLEWARE_CLASSES += (
 INTERNAL_IPS = ('127.0.0.1',)
 
 DEBUG_TOOLBAR_PANELS = (
-   'debug_toolbar.panels.version.VersionDebugPanel',
-   'debug_toolbar.panels.timer.TimerDebugPanel',
-   'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
-   'debug_toolbar.panels.headers.HeaderDebugPanel',
-   'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
-   'debug_toolbar.panels.sql.SQLDebugPanel',
-   'debug_toolbar.panels.signals.SignalDebugPanel',
-   'debug_toolbar.panels.logger.LoggingPanel',
+    'debug_toolbar.panels.version.VersionDebugPanel',
+    'debug_toolbar.panels.timer.TimerDebugPanel',
+    'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
+    'debug_toolbar.panels.headers.HeaderDebugPanel',
+    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
+    'debug_toolbar.panels.sql.SQLDebugPanel',
+    'debug_toolbar.panels.signals.SignalDebugPanel',
+    'debug_toolbar.panels.logger.LoggingPanel',
 
-#  Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
-#  Django=1.3.1/1.4 where requests to views get duplicated (your method gets
-#  hit twice). So you can uncomment when you need to diagnose performance
-#  problems, but you shouldn't leave it on.
-#  'debug_toolbar.panels.profiling.ProfilingDebugPanel',
+    # Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
+    # Django=1.3.1/1.4 where requests to views get duplicated (your method gets
+    # hit twice). So you can uncomment when you need to diagnose performance
+    # problems, but you shouldn't leave it on.
+    # 'debug_toolbar.panels.profiling.ProfilingDebugPanel',
 )
 
 DEBUG_TOOLBAR_CONFIG = {
@@ -274,10 +274,6 @@ PIPELINE_SASS_ARGUMENTS = '--debug-info --require {proj_dir}/static/sass/bourbon
 ANALYTICS_SERVER_URL = "http://127.0.0.1:9000/"
 ANALYTICS_API_KEY = ""
 
-ANALYTICS_DATA_URL = "http://127.0.0.1:8080"
-ANALYTICS_DATA_TOKEN = ""
-FEATURES['ENABLE_ANALYTICS_ACTIVE_COUNT'] = False
-
 ##### Segment.io  ######
 
 # If there's an environment variable set, grab it and turn on Segment.io
diff --git a/lms/envs/dev_int.py b/lms/envs/dev_int.py
index f5636a5129..c66bdb47d2 100644
--- a/lms/envs/dev_int.py
+++ b/lms/envs/dev_int.py
@@ -20,12 +20,12 @@ FEATURES['SUBDOMAIN_COURSE_LISTINGS'] = True
 
 COURSE_LISTINGS = {
     'default': ['BerkeleyX/CS169.1x/2012_Fall',
-                 'BerkeleyX/CS188.1x/2012_Fall',
-                 'HarvardX/CS50x/2012',
-                 'HarvardX/PH207x/2012_Fall',
-                 'MITx/3.091x/2012_Fall',
-                 'MITx/6.002x/2012_Fall',
-                 'MITx/6.00x/2012_Fall'],
+                'BerkeleyX/CS188.1x/2012_Fall',
+                'HarvardX/CS50x/2012',
+                'HarvardX/PH207x/2012_Fall',
+                'MITx/3.091x/2012_Fall',
+                'MITx/6.002x/2012_Fall',
+                'MITx/6.00x/2012_Fall'],
 
     'berkeley': ['BerkeleyX/CS169.1x/2012_Fall',
                  'BerkeleyX/CS188.1x/2012_Fall'],
@@ -33,5 +33,5 @@ COURSE_LISTINGS = {
     'harvard': ['HarvardX/CS50x/2012'],
 
     'mit': ['MITx/3.091x/2012_Fall',
-                 'MITx/6.00x/2012_Fall']
+            'MITx/6.00x/2012_Fall']
 }
diff --git a/lms/envs/devgroups/courses.py b/lms/envs/devgroups/courses.py
index 1a7ff58f08..d353c87dec 100644
--- a/lms/envs/devgroups/courses.py
+++ b/lms/envs/devgroups/courses.py
@@ -17,18 +17,18 @@ CLASSES_TO_DBS = {
 
 
 CACHES = {
-   'default': {
-       'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-       'LOCATION': '127.0.0.1:11211',
-       'KEY_FUNCTION': 'util.memcache.safe_key',
-   },
-   'general': {
-       'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-       'LOCATION': '127.0.0.1:11211',
-       'KEY_PREFIX': 'general',
-       'VERSION': 5,
-       'KEY_FUNCTION': 'util.memcache.safe_key',
-   }
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': '127.0.0.1:11211',
+        'KEY_FUNCTION': 'util.memcache.safe_key',
+    },
+    'general': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': '127.0.0.1:11211',
+        'KEY_PREFIX': 'general',
+        'VERSION': 5,
+        'KEY_FUNCTION': 'util.memcache.safe_key',
+    }
 }
 
 SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
@@ -41,8 +41,8 @@ def path_for_db(db_name):
 def course_db_for(course_id):
     db_name = CLASSES_TO_DBS[course_id]
     return {
-               'default': {
-                    'ENGINE': 'django.db.backends.sqlite3',
-                    'NAME': path_for_db(db_name)
-                }
-            }
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': path_for_db(db_name)
+        }
+    }
diff --git a/lms/envs/devplus.py b/lms/envs/devplus.py
index adda94ff08..ef5ac3e014 100644
--- a/lms/envs/devplus.py
+++ b/lms/envs/devplus.py
@@ -16,7 +16,7 @@ Dir structure:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=W0401, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .dev import *
 
@@ -34,18 +34,18 @@ DATABASES = {
 }
 
 CACHES = {
-   'default': {
-       'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-       'LOCATION': '127.0.0.1:11211',
-       'KEY_FUNCTION': 'util.memcache.safe_key',
-   },
-   'general': {
-       'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-       'LOCATION': '127.0.0.1:11211',
-       'KEY_PREFIX': 'general',
-       'VERSION': 5,
-       'KEY_FUNCTION': 'util.memcache.safe_key',
-   }
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': '127.0.0.1:11211',
+        'KEY_FUNCTION': 'util.memcache.safe_key',
+    },
+    'general': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': '127.0.0.1:11211',
+        'KEY_PREFIX': 'general',
+        'VERSION': 5,
+        'KEY_FUNCTION': 'util.memcache.safe_key',
+    }
 }
 
 SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
@@ -57,20 +57,20 @@ MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
 INTERNAL_IPS = ('127.0.0.1',)
 
 DEBUG_TOOLBAR_PANELS = (
-   'debug_toolbar.panels.version.VersionDebugPanel',
-   'debug_toolbar.panels.timer.TimerDebugPanel',
-   'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
-   'debug_toolbar.panels.headers.HeaderDebugPanel',
-   'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
-   'debug_toolbar.panels.sql.SQLDebugPanel',
-   'debug_toolbar.panels.signals.SignalDebugPanel',
-   'debug_toolbar.panels.logger.LoggingPanel',
+    'debug_toolbar.panels.version.VersionDebugPanel',
+    'debug_toolbar.panels.timer.TimerDebugPanel',
+    'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
+    'debug_toolbar.panels.headers.HeaderDebugPanel',
+    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
+    'debug_toolbar.panels.sql.SQLDebugPanel',
+    'debug_toolbar.panels.signals.SignalDebugPanel',
+    'debug_toolbar.panels.logger.LoggingPanel',
 
-#  Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
-#  Django=1.3.1/1.4 where requests to views get duplicated (your method gets
-#  hit twice). So you can uncomment when you need to diagnose performance
-#  problems, but you shouldn't leave it on.
-  'debug_toolbar.panels.profiling.ProfilingDebugPanel',
+    #  Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
+    #  Django=1.3.1/1.4 where requests to views get duplicated (your method gets
+    #  hit twice). So you can uncomment when you need to diagnose performance
+    #  problems, but you shouldn't leave it on.
+    'debug_toolbar.panels.profiling.ProfilingDebugPanel',
 )
 
 #PIPELINE = True
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index 9a9e9b417c..cdd02fb329 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -2,7 +2,7 @@
 Specific overrides to the base prod settings to make development easier.
 """
 
-from .aws import * # pylint: disable=wildcard-import, unused-wildcard-import
+from .aws import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 # Don't use S3 in devstack, fall back to filesystem
 del DEFAULT_FILE_STORAGE
@@ -37,10 +37,6 @@ FEATURES['REQUIRE_COURSE_EMAIL_AUTH'] = False  # Give all courses email (don't r
 ANALYTICS_SERVER_URL = "http://127.0.0.1:9000/"
 ANALYTICS_API_KEY = ""
 
-ANALYTICS_DATA_URL = "http://127.0.0.1:8080"
-ANALYTICS_DATA_TOKEN = ""
-FEATURES['ENABLE_ANALYTICS_ACTIVE_COUNT'] = False
-
 # Set this to the dashboard URL in order to display the link from the
 # dashboard to the Analytics Dashboard.
 ANALYTICS_DASHBOARD_URL = None
diff --git a/lms/envs/edx4edx_aws.py b/lms/envs/edx4edx_aws.py
index 8d49c4cb28..af60e906f8 100644
--- a/lms/envs/edx4edx_aws.py
+++ b/lms/envs/edx4edx_aws.py
@@ -16,15 +16,17 @@ PIPELINE_CSS_COMPRESSOR = None
 PIPELINE_JS_COMPRESSOR = None
 
 COURSE_DEFAULT = 'edx4edx'
-COURSE_SETTINGS =  {'edx4edx': {'number' : 'edX.01',
-                                    'title': 'edx4edx: edX Author Course',
-                                    'xmlpath': '/edx4edx/',
-                                    'github_url': 'https://github.com/MITx/edx4edx',
-                                    'active': True,
-                                    'default_chapter': 'Introduction',
-                                    'default_section': 'edx4edx_Course',
-                                    },
-                    }
+COURSE_SETTINGS = {
+    'edx4edx': {
+        'number': 'edX.01',
+        'title': 'edx4edx: edX Author Course',
+        'xmlpath': '/edx4edx/',
+        'github_url': 'https://github.com/MITx/edx4edx',
+        'active': True,
+        'default_chapter': 'Introduction',
+        'default_section': 'edx4edx_Course',
+    },
+}
 
 STATICFILES_DIRS = [
     PROJECT_ROOT / "static",
diff --git a/lms/envs/load_test.py b/lms/envs/load_test.py
index f4d3cae758..f23ddbe066 100644
--- a/lms/envs/load_test.py
+++ b/lms/envs/load_test.py
@@ -9,8 +9,9 @@ Settings for load testing.
 from .aws import *
 
 # Disable CSRF for load testing
-exclude_csrf = lambda elem: not elem in \
-               ['django.core.context_processors.csrf',
-                'django.middleware.csrf.CsrfViewMiddleware']
-TEMPLATE_CONTEXT_PROCESSORS = filter(exclude_csrf, TEMPLATE_CONTEXT_PROCESSORS)
-MIDDLEWARE_CLASSES = filter(exclude_csrf, MIDDLEWARE_CLASSES)
+EXCLUDE_CSRF = lambda elem: not elem in [
+    'django.core.context_processors.csrf',
+    'django.middleware.csrf.CsrfViewMiddleware'
+]
+TEMPLATE_CONTEXT_PROCESSORS = filter(EXCLUDE_CSRF, TEMPLATE_CONTEXT_PROCESSORS)
+MIDDLEWARE_CLASSES = filter(EXCLUDE_CSRF, MIDDLEWARE_CLASSES)
diff --git a/lms/envs/sauce.py b/lms/envs/sauce.py
index 89e0a4fe21..0ab56a1004 100644
--- a/lms/envs/sauce.py
+++ b/lms/envs/sauce.py
@@ -10,11 +10,13 @@ so that we can run the lettuce acceptance tests on SauceLabs.
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 import os
 
-PORTS = [2000, 2001, 2020, 2109, 2222, 2310, 3000, 3001,
-        3030, 3210, 3333, 4000, 4001, 4040, 4321, 4502, 4503,
-        5050, 5555, 5432, 6060, 6666, 6543, 7000, 7070, 7774,
-        7777, 8003, 8031, 8080, 8081, 8765, 8888,
-        9080, 9090, 9876, 9999, 49221, 55001]
+PORTS = [
+    2000, 2001, 2020, 2109, 2222, 2310, 3000, 3001,
+    3030, 3210, 3333, 4000, 4001, 4040, 4321, 4502, 4503,
+    5050, 5555, 5432, 6060, 6666, 6543, 7000, 7070, 7774,
+    7777, 8003, 8031, 8080, 8081, 8765, 8888,
+    9080, 9090, 9876, 9999, 49221, 55001
+]
 
 DESIRED_CAPABILITIES = {
     'chrome': DesiredCapabilities.CHROME,
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 497f2ea2b9..2a10274fed 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -121,8 +121,8 @@ STATICFILES_DIRS += [
 # If we don't add these settings, then Django templates that can't
 # find pipelined assets will raise a ValueError.
 # http://stackoverflow.com/questions/12816941/unit-testing-with-django-pipeline
-STATICFILES_STORAGE='pipeline.storage.NonPackagingPipelineStorage'
-PIPELINE_ENABLED=False
+STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage'
+PIPELINE_ENABLED = False
 
 update_module_store_settings(
     MODULESTORE,
@@ -352,6 +352,8 @@ MICROSITE_CONFIGURATION = {
         "course_index_overlay_logo_file": "test_microsite/images/header-logo.png",
         "homepage_overlay_html": "<h1>This is a Test Microsite Overlay HTML</h1>",
         "ALWAYS_REDIRECT_HOMEPAGE_TO_DASHBOARD_FOR_AUTHENTICATED_USER": False,
+        "COURSE_CATALOG_VISIBILITY_PERMISSION": "see_in_catalog",
+        "COURSE_ABOUT_VISIBILITY_PERMISSION": "see_about_page",
     },
     "default": {
         "university": "default_university",
@@ -374,8 +376,8 @@ LINKEDIN_API['COMPANY_ID'] = '0000000'
 
 # Setting for the testing of Software Secure Result Callback
 VERIFY_STUDENT["SOFTWARE_SECURE"] = {
-        "API_ACCESS_KEY": "BBBBBBBBBBBBBBBBBBBB",
-        "API_SECRET_KEY": "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC",
+    "API_ACCESS_KEY": "BBBBBBBBBBBBBBBBBBBB",
+    "API_SECRET_KEY": "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC",
 }
 
 VIDEO_CDN_URL = {
diff --git a/lms/lib/comment_client/commentable.py b/lms/lib/comment_client/commentable.py
index c9930d4781..d18a7ccfb7 100644
--- a/lms/lib/comment_client/commentable.py
+++ b/lms/lib/comment_client/commentable.py
@@ -2,6 +2,7 @@
 import models
 import settings
 
+
 class Commentable(models.Model):
 
     base_url = "{prefix}/commentables".format(prefix=settings.PREFIX)
diff --git a/lms/lib/comment_client/thread.py b/lms/lib/comment_client/thread.py
index ceedbd3899..84839b87d0 100644
--- a/lms/lib/comment_client/thread.py
+++ b/lms/lib/comment_client/thread.py
@@ -8,6 +8,7 @@ import settings
 
 log = logging.getLogger(__name__)
 
+
 class Thread(models.Model):
 
     accessible_fields = [
diff --git a/lms/lib/comment_client/user.py b/lms/lib/comment_client/user.py
index c4a69d7837..0326dea214 100644
--- a/lms/lib/comment_client/user.py
+++ b/lms/lib/comment_client/user.py
@@ -6,12 +6,13 @@ import settings
 
 class User(models.Model):
 
-    accessible_fields = ['username', 'follower_ids', 'upvoted_ids', 'downvoted_ids',
-                         'id', 'external_id', 'subscribed_user_ids', 'children', 'course_id',
-                         'group_id', 'subscribed_thread_ids', 'subscribed_commentable_ids',
-                         'subscribed_course_ids', 'threads_count', 'comments_count',
-                         'default_sort_key'
-                        ]
+    accessible_fields = [
+        'username', 'follower_ids', 'upvoted_ids', 'downvoted_ids',
+        'id', 'external_id', 'subscribed_user_ids', 'children', 'course_id',
+        'group_id', 'subscribed_thread_ids', 'subscribed_commentable_ids',
+        'subscribed_course_ids', 'threads_count', 'comments_count',
+        'default_sort_key'
+    ]
 
     updatable_fields = ['username', 'external_id', 'default_sort_key']
     initializable_fields = updatable_fields
@@ -165,5 +166,3 @@ def _url_for_user_active_threads(user_id):
 
 def _url_for_user_subscribed_threads(user_id):
     return "{prefix}/users/{user_id}/subscribed_threads".format(prefix=settings.PREFIX, user_id=user_id)
-
-
diff --git a/lms/lib/xblock/mixin.py b/lms/lib/xblock/mixin.py
index dadf492619..08e965b922 100644
--- a/lms/lib/xblock/mixin.py
+++ b/lms/lib/xblock/mixin.py
@@ -24,10 +24,10 @@ class LmsBlockMixin(XBlockMixin):
     chrome = String(
         display_name=_("Courseware Chrome"),
         help=_("Enter the chrome, or navigation tools, to use for the XBlock in the LMS. Valid values are: \n"
-             "\"chromeless\" -- to not use tabs or the accordion; \n"
-             "\"tabs\" -- to use tabs only; \n"
-             "\"accordion\" -- to use the accordion only; or \n"
-             "\"tabs,accordion\" -- to use tabs and the accordion."),
+               "\"chromeless\" -- to not use tabs or the accordion; \n"
+               "\"tabs\" -- to use tabs only; \n"
+               "\"accordion\" -- to use the accordion only; or \n"
+               "\"tabs,accordion\" -- to use tabs and the accordion."),
         scope=Scope.settings,
         default=None,
     )
diff --git a/lms/lib/xblock/runtime.py b/lms/lib/xblock/runtime.py
index c4b0097af0..2c1729ec49 100644
--- a/lms/lib/xblock/runtime.py
+++ b/lms/lib/xblock/runtime.py
@@ -200,11 +200,3 @@ class LmsModuleSystem(LmsHandlerUrls, ModuleSystem):  # pylint: disable=abstract
         )
         services['fs'] = xblock.reference.plugins.FSService()
         super(LmsModuleSystem, self).__init__(**kwargs)
-
-    # backward compatibility fix for callers not knowing this is a ModuleSystem v DescriptorSystem
-    @property
-    def resources_fs(self):
-        """
-        Return what would be the resources_fs on a DescriptorSystem
-        """
-        return getattr(self, 'filestore', None)
diff --git a/lms/startup.py b/lms/startup.py
index bb6b312a50..f0e3777e53 100644
--- a/lms/startup.py
+++ b/lms/startup.py
@@ -35,7 +35,7 @@ def run():
     if settings.FEATURES.get('ENABLE_THIRD_PARTY_AUTH', False):
         enable_third_party_auth()
 
-    # Initialize Segment.io analytics module. Flushes first time a message is received and 
+    # Initialize Segment.io analytics module. Flushes first time a message is received and
     # every 50 messages thereafter, or if 10 seconds have passed since last flush
     if settings.FEATURES.get('SEGMENT_IO_LMS') and hasattr(settings, 'SEGMENT_IO_LMS_KEY'):
         analytics.init(settings.SEGMENT_IO_LMS_KEY, flush_at=50)
diff --git a/lms/static/admin/css/base.css b/lms/static/admin/css/base.css
deleted file mode 100644
index 5e5fc58a77..0000000000
--- a/lms/static/admin/css/base.css
+++ /dev/null
@@ -1,835 +0,0 @@
-/*
-    DJANGO Admin styles
-*/
-
-body {
-    margin: 0;
-    padding: 0;
-    font-size: 12px;
-    font-family: "Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
-    color: #333;
-    background: #fff;
-}
-
-/* LINKS */
-
-a:link, a:visited {
-    color: #5b80b2;
-    text-decoration: none;
-}
-
-a:hover {
-    color: #036;
-}
-
-a img {
-    border: none;
-}
-
-a.section:link, a.section:visited {
-    color: white;
-    text-decoration: none;
-}
-
-/* GLOBAL DEFAULTS */
-
-p, ol, ul, dl {
-    margin: .2em 0 .8em 0;
-}
-
-p {
-    padding: 0;
-    line-height: 140%;
-}
-
-h1,h2,h3,h4,h5 {
-    font-weight: bold;
-}
-
-h1 {
-    font-size: 18px;
-    color: #666;
-    padding: 0 6px 0 0;
-    margin: 0 0 .2em 0;
-}
-
-h2 {
-    font-size: 16px;
-    margin: 1em 0 .5em 0;
-}
-
-h2.subhead {
-    font-weight: normal;
-    margin-top: 0;
-}
-
-h3 {
-    font-size: 14px;
-    margin: .8em 0 .3em 0;
-    color: #666;
-    font-weight: bold;
-}
-
-h4 {
-    font-size: 12px;
-    margin: 1em 0 .8em 0;
-    padding-bottom: 3px;
-}
-
-h5 {
-    font-size: 10px;
-    margin: 1.5em 0 .5em 0;
-    color: #666;
-    text-transform: uppercase;
-    letter-spacing: 1px;
-}
-
-ul li {
-    list-style-type: square;
-    padding: 1px 0;
-}
-
-ul.plainlist {
-    margin-left: 0 !important;
-}
-
-ul.plainlist li {
-    list-style-type: none;
-}
-
-li ul {
-    margin-bottom: 0;
-}
-
-li, dt, dd {
-    font-size: 11px;
-    line-height: 14px;
-}
-
-dt {
-    font-weight: bold;
-    margin-top: 4px;
-}
-
-dd {
-    margin-left: 0;
-}
-
-form {
-    margin: 0;
-    padding: 0;
-}
-
-fieldset {
-    margin: 0;
-    padding: 0;
-}
-
-blockquote {
-    font-size: 11px;
-    color: #777;
-    margin-left: 2px;
-    padding-left: 10px;
-    border-left: 5px solid #ddd;
-}
-
-code, pre {
-    font-family: "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace;
-    background: inherit;
-    color: #666;
-    font-size: 11px;
-}
-
-pre.literal-block {
-    margin: 10px;
-    background: #eee;
-    padding: 6px 8px;
-}
-
-code strong {
-    color: #930;
-}
-
-hr {
-    clear: both;
-    color: #eee;
-    background-color: #eee;
-    height: 1px;
-    border: none;
-    margin: 0;
-    padding: 0;
-    font-size: 1px;
-    line-height: 1px;
-}
-
-/* TEXT STYLES & MODIFIERS */
-
-.small {
-    font-size: 11px;
-}
-
-.tiny {
-    font-size: 10px;
-}
-
-p.tiny {
-    margin-top: -2px;
-}
-
-.mini {
-    font-size: 9px;
-}
-
-p.mini {
-    margin-top: -3px;
-}
-
-.help, p.help {
-    font-size: 10px !important;
-    color: #999;
-}
-
-img.help-tooltip {
-    cursor: help;
-}
-
-p img, h1 img, h2 img, h3 img, h4 img, td img {
-    vertical-align: middle;
-}
-
-.quiet, a.quiet:link, a.quiet:visited {
-    color: #999 !important;
-    font-weight: normal !important;
-}
-
-.quiet strong {
-    font-weight: bold !important;
-}
-
-.float-right {
-    float: right;
-}
-
-.float-left {
-    float: left;
-}
-
-.clear {
-    clear: both;
-}
-
-.align-left {
-    text-align: left;
-}
-
-.align-right {
-    text-align: right;
-}
-
-.example {
-    margin: 10px 0;
-    padding: 5px 10px;
-    background: #efefef;
-}
-
-.nowrap {
-    white-space: nowrap;
-}
-
-/* TABLES */
-
-table {
-    border-collapse: collapse;
-    border-color: #ccc;
-}
-
-td, th {
-    font-size: 11px;
-    line-height: 13px;
-    border-bottom: 1px solid #eee;
-    vertical-align: top;
-    padding: 5px;
-    font-family: "Lucida Grande", Verdana, Arial, sans-serif;
-}
-
-th {
-    text-align: left;
-    font-size: 12px;
-    font-weight: bold;
-}
-
-thead th,
-tfoot td {
-    color: #666;
-    padding: 2px 5px;
-    font-size: 11px;
-    background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x;
-    border-left: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
-}
-
-tfoot td {
-    border-bottom: none;
-    border-top: 1px solid #ddd;
-}
-
-thead th:first-child,
-tfoot td:first-child {
-    border-left: none !important;
-}
-
-thead th.optional {
-    font-weight: normal !important;
-}
-
-fieldset table {
-    border-right: 1px solid #eee;
-}
-
-tr.row-label td {
-    font-size: 9px;
-    padding-top: 2px;
-    padding-bottom: 0;
-    border-bottom: none;
-    color: #666;
-    margin-top: -1px;
-}
-
-tr.alt {
-    background: #f6f6f6;
-}
-
-.row1 {
-    background: #EDF3FE;
-}
-
-.row2 {
-    background: white;
-}
-
-/* SORTABLE TABLES */
-
-thead th {
-    padding: 2px 5px;
-    line-height: normal;
-}
-
-thead th a:link, thead th a:visited {
-    color: #666;
-}
-
-thead th.sorted {
-    background: #c5c5c5 url(../img/nav-bg-selected.gif) top left repeat-x;
-}
-
-table thead th .text span {
-    padding: 2px 5px;
-    display:block;
-}
-
-table thead th .text a {
-    display: block;
-    cursor: pointer;
-    padding: 2px 5px;
-}
-
-table thead th.sortable:hover {
-    background: white url(../img/nav-bg-reverse.gif) 0 -5px repeat-x;
-}
-
-thead th.sorted a.sortremove {
-    visibility: hidden;
-}
-
-table thead th.sorted:hover a.sortremove {
-    visibility: visible;
-}
-
-table thead th.sorted .sortoptions {
-    display: block;
-    padding: 4px 5px 0 5px;
-    float: right;
-    text-align: right;
-}
-
-table thead th.sorted .sortpriority {
-    font-size: .8em;
-    min-width: 12px;
-    text-align: center;
-    vertical-align: top;
-}
-
-table thead th.sorted .sortoptions a {
-    width: 14px;
-    height: 12px;
-    display: inline-block;
-}
-
-table thead th.sorted .sortoptions a.sortremove {
-    background: url(../img/sorting-icons.gif) -4px -5px no-repeat;
-}
-
-table thead th.sorted .sortoptions a.sortremove:hover {
-    background: url(../img/sorting-icons.gif) -4px -27px no-repeat;
-}
-
-table thead th.sorted .sortoptions a.ascending {
-    background: url(../img/sorting-icons.gif) -5px -50px no-repeat;
-}
-
-table thead th.sorted .sortoptions a.ascending:hover {
-    background: url(../img/sorting-icons.gif) -5px -72px no-repeat;
-}
-
-table thead th.sorted .sortoptions a.descending {
-    background: url(../img/sorting-icons.gif) -5px -94px no-repeat;
-}
-
-table thead th.sorted .sortoptions a.descending:hover {
-    background: url(../img/sorting-icons.gif) -5px -115px no-repeat;
-}
-
-/* ORDERABLE TABLES */
-
-table.orderable tbody tr td:hover {
-    cursor: move;
-}
-
-table.orderable tbody tr td:first-child {
-    padding-left: 14px;
-    background-image: url(../img/nav-bg-grabber.gif);
-    background-repeat: repeat-y;
-}
-
-table.orderable-initalized .order-cell, body>tr>td.order-cell {
-    display: none;
-}
-
-/* FORM DEFAULTS */
-
-input, textarea, select, .form-row p {
-    margin: 2px 0;
-    padding: 2px 3px;
-    vertical-align: middle;
-    font-family: "Lucida Grande", Verdana, Arial, sans-serif;
-    font-weight: normal;
-    font-size: 11px;
-}
-
-textarea {
-    vertical-align: top !important;
-}
-
-input[type=text], input[type=password], textarea, select, .vTextField {
-    border: 1px solid #ccc;
-}
-
-/* FORM BUTTONS */
-
-.button, input[type=submit], input[type=button], .submit-row input {
-    background: white url(../img/nav-bg.gif) bottom repeat-x;
-    padding: 3px 5px;
-    color: black;
-    border: 1px solid #bbb;
-    border-color: #ddd #aaa #aaa #ddd;
-}
-
-.button:active, input[type=submit]:active, input[type=button]:active {
-    background-image: url(../img/nav-bg-reverse.gif);
-    background-position: top;
-}
-
-.button[disabled], input[type=submit][disabled], input[type=button][disabled] {
-	background-image: url(../img/nav-bg.gif);
-	background-position: bottom;
-	opacity: 0.4;
-}
-
-.button.default, input[type=submit].default, .submit-row input.default {
-    border: 2px solid #5b80b2;
-    background: #7CA0C7 url(../img/default-bg.gif) bottom repeat-x;
-    font-weight: bold;
-    color: white;
-    float: right;
-}
-
-.button.default:active, input[type=submit].default:active {
-    background-image: url(../img/default-bg-reverse.gif);
-    background-position: top;
-}
-
-.button[disabled].default, input[type=submit][disabled].default, input[type=button][disabled].default {
-	background-image: url(../img/default-bg.gif);
-	background-position: bottom;
-	opacity: 0.4;
-}
-
-
-/* MODULES */
-
-.module {
-    border: 1px solid #ccc;
-    margin-bottom: 5px;
-    background: white;
-}
-
-.module p, .module ul, .module h3, .module h4, .module dl, .module pre {
-    padding-left: 10px;
-    padding-right: 10px;
-}
-
-.module blockquote {
-    margin-left: 12px;
-}
-
-.module ul, .module ol {
-    margin-left: 1.5em;
-}
-
-.module h3 {
-    margin-top: .6em;
-}
-
-.module h2, .module caption, .inline-group h2 {
-    margin: 0;
-    padding: 2px 5px 3px 5px;
-    font-size: 11px;
-    text-align: left;
-    font-weight: bold;
-    background: #7CA0C7 url(../img/default-bg.gif) top left repeat-x;
-    color: white;
-}
-
-.module table {
-    border-collapse: collapse;
-}
-
-/* MESSAGES & ERRORS */
-
-ul.messagelist {
-    padding: 0 0 5px 0;
-    margin: 0;
-}
-
-ul.messagelist li {
-    font-size: 12px;
-    display: block;
-    padding: 4px 5px 4px 25px;
-    margin: 0 0 3px 0;
-    border-bottom: 1px solid #ddd;
-    color: #666;
-    background: #ffc url(../img/icon_success.gif) 5px .3em no-repeat;
-}
-
-ul.messagelist li.warning{
-    background-image: url(../img/icon_alert.gif);
-}
-
-ul.messagelist li.error{
-    background-image: url(../img/icon_error.gif);
-}
-
-.errornote {
-    font-size: 12px !important;
-    display: block;
-    padding: 4px 5px 4px 25px;
-    margin: 0 0 3px 0;
-    border: 1px solid red;
-    color: red;
-    background: #ffc url(../img/icon_error.gif) 5px .3em no-repeat;
-}
-
-ul.errorlist {
-    margin: 0 !important;
-    padding: 0 !important;
-}
-
-.errorlist li {
-    font-size: 12px !important;
-    display: block;
-    padding: 4px 5px 4px 25px;
-    margin: 0 0 3px 0;
-    border: 1px solid red;
-    color: white;
-    background: red url(../img/icon_alert.gif) 5px .3em no-repeat;
-}
-
-.errorlist li a {
- 	color: white;
-    text-decoration: underline;
-}
-
-td ul.errorlist {
-    margin: 0 !important;
-    padding: 0 !important;
-}
-
-td ul.errorlist li {
-    margin: 0 !important;
-}
-
-.errors {
-    background: #ffc;
-}
-
-.errors input, .errors select, .errors textarea {
-    border: 1px solid red;
-}
-
-div.system-message {
-    background: #ffc;
-    margin: 10px;
-    padding: 6px 8px;
-    font-size: .8em;
-}
-
-div.system-message p.system-message-title {
-    padding: 4px 5px 4px 25px;
-    margin: 0;
-    color: red;
-    background: #ffc url(../img/icon_error.gif) 5px .3em no-repeat;
-}
-
-.description {
-    font-size: 12px;
-    padding: 5px 0 0 12px;
-}
-
-/* BREADCRUMBS */
-
-div.breadcrumbs {
-    background: white url(../img/nav-bg-reverse.gif) 0 -10px repeat-x;
-    padding: 2px 8px 3px 8px;
-    font-size: 11px;
-    color: #999;
-    border-top: 1px solid white;
-    border-bottom: 1px solid #ccc;
-    text-align: left;
-}
-
-/* ACTION ICONS */
-
-.addlink {
-    padding-left: 12px;
-    background: url(../img/icon_addlink.gif) 0 .2em no-repeat;
-}
-
-.changelink {
-    padding-left: 12px;
-    background: url(../img/icon_changelink.gif) 0 .2em no-repeat;
-}
-
-.deletelink {
-    padding-left: 12px;
-    background: url(../img/icon_deletelink.gif) 0 .25em no-repeat;
-}
-
-a.deletelink:link, a.deletelink:visited {
-    color: #CC3434;
-}
-
-a.deletelink:hover {
-    color: #993333;
-}
-
-/* OBJECT TOOLS */
-
-.object-tools {
-    font-size: 10px;
-    font-weight: bold;
-    font-family: Arial,Helvetica,sans-serif;
-    padding-left: 0;
-    float: right;
-    position: relative;
-    margin-top: -2.4em;
-    margin-bottom: -2em;
-}
-
-.form-row .object-tools {
-    margin-top: 5px;
-    margin-bottom: 5px;
-    float: none;
-    height: 2em;
-    padding-left: 3.5em;
-}
-
-.object-tools li {
-    display: block;
-    float: left;
-    background: url(../img/tool-left.gif) 0 0 no-repeat;
-    padding: 0 0 0 8px;
-    margin-left: 2px;
-    height: 16px;
-}
-
-.object-tools li:hover {
-    background: url(../img/tool-left_over.gif) 0 0 no-repeat;
-}
-
-.object-tools a:link, .object-tools a:visited {
-    display: block;
-    float: left;
-    color: white;
-    padding: .1em 14px .1em 8px;
-    height: 14px;
-    background: #999 url(../img/tool-right.gif) 100% 0 no-repeat;
-}
-
-.object-tools a:hover, .object-tools li:hover a {
-    background: #5b80b2 url(../img/tool-right_over.gif) 100% 0 no-repeat;
-}
-
-.object-tools a.viewsitelink, .object-tools a.golink {
-    background: #999 url(../img/tooltag-arrowright.gif) top right no-repeat;
-    padding-right: 28px;
-}
-
-.object-tools a.viewsitelink:hover, .object-tools a.golink:hover {
-    background: #5b80b2 url(../img/tooltag-arrowright_over.gif) top right no-repeat;
-}
-
-.object-tools a.addlink {
-    background: #999 url(../img/tooltag-add.gif) top right no-repeat;
-    padding-right: 28px;
-}
-
-.object-tools a.addlink:hover {
-    background: #5b80b2 url(../img/tooltag-add_over.gif) top right no-repeat;
-}
-
-/* OBJECT HISTORY */
-
-table#change-history {
-    width: 100%;
-}
-
-table#change-history tbody th {
-    width: 16em;
-}
-
-/* PAGE STRUCTURE */
-
-#container {
-    position: relative;
-    width: 100%;
-    min-width: 760px;
-    padding: 0;
-}
-
-#content {
-    margin: 10px 15px;
-}
-
-#header {
-    width: 100%;
-}
-
-#content-main {
-    float: left;
-    width: 100%;
-}
-
-#content-related {
-    float: right;
-    width: 18em;
-    position: relative;
-    margin-right: -19em;
-}
-
-#footer {
-    clear: both;
-    padding: 10px;
-}
-
-/* COLUMN TYPES */
-
-.colMS {
-    margin-right: 20em !important;
-}
-
-.colSM {
-    margin-left: 20em !important;
-}
-
-.colSM #content-related {
-    float: left;
-    margin-right: 0;
-    margin-left: -19em;
-}
-
-.colSM #content-main {
-    float: right;
-}
-
-.popup .colM {
-    width: 95%;
-}
-
-.subcol {
-    float: left;
-    width: 46%;
-    margin-right: 15px;
-}
-
-.dashboard #content {
-    width: 500px;
-}
-
-/* HEADER */
-
-#header {
-    background: #417690;
-    color: #ffc;
-    overflow: hidden;
-}
-
-#header a:link, #header a:visited {
-    color: white;
-}
-
-#header a:hover {
-    text-decoration: underline;
-}
-
-#branding h1 {
-    padding: 0 10px;
-    font-size: 18px;
-    margin: 8px 0;
-    font-weight: normal;
-    color: #f4f379;
-}
-
-#branding h2 {
-    padding: 0 10px;
-    font-size: 14px;
-    margin: -8px 0 8px 0;
-    font-weight: normal;
-    color: #ffc;
-}
-
-#user-tools {
-    position: absolute;
-    top: 0;
-    right: 0;
-    padding: 1.2em 10px;
-    font-size: 11px;
-    text-align: right;
-}
-
-/* SIDEBAR */
-
-#content-related h3 {
-    font-size: 12px;
-    color: #666;
-    margin-bottom: 3px;
-}
-
-#content-related h4 {
-    font-size: 11px;
-}
-
-#content-related .module h2 {
-    background: #eee url(../img/nav-bg.gif) bottom left repeat-x;
-    color: #666;
-}
-
diff --git a/lms/static/admin/css/changelists.css b/lms/static/admin/css/changelists.css
deleted file mode 100644
index 3c1a8c16a9..0000000000
--- a/lms/static/admin/css/changelists.css
+++ /dev/null
@@ -1,289 +0,0 @@
-/* CHANGELISTS */
-
-#changelist {
-    position: relative;
-    width: 100%;
-}
-
-#changelist table {
-    width: 100%;
-}
-
-.change-list .hiddenfields { display:none; }
-
-.change-list .filtered table {
-    border-right: 1px solid #ddd;
-}
-
-.change-list .filtered {
-    min-height: 400px;
-}
-
-.change-list .filtered {
-    background: white url(../img/changelist-bg.gif) top right repeat-y !important;
-}
-
-.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
-    margin-right: 160px !important;
-    width: auto !important;
-}
-
-.change-list .filtered table tbody th {
-    padding-right: 1em;
-}
-
-#changelist .toplinks {
-    border-bottom: 1px solid #ccc !important;
-}
-
-#changelist .paginator {
-    color: #666;
-    border-top: 1px solid #eee;
-    border-bottom: 1px solid #eee;
-    background: white url(../img/nav-bg.gif) 0 180% repeat-x;
-    overflow: hidden;
-}
-
-.change-list .filtered .paginator {
-    border-right: 1px solid #ddd;
-}
-
-/* CHANGELIST TABLES */
-
-#changelist table thead th {
-    padding: 0;
-    white-space: nowrap;
-    vertical-align: middle;
-}
-
-#changelist table thead th.action-checkbox-column {
-    width: 1.5em;
-    text-align: center;
-}
-
-#changelist table tbody td, #changelist table tbody th {
-    border-left: 1px solid #ddd;
-}
-
-#changelist table tbody td:first-child, #changelist table tbody th:first-child {
-    border-left: 0;
-    border-right: 1px solid #ddd;
-}
-
-#changelist table tbody td.action-checkbox {
-    text-align:center;
-}
-
-#changelist table tfoot {
-    color: #666;
-}
-
-/* TOOLBAR */
-
-#changelist #toolbar {
-    padding: 3px;
-    border-bottom: 1px solid #ddd;
-    background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x;
-    color: #666;
-}
-
-#changelist #toolbar form input {
-    font-size: 11px;
-    padding: 1px 2px;
-}
-
-#changelist #toolbar form #searchbar {
-    padding: 2px;
-}
-
-#changelist #changelist-search img {
-    vertical-align: middle;
-}
-
-/* FILTER COLUMN */
-
-#changelist-filter {
-    position: absolute;
-    top: 0;
-    right: 0;
-    z-index: 1000;
-    width: 160px;
-    border-left: 1px solid #ddd;
-    background: #efefef;
-    margin: 0;
-}
-
-#changelist-filter h2 {
-    font-size: 11px;
-    padding: 2px 5px;
-    border-bottom: 1px solid #ddd;
-}
-
-#changelist-filter h3 {
-    font-size: 12px;
-    margin-bottom: 0;
-}
-
-#changelist-filter ul {
-    padding-left: 0;
-    margin-left: 10px;
-}
-
-#changelist-filter li {
-    list-style-type: none;
-    margin-left: 0;
-    padding-left: 0;
-}
-
-#changelist-filter a {
-    color: #999;
-}
-
-#changelist-filter a:hover {
-    color: #036;
-}
-
-#changelist-filter li.selected {
-    border-left: 5px solid #ccc;
-    padding-left: 5px;
-    margin-left: -10px;
-}
-
-#changelist-filter li.selected a {
-    color: #5b80b2 !important;
-}
-
-/* DATE DRILLDOWN */
-
-.change-list ul.toplinks {
-    display: block;
-    background: white url(../img/nav-bg-reverse.gif) 0 -10px repeat-x;
-    border-top: 1px solid white;
-    float: left;
-    padding: 0 !important;
-    margin: 0 !important;
-    width: 100%;
-}
-
-.change-list ul.toplinks li {
-    padding: 3px 6px;
-    font-weight: bold;
-    list-style-type: none;
-    display: inline-block;
-}
-
-.change-list ul.toplinks .date-back a {
-    color: #999;
-}
-
-.change-list ul.toplinks .date-back a:hover {
-    color: #036;
-}
-
-/* PAGINATOR */
-
-.paginator {
-    font-size: 11px;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    line-height: 22px;
-    margin: 0;
-    border-top: 1px solid #ddd;
-}
-
-.paginator a:link, .paginator a:visited {
-    padding: 2px 6px;
-    border: solid 1px #ccc;
-    background: white;
-    text-decoration: none;
-}
-
-.paginator a.showall {
-    padding: 0 !important;
-    border: none !important;
-}
-
-.paginator a.showall:hover {
-    color: #036 !important;
-    background: transparent !important;
-}
-
-.paginator .end {
-    border-width: 2px !important;
-    margin-right: 6px;
-}
-
-.paginator .this-page {
-    padding: 2px 6px;
-    font-weight: bold;
-    font-size: 13px;
-    vertical-align: top;
-}
-
-.paginator a:hover {
-    color: white;
-    background: #5b80b2;
-    border-color: #036;
-}
-
-/* ACTIONS */
-
-.filtered .actions {
-    margin-right: 160px !important;
-    border-right: 1px solid #ddd;
-}
-
-#changelist table input {
-    margin: 0;
-}
-
-#changelist table tbody tr.selected {
-    background-color: #FFFFCC;
-}
-
-#changelist .actions {
-    color: #999;
-    padding: 3px;
-    border-top: 1px solid #fff;
-    border-bottom: 1px solid #ddd;
-    background: white url(../img/nav-bg-reverse.gif) 0 -10px repeat-x;
-}
-
-#changelist .actions.selected {
-    background: #fffccf;
-    border-top: 1px solid #fffee8;
-    border-bottom: 1px solid #edecd6;
-}
-
-#changelist .actions span.all,
-#changelist .actions span.action-counter,
-#changelist .actions span.clear,
-#changelist .actions span.question {
-    font-size: 11px;
-    margin: 0 0.5em;
-    display: none;
-}
-
-#changelist .actions:last-child {
-    border-bottom: none;
-}
-
-#changelist .actions select {
-    border: 1px solid #aaa;
-    margin-left: 0.5em;
-    padding: 1px 2px;
-}
-
-#changelist .actions label {
-    font-size: 11px;
-    margin-left: 0.5em;
-}
-
-#changelist #action-toggle {
-    display: none;
-}
-
-#changelist .actions .button {
-    font-size: 11px;
-    padding: 1px 2px;
-}
diff --git a/lms/static/admin/css/dashboard.css b/lms/static/admin/css/dashboard.css
deleted file mode 100644
index ceefe1525f..0000000000
--- a/lms/static/admin/css/dashboard.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/* DASHBOARD */
-
-.dashboard .module table th {
-    width: 100%;
-}
-
-.dashboard .module table td {
-    white-space: nowrap;
-}
-
-.dashboard .module table td a {
-    display: block;
-    padding-right: .6em;
-}
-
-/* RECENT ACTIONS MODULE */
-
-.module ul.actionlist {
-    margin-left: 0;
-}
-
-ul.actionlist li {
-    list-style-type: none;
-}
-
-ul.actionlist li.changelink {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    -o-text-overflow: ellipsis;
-}
\ No newline at end of file
diff --git a/lms/static/admin/css/forms.css b/lms/static/admin/css/forms.css
deleted file mode 100644
index 0ecfca784c..0000000000
--- a/lms/static/admin/css/forms.css
+++ /dev/null
@@ -1,358 +0,0 @@
-@import url('widgets.css');
-
-/* FORM ROWS */
-
-.form-row {
-    overflow: hidden;
-    padding: 8px 12px;
-    font-size: 11px;
-    border-bottom: 1px solid #eee;
-}
-
-.form-row img, .form-row input {
-    vertical-align: middle;
-}
-
-form .form-row p {
-    padding-left: 0;
-    font-size: 11px;
-}
-
-/* FORM LABELS */
-
-form h4 {
-    margin: 0 !important;
-    padding: 0 !important;
-    border: none !important;
-}
-
-label {
-    font-weight: normal !important;
-    color: #666;
-    font-size: 12px;
-}
-
-.required label, label.required {
-    font-weight: bold !important;
-    color: #333 !important;
-}
-
-/* RADIO BUTTONS */
-
-form ul.radiolist li {
-    list-style-type: none;
-}
-
-form ul.radiolist label {
-    float: none;
-    display: inline;
-}
-
-form ul.inline {
-    margin-left: 0;
-    padding: 0;
-}
-
-form ul.inline li {
-    float: left;
-    padding-right: 7px;
-}
-
-/* ALIGNED FIELDSETS */
-
-.aligned label {
-    display: block;
-    padding: 3px 10px 0 0;
-    float: left;
-    width: 8em;
-}
-
-.aligned ul label {
-    display: inline;
-    float: none;
-    width: auto;
-}
-
-.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField {
-    width: 350px;
-}
-
-form .aligned p, form .aligned ul {
-    margin-left: 7em;
-    padding-left: 30px;
-}
-
-form .aligned table p {
-    margin-left: 0;
-    padding-left: 0;
-}
-
-form .aligned p.help {
-    padding-left: 38px;
-}
-
-.aligned .vCheckboxLabel {
-    float: none !important;
-    display: inline;
-    padding-left: 4px;
-}
-
-.colM .aligned .vLargeTextField, .colM .aligned .vXMLLargeTextField {
-    width: 610px;
-}
-
-.checkbox-row p.help {
-    margin-left: 0;
-    padding-left: 0 !important;
-}
-
-fieldset .field-box {
-    float: left;
-    margin-right: 20px;
-}
-
-/* WIDE FIELDSETS */
-
-.wide label {
-    width: 15em !important;
-}
-
-form .wide p {
-    margin-left: 15em;
-}
-
-form .wide p.help {
-    padding-left: 38px;
-}
-
-.colM fieldset.wide .vLargeTextField, .colM fieldset.wide .vXMLLargeTextField {
-    width: 450px;
-}
-
-/* COLLAPSED FIELDSETS */
-
-fieldset.collapsed * {
-    display: none;
-}
-
-fieldset.collapsed h2, fieldset.collapsed {
-    display: block !important;
-}
-
-fieldset.collapsed h2 {
-    background-image: url(../img/nav-bg.gif);
-    background-position: bottom left;
-    color: #999;
-}
-
-fieldset.collapsed .collapse-toggle {
-    background: transparent;
-    display: inline !important;
-}
-
-/* MONOSPACE TEXTAREAS */
-
-fieldset.monospace textarea {
-    font-family: "Bitstream Vera Sans Mono",Monaco,"Courier New",Courier,monospace;
-}
-
-/* SUBMIT ROW */
-
-.submit-row {
-    padding: 5px 7px;
-    text-align: right;
-    background: white url(../img/nav-bg.gif) 0 100% repeat-x;
-    border: 1px solid #ccc;
-    margin: 5px 0;
-    overflow: hidden;
-}
-
-body.popup .submit-row {
-    overflow: auto;
-}
-
-.submit-row input {
-    margin: 0 0 0 5px;
-}
-
-.submit-row p {
-    margin: 0.3em;
-}
-
-.submit-row p.deletelink-box {
-    float: left;
-}
-
-.submit-row .deletelink {
-    background: url(../img/icon_deletelink.gif) 0 50% no-repeat;
-    padding-left: 14px;
-}
-
-/* CUSTOM FORM FIELDS */
-
-.vSelectMultipleField {
-    vertical-align: top !important;
-}
-
-.vCheckboxField {
-    border: none;
-}
-
-.vDateField, .vTimeField {
-    margin-right: 2px;
-}
-
-.vURLField {
-    width: 30em;
-}
-
-.vLargeTextField, .vXMLLargeTextField {
-    width: 48em;
-}
-
-.flatpages-flatpage #id_content {
-    height: 40.2em;
-}
-
-.module table .vPositiveSmallIntegerField {
-    width: 2.2em;
-}
-
-.vTextField {
-    width: 20em;
-}
-
-.vIntegerField {
-    width: 5em;
-}
-
-.vForeignKeyRawIdAdminField {
-    width: 5em;
-}
-
-/* INLINES */
-
-.inline-group {
-    padding: 0;
-    border: 1px solid #ccc;
-    margin: 10px 0;
-}
-
-.inline-group .aligned label {
-    width: 8em;
-}
-
-.inline-related {
-    position: relative;
-}
-
-.inline-related h3 {
-    margin: 0;
-    color: #666;
-    padding: 3px 5px;
-    font-size: 11px;
-    background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x;
-    border-bottom: 1px solid #ddd;
-}
-
-.inline-related h3 span.delete {
-    float: right;
-}
-
-.inline-related h3 span.delete label {
-    margin-left: 2px;
-    font-size: 11px;
-}
-
-.inline-related fieldset {
-    margin: 0;
-    background: #fff;
-    border: none;
-}
-
-.inline-related fieldset.module h3 {
-    margin: 0;
-    padding: 2px 5px 3px 5px;
-    font-size: 11px;
-    text-align: left;
-    font-weight: bold;
-    background: #bcd;
-    color: #fff;
-}
-
-.inline-group .tabular fieldset.module {
-    border: none;
-    border-bottom: 1px solid #ddd;
-}
-
-.inline-related.tabular fieldset.module table {
-    width: 100%;
-}
-
-.last-related fieldset {
-    border: none;
-}
-
-.inline-group .tabular tr.has_original td {
-    padding-top: 2em;
-}
-
-.inline-group .tabular tr td.original {
-    padding: 2px 0 0 0;
-    width: 0;
-    _position: relative;
-}
-
-.inline-group .tabular th.original {
-    width: 0px;
-    padding: 0;
-}
-
-.inline-group .tabular td.original p {
-    position: absolute;
-    left: 0;
-    height: 1.1em;
-    padding: 2px 7px;
-    overflow: hidden;
-    font-size: 9px;
-    font-weight: bold;
-    color: #666;
-    _width: 700px;
-}
-
-.inline-group ul.tools {
-    padding: 0;
-    margin: 0;
-    list-style: none;
-}
-
-.inline-group ul.tools li {
-    display: inline;
-    padding: 0 5px;
-}
-
-.inline-group div.add-row,
-.inline-group .tabular tr.add-row td {
-    color: #666;
-    padding: 3px 5px;
-    border-bottom: 1px solid #ddd;
-    background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x;
-}
-
-.inline-group .tabular tr.add-row td {
-    padding: 4px 5px 3px;
-    border-bottom: none;
-}
-
-.inline-group ul.tools a.add,
-.inline-group div.add-row a,
-.inline-group .tabular tr.add-row td a {
-    background: url(../img/icon_addlink.gif) 0 50% no-repeat;
-    padding-left: 14px;
-    font-size: 11px;
-    outline: 0; /* Remove dotted border around link */
-}
-
-.empty-form {
-    display: none;
-}
diff --git a/lms/static/admin/css/login.css b/lms/static/admin/css/login.css
deleted file mode 100644
index 8872ade70b..0000000000
--- a/lms/static/admin/css/login.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/* LOGIN FORM */
-
-body.login {
-    background: #eee;
-}
-
-.login #container {
-    background: white;
-    border: 1px solid #ccc;
-    width: 28em;
-    min-width: 300px;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 100px;
-}
-
-.login #content-main {
-    width: 100%;
-}
-
-.login form {
-    margin-top: 1em;
-}
-
-.login .form-row {
-    padding: 4px 0;
-    float: left;
-    width: 100%;
-}
-
-.login .form-row label {
-    float: left;
-    width: 9em;
-    padding-right: 0.5em;
-    line-height: 2em;
-    text-align: right;
-    font-size: 1em;
-    color: #333;
-}
-
-.login .form-row #id_username, .login .form-row #id_password {
-    width: 14em;
-}
-
-.login span.help {
-    font-size: 10px;
-    display: block;
-}
-
-.login .submit-row {
-    clear: both;
-    padding: 1em 0 0 9.4em;
-}
-
-.login .password-reset-link {
-    text-align: center;
-}
diff --git a/lms/static/admin/css/rtl.css b/lms/static/admin/css/rtl.css
deleted file mode 100644
index 82d16024e6..0000000000
--- a/lms/static/admin/css/rtl.css
+++ /dev/null
@@ -1,245 +0,0 @@
-body {
-    direction: rtl;
-}
-
-/* LOGIN */
-
-.login .form-row {
-    float: right;
-}
-
-.login .form-row label {
-    float: right;
-    padding-left: 0.5em;
-    padding-right: 0;
-    text-align: left;
-}
-
-.login .submit-row {
-    clear: both;
-    padding: 1em 9.4em 0 0;
-}
-
-/* GLOBAL */
-
-th {
-    text-align: right;
-}
-
-.module h2, .module caption {
-    text-align: right;
-}
-
-.addlink, .changelink {
-    padding-left: 0px;
-    padding-right: 12px;
-    background-position: 100% 0.2em;
-}
-
-.deletelink {
-    padding-left: 0px;
-    padding-right: 12px;
-    background-position: 100% 0.25em;
-}
-
-.object-tools {
-    float: left;
-}
-
-thead th:first-child,
-tfoot td:first-child {
-    border-left: 1px solid #ddd !important;
-}
-
-/* LAYOUT */
-
-#user-tools {
-    right: auto;
-    left: 0;
-    text-align: left;
-}
-
-div.breadcrumbs {
-    text-align: right;
-}
-
-#content-main {
-    float: right;
-}
-
-#content-related {
-    float: left;
-    margin-left: -19em;
-    margin-right: auto;
-}
-
-.colMS {
-    margin-left: 20em !important;
-    margin-right: 10px !important;
-}
-
-/* SORTABLE TABLES */
-
-table thead th.sorted .sortoptions {
-   float: left;
-}
-
-/* dashboard styles */
-
-.dashboard .module table td a {
-    padding-left: .6em;
-    padding-right: 12px;
-}
-
-/* changelists styles */
-
-.change-list .filtered {
-    background: white url(../img/changelist-bg_rtl.gif) top left repeat-y !important;
-}
-
-.change-list .filtered table {
-    border-left: 1px solid #ddd;
-    border-right: 0px none;
-}
-
-#changelist-filter {
-    right: auto;
-    left: 0;
-    border-left: 0px none;
-    border-right: 1px solid #ddd;
-}
-
-.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
-    margin-right: 0px !important;
-    margin-left: 160px !important;
-}
-
-#changelist-filter li.selected {
-    border-left: 0px none;
-    padding-left: 0px;
-    margin-left: 0;
-    border-right: 5px solid #ccc;
-    padding-right: 5px;
-    margin-right: -10px;
-}
-
-.filtered .actions {
-    border-left:1px solid #DDDDDD;
-    margin-left:160px !important;
-    border-right: 0 none;
-    margin-right:0 !important;
-}
-
-#changelist table tbody td:first-child, #changelist table tbody th:first-child {
-    border-right: 0;
-    border-left: 1px solid #ddd;
-}
-
-/* FORMS */
-
-.aligned label {
-    padding: 0 0 3px 1em;
-    float: right;
-}
-
-.submit-row {
-    text-align: left
-}
-
-.submit-row p.deletelink-box {
-    float: right;
-}
-
-.submit-row .deletelink {
-    background: url(../img/icon_deletelink.gif) 0 50% no-repeat;
-    padding-right: 14px;
-}
-
-.vDateField, .vTimeField {
-    margin-left: 2px;
-}
-
-form ul.inline li {
-    float: right;
-    padding-right: 0;
-    padding-left: 7px;
-}
-
-input[type=submit].default, .submit-row input.default {
-    float: left;
-}
-
-fieldset .field-box {
-    float: right;
-    margin-left: 20px;
-    margin-right: 0;
-}
-
-.errorlist li {
-    background-position: 100% .3em;
-    padding: 4px 25px 4px 5px;
-}
-
-.errornote {
-    background-position: 100% .3em;
-    padding: 4px 25px 4px 5px;
-}
-
-/* WIDGETS */
-
-.calendarnav-previous {
-    top: 0;
-    left: auto;
-    right: 0;
-}
-
-.calendarnav-next {
-    top: 0;
-    right: auto;
-    left: 0;
-}
-
-.calendar caption, .calendarbox h2 {
-    text-align: center;
-}
-
-.selector {
-    float: right;
-}
-
-.selector .selector-filter {
-    text-align: right;
-}
-
-.inline-deletelink {
-    float: left;
-}
-
-/* MISC */
-
-.inline-related h2, .inline-group h2 {
-    text-align: right
-}
-
-.inline-related h3 span.delete {
-    padding-right: 20px;
-    padding-left: inherit;
-    left: 10px;
-    right: inherit;
-    float:left;
-}
-
-.inline-related h3 span.delete label {
-    margin-left: inherit;
-    margin-right: 2px;
-}
-
-/* IE7 specific bug fixes */
-
-div.colM {
-    position: relative;
-}
-
-.submit-row input {
-    float: left;
-}
\ No newline at end of file
diff --git a/lms/static/admin/css/widgets.css b/lms/static/admin/css/widgets.css
deleted file mode 100644
index 0a7012c7b2..0000000000
--- a/lms/static/admin/css/widgets.css
+++ /dev/null
@@ -1,563 +0,0 @@
-/* SELECTOR (FILTER INTERFACE) */
-
-.selector {
-    width: 580px;
-    float: left;
-}
-
-.selector select {
-    width: 270px;
-    height: 17.2em;
-}
-
-.selector-available, .selector-chosen {
-    float: left;
-    width: 270px;
-    text-align: center;
-    margin-bottom: 5px;
-}
-
-.selector-chosen select {
-    border-top: none;
-}
-
-.selector-available h2, .selector-chosen h2 {
-    border: 1px solid #ccc;
-}
-
-.selector .selector-available h2 {
-    background: white url(../img/nav-bg.gif) bottom left repeat-x;
-    color: #666;
-}
-
-.selector .selector-filter {
-    background: white;
-    border: 1px solid #ccc;
-    border-width: 0 1px;
-    padding: 3px;
-    color: #999;
-    font-size: 10px;
-    margin: 0;
-    text-align: left;
-}
-
-.selector .selector-filter label,
-.inline-group .aligned .selector .selector-filter label {
-    width: 16px;
-    padding: 2px;
-}
-
-.selector .selector-available input {
-    width: 230px;
-}
-
-.selector ul.selector-chooser {
-    float: left;
-    width: 22px;
-    height: 50px;
-    background: url(../img/chooser-bg.gif) top center no-repeat;
-    margin: 10em 5px 0 5px;
-    padding: 0;
-}
-
-.selector-chooser li {
-    margin: 0;
-    padding: 3px;
-    list-style-type: none;
-}
-
-.selector select {
-    margin-bottom: 10px;
-    margin-top: 0;
-}
-
-.selector-add, .selector-remove {
-    width: 16px;
-    height: 16px;
-    display: block;
-    text-indent: -3000px;
-    overflow: hidden;
-}
-
-.selector-add {
-    background: url(../img/selector-icons.gif) 0 -161px no-repeat;
-    cursor: default;
-    margin-bottom: 2px;
-}
-
-.active.selector-add {
-    background: url(../img/selector-icons.gif) 0 -187px no-repeat;
-    cursor: pointer;
-}
-
-.selector-remove {
-    background: url(../img/selector-icons.gif) 0 -109px no-repeat;
-    cursor: default;
-}
-
-.active.selector-remove {
-    background: url(../img/selector-icons.gif) 0 -135px no-repeat;
-    cursor: pointer;
-}
-
-a.selector-chooseall, a.selector-clearall {
-    display: inline-block;
-    text-align: left;
-    margin-left: auto;
-    margin-right: auto;
-    font-weight: bold;
-    color: #666;
-}
-
-a.selector-chooseall {
-    padding: 3px 18px 3px 0;
-}
-
-a.selector-clearall {
-    padding: 3px 0 3px 18px;
-}
-
-a.active.selector-chooseall:hover, a.active.selector-clearall:hover {
-    color: #036;
-}
-
-a.selector-chooseall {
-    background: url(../img/selector-icons.gif) right -263px no-repeat;
-    cursor: default;
-}
-
-a.active.selector-chooseall {
-    background: url(../img/selector-icons.gif) right -289px no-repeat;
-    cursor: pointer;
-}
-
-a.selector-clearall {
-    background: url(../img/selector-icons.gif) left -211px no-repeat;
-    cursor: default;
-}
-
-a.active.selector-clearall {
-    background: url(../img/selector-icons.gif) left -237px no-repeat;
-    cursor: pointer;
-}
-
-/* STACKED SELECTORS */
-
-.stacked {
-    float: left;
-    width: 500px;
-}
-
-.stacked select {
-    width: 480px;
-    height: 10.1em;
-}
-
-.stacked .selector-available, .stacked .selector-chosen {
-    width: 480px;
-}
-
-.stacked .selector-available {
-    margin-bottom: 0;
-}
-
-.stacked .selector-available input {
-    width: 442px;
-}
-
-.stacked ul.selector-chooser {
-    height: 22px;
-    width: 50px;
-    margin: 0 0 3px 40%;
-    background: url(../img/chooser_stacked-bg.gif) top center no-repeat;
-}
-
-.stacked .selector-chooser li {
-    float: left;
-    padding: 3px 3px 3px 5px;
-}
-
-.stacked .selector-chooseall, .stacked .selector-clearall {
-    display: none;
-}
-
-.stacked .selector-add {
-    background: url(../img/selector-icons.gif) 0 -57px no-repeat;
-    cursor: default;
-}
-
-.stacked .active.selector-add {
-    background: url(../img/selector-icons.gif) 0 -83px no-repeat;
-    cursor: pointer;
-}
-
-.stacked .selector-remove {
-    background: url(../img/selector-icons.gif) 0 -5px no-repeat;
-    cursor: default;
-}
-
-.stacked .active.selector-remove {
-    background: url(../img/selector-icons.gif) 0 -31px no-repeat;
-    cursor: pointer;
-}
-
-/* DATE AND TIME */
-
-p.datetime {
-    line-height: 20px;
-    margin: 0;
-    padding: 0;
-    color: #666;
-    font-size: 11px;
-    font-weight: bold;
-}
-
-.datetime span {
-    font-size: 11px;
-    color: #ccc;
-    font-weight: normal;
-    white-space: nowrap;
-}
-
-table p.datetime {
-    font-size: 10px;
-    margin-left: 0;
-    padding-left: 0;
-}
-
-/* FILE UPLOADS */
-
-p.file-upload {
-    line-height: 20px;
-    margin: 0;
-    padding: 0;
-    color: #666;
-    font-size: 11px;
-    font-weight: bold;
-}
-
-.file-upload a {
-    font-weight: normal;
-}
-
-.file-upload .deletelink {
-    margin-left: 5px;
-}
-
-span.clearable-file-input label {
-    color: #333;
-    font-size: 11px;
-    display: inline;
-    float: none;
-}
-
-/* CALENDARS & CLOCKS */
-
-.calendarbox, .clockbox {
-    margin: 5px auto;
-    font-size: 11px;
-    width: 16em;
-    text-align: center;
-    background: white;
-    position: relative;
-}
-
-.clockbox {
-    width: auto;
-}
-
-.calendar {
-    margin: 0;
-    padding: 0;
-}
-
-.calendar table {
-    margin: 0;
-    padding: 0;
-    border-collapse: collapse;
-    background: white;
-    width: 100%;
-}
-
-.calendar caption, .calendarbox h2 {
-    margin: 0;
-    font-size: 11px;
-    text-align: center;
-    border-top: none;
-}
-
-.calendar th {
-    font-size: 10px;
-    color: #666;
-    padding: 2px 3px;
-    text-align: center;
-    background: #e1e1e1 url(../img/nav-bg.gif) 0 50% repeat-x;
-    border-bottom: 1px solid #ddd;
-}
-
-.calendar td {
-    font-size: 11px;
-    text-align: center;
-    padding: 0;
-    border-top: 1px solid #eee;
-    border-bottom: none;
-}
-
-.calendar td.selected a {
-    background: #C9DBED;
-}
-
-.calendar td.nonday {
-    background: #efefef;
-}
-
-.calendar td.today a {
-    background: #ffc;
-}
-
-.calendar td a, .timelist a {
-    display: block;
-    font-weight: bold;
-    padding: 4px;
-    text-decoration: none;
-    color: #444;
-}
-
-.calendar td a:hover, .timelist a:hover {
-    background: #5b80b2;
-    color: white;
-}
-
-.calendar td a:active, .timelist a:active {
-    background: #036;
-    color: white;
-}
-
-.calendarnav {
-    font-size: 10px;
-    text-align: center;
-    color: #ccc;
-    margin: 0;
-    padding: 1px 3px;
-}
-
-.calendarnav a:link, #calendarnav a:visited, #calendarnav a:hover {
-    color: #999;
-}
-
-.calendar-shortcuts {
-    background: white;
-    font-size: 10px;
-    line-height: 11px;
-    border-top: 1px solid #eee;
-    padding: 3px 0 4px;
-    color: #ccc;
-}
-
-.calendarbox .calendarnav-previous, .calendarbox .calendarnav-next {
-    display: block;
-    position: absolute;
-    font-weight: bold;
-    font-size: 12px;
-    background: #C9DBED url(../img/default-bg.gif) bottom left repeat-x;
-    padding: 1px 4px 2px 4px;
-    color: white;
-}
-
-.calendarnav-previous:hover, .calendarnav-next:hover {
-    background: #036;
-}
-
-.calendarnav-previous {
-    top: 0;
-    left: 0;
-}
-
-.calendarnav-next {
-    top: 0;
-    right: 0;
-}
-
-.calendar-cancel {
-    margin: 0 !important;
-    padding: 0 !important;
-    font-size: 10px;
-    background: #e1e1e1 url(../img/nav-bg.gif) 0 50% repeat-x;
-    border-top: 1px solid #ddd;
-}
-
-.calendar-cancel:hover {
-    background: #e1e1e1 url(../img/nav-bg-reverse.gif) 0 50% repeat-x;
-}
-
-.calendar-cancel a {
-    color: black;
-    display: block;
-}
-
-ul.timelist, .timelist li {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-}
-
-.timelist a {
-    padding: 2px;
-}
-
-/* INLINE ORDERER */
-
-ul.orderer {
-    position: relative;
-    padding: 0 !important;
-    margin: 0 !important;
-    list-style-type: none;
-}
-
-ul.orderer li {
-    list-style-type: none;
-    display: block;
-    padding: 0;
-    margin: 0;
-    border: 1px solid #bbb;
-    border-width: 0 1px 1px 0;
-    white-space: nowrap;
-    overflow: hidden;
-    background: #e2e2e2 url(../img/nav-bg-grabber.gif) repeat-y;
-}
-
-ul.orderer li:hover {
-    cursor: move;
-    background-color: #ddd;
-}
-
-ul.orderer li a.selector {
-    margin-left: 12px;
-    overflow: hidden;
-    width: 83%;
-    font-size: 10px !important;
-    padding: 0.6em 0;
-}
-
-ul.orderer li a:link, ul.orderer li a:visited {
-    color: #333;
-}
-
-ul.orderer li .inline-deletelink {
-    position: absolute;
-    right: 4px;
-    margin-top: 0.6em;
-}
-
-ul.orderer li.selected {
-    background-color: #f8f8f8;
-    border-right-color: #f8f8f8;
-}
-
-ul.orderer li.deleted {
-    background: #bbb url(../img/deleted-overlay.gif);
-}
-
-ul.orderer li.deleted a:link, ul.orderer li.deleted a:visited {
-    color: #888;
-}
-
-ul.orderer li.deleted .inline-deletelink {
-    background-image: url(../img/inline-restore.png);
-}
-
-ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover {
-    cursor: default;
-}
-
-/* EDIT INLINE */
-
-.inline-deletelink {
-    float: right;
-    text-indent: -9999px;
-    background: transparent url(../img/inline-delete.png) no-repeat;
-    width: 15px;
-    height: 15px;
-    border: 0px none;
-    outline: 0; /* Remove dotted border around link */
-}
-
-.inline-deletelink:hover {
-    background-position: -15px 0;
-    cursor: pointer;
-}
-
-.editinline button.addlink {
-    border: 0px none;
-    color: #5b80b2;
-    font-size: 100%;
-    cursor: pointer;
-}
-
-.editinline button.addlink:hover {
-    color: #036;
-    cursor: pointer;
-}
-
-.editinline table .help {
-    text-align: right;
-    float: right;
-    padding-left: 2em;
-}
-
-.editinline tfoot .addlink {
-    white-space: nowrap;
-}
-
-.editinline table thead th:last-child {
-    border-left: none;
-}
-
-.editinline tr.deleted {
-    background: #ddd url(../img/deleted-overlay.gif);
-}
-
-.editinline tr.deleted .inline-deletelink {
-    background-image: url(../img/inline-restore.png);
-}
-
-.editinline tr.deleted td:hover {
-    cursor: default;
-}
-
-.editinline tr.deleted td:first-child {
-    background-image: none !important;
-}
-
-/* EDIT INLINE - STACKED */
-
-.editinline-stacked {
-    min-width: 758px;
-}
-
-.editinline-stacked .inline-object {
-    margin-left: 210px;
-    background: white;
-}
-
-.editinline-stacked .inline-source {
-    float: left;
-    width: 200px;
-    background: #f8f8f8;
-}
-
-.editinline-stacked .inline-splitter {
-    float: left;
-    width: 9px;
-    background: #f8f8f8 url(../img/inline-splitter-bg.gif) 50% 50% no-repeat;
-    border-right: 1px solid #ccc;
-}
-
-.editinline-stacked .controls {
-    clear: both;
-    background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x;
-    padding: 3px 4px;
-    font-size: 11px;
-    border-top: 1px solid #ddd;
-}
-
diff --git a/lms/static/admin/img/admin/arrow-down.gif b/lms/static/admin/img/admin/arrow-down.gif
deleted file mode 100644
index a967b9fd55..0000000000
Binary files a/lms/static/admin/img/admin/arrow-down.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/arrow-up.gif b/lms/static/admin/img/admin/arrow-up.gif
deleted file mode 100644
index 3fe4851399..0000000000
Binary files a/lms/static/admin/img/admin/arrow-up.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/changelist-bg.gif b/lms/static/admin/img/admin/changelist-bg.gif
deleted file mode 100644
index 7f4699470a..0000000000
Binary files a/lms/static/admin/img/admin/changelist-bg.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/changelist-bg_rtl.gif b/lms/static/admin/img/admin/changelist-bg_rtl.gif
deleted file mode 100644
index 237971257f..0000000000
Binary files a/lms/static/admin/img/admin/changelist-bg_rtl.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/chooser-bg.gif b/lms/static/admin/img/admin/chooser-bg.gif
deleted file mode 100644
index 30e83c2518..0000000000
Binary files a/lms/static/admin/img/admin/chooser-bg.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/chooser_stacked-bg.gif b/lms/static/admin/img/admin/chooser_stacked-bg.gif
deleted file mode 100644
index 5d104b6d98..0000000000
Binary files a/lms/static/admin/img/admin/chooser_stacked-bg.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/default-bg-reverse.gif b/lms/static/admin/img/admin/default-bg-reverse.gif
deleted file mode 100644
index 0873281e51..0000000000
Binary files a/lms/static/admin/img/admin/default-bg-reverse.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/default-bg.gif b/lms/static/admin/img/admin/default-bg.gif
deleted file mode 100644
index 003aeca59f..0000000000
Binary files a/lms/static/admin/img/admin/default-bg.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/deleted-overlay.gif b/lms/static/admin/img/admin/deleted-overlay.gif
deleted file mode 100644
index dc3828fe06..0000000000
Binary files a/lms/static/admin/img/admin/deleted-overlay.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/icon-no.gif b/lms/static/admin/img/admin/icon-no.gif
deleted file mode 100644
index 1b4ee58145..0000000000
Binary files a/lms/static/admin/img/admin/icon-no.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/icon-unknown.gif b/lms/static/admin/img/admin/icon-unknown.gif
deleted file mode 100644
index cfd2b02ad9..0000000000
Binary files a/lms/static/admin/img/admin/icon-unknown.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/icon-yes.gif b/lms/static/admin/img/admin/icon-yes.gif
deleted file mode 100644
index 7399282740..0000000000
Binary files a/lms/static/admin/img/admin/icon-yes.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/icon_addlink.gif b/lms/static/admin/img/admin/icon_addlink.gif
deleted file mode 100644
index ee70e1adba..0000000000
Binary files a/lms/static/admin/img/admin/icon_addlink.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/icon_alert.gif b/lms/static/admin/img/admin/icon_alert.gif
deleted file mode 100644
index a1dde26254..0000000000
Binary files a/lms/static/admin/img/admin/icon_alert.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/icon_calendar.gif b/lms/static/admin/img/admin/icon_calendar.gif
deleted file mode 100644
index 7587b305a4..0000000000
Binary files a/lms/static/admin/img/admin/icon_calendar.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/icon_changelink.gif b/lms/static/admin/img/admin/icon_changelink.gif
deleted file mode 100644
index e1b9afde65..0000000000
Binary files a/lms/static/admin/img/admin/icon_changelink.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/icon_clock.gif b/lms/static/admin/img/admin/icon_clock.gif
deleted file mode 100644
index ff2d57e0a3..0000000000
Binary files a/lms/static/admin/img/admin/icon_clock.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/icon_deletelink.gif b/lms/static/admin/img/admin/icon_deletelink.gif
deleted file mode 100644
index 72523e3a3b..0000000000
Binary files a/lms/static/admin/img/admin/icon_deletelink.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/icon_error.gif b/lms/static/admin/img/admin/icon_error.gif
deleted file mode 100644
index 3730a00b26..0000000000
Binary files a/lms/static/admin/img/admin/icon_error.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/icon_searchbox.png b/lms/static/admin/img/admin/icon_searchbox.png
deleted file mode 100644
index 8ab579e526..0000000000
Binary files a/lms/static/admin/img/admin/icon_searchbox.png and /dev/null differ
diff --git a/lms/static/admin/img/admin/icon_success.gif b/lms/static/admin/img/admin/icon_success.gif
deleted file mode 100644
index 5cf90a15aa..0000000000
Binary files a/lms/static/admin/img/admin/icon_success.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/inline-delete-8bit.png b/lms/static/admin/img/admin/inline-delete-8bit.png
deleted file mode 100644
index 95caf59a8d..0000000000
Binary files a/lms/static/admin/img/admin/inline-delete-8bit.png and /dev/null differ
diff --git a/lms/static/admin/img/admin/inline-delete.png b/lms/static/admin/img/admin/inline-delete.png
deleted file mode 100644
index d59bcd2444..0000000000
Binary files a/lms/static/admin/img/admin/inline-delete.png and /dev/null differ
diff --git a/lms/static/admin/img/admin/inline-restore-8bit.png b/lms/static/admin/img/admin/inline-restore-8bit.png
deleted file mode 100644
index e087c8ead3..0000000000
Binary files a/lms/static/admin/img/admin/inline-restore-8bit.png and /dev/null differ
diff --git a/lms/static/admin/img/admin/inline-restore.png b/lms/static/admin/img/admin/inline-restore.png
deleted file mode 100644
index efdd92ac39..0000000000
Binary files a/lms/static/admin/img/admin/inline-restore.png and /dev/null differ
diff --git a/lms/static/admin/img/admin/inline-splitter-bg.gif b/lms/static/admin/img/admin/inline-splitter-bg.gif
deleted file mode 100644
index 32ac5b3498..0000000000
Binary files a/lms/static/admin/img/admin/inline-splitter-bg.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/nav-bg-grabber.gif b/lms/static/admin/img/admin/nav-bg-grabber.gif
deleted file mode 100644
index 0a784fa769..0000000000
Binary files a/lms/static/admin/img/admin/nav-bg-grabber.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/nav-bg-reverse.gif b/lms/static/admin/img/admin/nav-bg-reverse.gif
deleted file mode 100644
index f11029f90f..0000000000
Binary files a/lms/static/admin/img/admin/nav-bg-reverse.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/nav-bg.gif b/lms/static/admin/img/admin/nav-bg.gif
deleted file mode 100644
index f8402b809d..0000000000
Binary files a/lms/static/admin/img/admin/nav-bg.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/selector-add.gif b/lms/static/admin/img/admin/selector-add.gif
deleted file mode 100644
index 50132d1c43..0000000000
Binary files a/lms/static/admin/img/admin/selector-add.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/selector-addall.gif b/lms/static/admin/img/admin/selector-addall.gif
deleted file mode 100644
index d6e7c639bb..0000000000
Binary files a/lms/static/admin/img/admin/selector-addall.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/selector-remove.gif b/lms/static/admin/img/admin/selector-remove.gif
deleted file mode 100644
index 2b9b0a2ac3..0000000000
Binary files a/lms/static/admin/img/admin/selector-remove.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/selector-removeall.gif b/lms/static/admin/img/admin/selector-removeall.gif
deleted file mode 100644
index 5a4421926d..0000000000
Binary files a/lms/static/admin/img/admin/selector-removeall.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/selector-search.gif b/lms/static/admin/img/admin/selector-search.gif
deleted file mode 100644
index 6d5f4c7492..0000000000
Binary files a/lms/static/admin/img/admin/selector-search.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/selector_stacked-add.gif b/lms/static/admin/img/admin/selector_stacked-add.gif
deleted file mode 100644
index 7426169652..0000000000
Binary files a/lms/static/admin/img/admin/selector_stacked-add.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/selector_stacked-remove.gif b/lms/static/admin/img/admin/selector_stacked-remove.gif
deleted file mode 100644
index 60412cee19..0000000000
Binary files a/lms/static/admin/img/admin/selector_stacked-remove.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/tool-left.gif b/lms/static/admin/img/admin/tool-left.gif
deleted file mode 100644
index 011490ff3a..0000000000
Binary files a/lms/static/admin/img/admin/tool-left.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/tool-left_over.gif b/lms/static/admin/img/admin/tool-left_over.gif
deleted file mode 100644
index 937e07bb1a..0000000000
Binary files a/lms/static/admin/img/admin/tool-left_over.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/tool-right.gif b/lms/static/admin/img/admin/tool-right.gif
deleted file mode 100644
index cdc140cc59..0000000000
Binary files a/lms/static/admin/img/admin/tool-right.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/tool-right_over.gif b/lms/static/admin/img/admin/tool-right_over.gif
deleted file mode 100644
index 4db977e838..0000000000
Binary files a/lms/static/admin/img/admin/tool-right_over.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/tooltag-add.gif b/lms/static/admin/img/admin/tooltag-add.gif
deleted file mode 100644
index 8b53d49ae5..0000000000
Binary files a/lms/static/admin/img/admin/tooltag-add.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/tooltag-add_over.gif b/lms/static/admin/img/admin/tooltag-add_over.gif
deleted file mode 100644
index bfc52f10de..0000000000
Binary files a/lms/static/admin/img/admin/tooltag-add_over.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/tooltag-arrowright.gif b/lms/static/admin/img/admin/tooltag-arrowright.gif
deleted file mode 100644
index cdaaae77ed..0000000000
Binary files a/lms/static/admin/img/admin/tooltag-arrowright.gif and /dev/null differ
diff --git a/lms/static/admin/img/admin/tooltag-arrowright_over.gif b/lms/static/admin/img/admin/tooltag-arrowright_over.gif
deleted file mode 100644
index 7163189604..0000000000
Binary files a/lms/static/admin/img/admin/tooltag-arrowright_over.gif and /dev/null differ
diff --git a/lms/static/admin/img/changelist-bg.gif b/lms/static/admin/img/changelist-bg.gif
deleted file mode 100644
index 7f4699470a..0000000000
Binary files a/lms/static/admin/img/changelist-bg.gif and /dev/null differ
diff --git a/lms/static/admin/img/changelist-bg_rtl.gif b/lms/static/admin/img/changelist-bg_rtl.gif
deleted file mode 100644
index 237971257f..0000000000
Binary files a/lms/static/admin/img/changelist-bg_rtl.gif and /dev/null differ
diff --git a/lms/static/admin/img/chooser-bg.gif b/lms/static/admin/img/chooser-bg.gif
deleted file mode 100644
index 30e83c2518..0000000000
Binary files a/lms/static/admin/img/chooser-bg.gif and /dev/null differ
diff --git a/lms/static/admin/img/chooser_stacked-bg.gif b/lms/static/admin/img/chooser_stacked-bg.gif
deleted file mode 100644
index 5d104b6d98..0000000000
Binary files a/lms/static/admin/img/chooser_stacked-bg.gif and /dev/null differ
diff --git a/lms/static/admin/img/default-bg-reverse.gif b/lms/static/admin/img/default-bg-reverse.gif
deleted file mode 100644
index 0873281e51..0000000000
Binary files a/lms/static/admin/img/default-bg-reverse.gif and /dev/null differ
diff --git a/lms/static/admin/img/default-bg.gif b/lms/static/admin/img/default-bg.gif
deleted file mode 100644
index 003aeca59f..0000000000
Binary files a/lms/static/admin/img/default-bg.gif and /dev/null differ
diff --git a/lms/static/admin/img/deleted-overlay.gif b/lms/static/admin/img/deleted-overlay.gif
deleted file mode 100644
index dc3828fe06..0000000000
Binary files a/lms/static/admin/img/deleted-overlay.gif and /dev/null differ
diff --git a/lms/static/admin/img/gis/move_vertex_off.png b/lms/static/admin/img/gis/move_vertex_off.png
deleted file mode 100644
index 296b2e29c9..0000000000
Binary files a/lms/static/admin/img/gis/move_vertex_off.png and /dev/null differ
diff --git a/lms/static/admin/img/gis/move_vertex_on.png b/lms/static/admin/img/gis/move_vertex_on.png
deleted file mode 100644
index 21f4758d9c..0000000000
Binary files a/lms/static/admin/img/gis/move_vertex_on.png and /dev/null differ
diff --git a/lms/static/admin/img/icon-no.gif b/lms/static/admin/img/icon-no.gif
deleted file mode 100644
index 1b4ee58145..0000000000
Binary files a/lms/static/admin/img/icon-no.gif and /dev/null differ
diff --git a/lms/static/admin/img/icon-unknown.gif b/lms/static/admin/img/icon-unknown.gif
deleted file mode 100644
index cfd2b02ad9..0000000000
Binary files a/lms/static/admin/img/icon-unknown.gif and /dev/null differ
diff --git a/lms/static/admin/img/icon-yes.gif b/lms/static/admin/img/icon-yes.gif
deleted file mode 100644
index 7399282740..0000000000
Binary files a/lms/static/admin/img/icon-yes.gif and /dev/null differ
diff --git a/lms/static/admin/img/icon_addlink.gif b/lms/static/admin/img/icon_addlink.gif
deleted file mode 100644
index ee70e1adba..0000000000
Binary files a/lms/static/admin/img/icon_addlink.gif and /dev/null differ
diff --git a/lms/static/admin/img/icon_alert.gif b/lms/static/admin/img/icon_alert.gif
deleted file mode 100644
index a1dde26254..0000000000
Binary files a/lms/static/admin/img/icon_alert.gif and /dev/null differ
diff --git a/lms/static/admin/img/icon_calendar.gif b/lms/static/admin/img/icon_calendar.gif
deleted file mode 100644
index 7587b305a4..0000000000
Binary files a/lms/static/admin/img/icon_calendar.gif and /dev/null differ
diff --git a/lms/static/admin/img/icon_changelink.gif b/lms/static/admin/img/icon_changelink.gif
deleted file mode 100644
index e1b9afde65..0000000000
Binary files a/lms/static/admin/img/icon_changelink.gif and /dev/null differ
diff --git a/lms/static/admin/img/icon_clock.gif b/lms/static/admin/img/icon_clock.gif
deleted file mode 100644
index ff2d57e0a3..0000000000
Binary files a/lms/static/admin/img/icon_clock.gif and /dev/null differ
diff --git a/lms/static/admin/img/icon_deletelink.gif b/lms/static/admin/img/icon_deletelink.gif
deleted file mode 100644
index 72523e3a3b..0000000000
Binary files a/lms/static/admin/img/icon_deletelink.gif and /dev/null differ
diff --git a/lms/static/admin/img/icon_error.gif b/lms/static/admin/img/icon_error.gif
deleted file mode 100644
index 3730a00b26..0000000000
Binary files a/lms/static/admin/img/icon_error.gif and /dev/null differ
diff --git a/lms/static/admin/img/icon_searchbox.png b/lms/static/admin/img/icon_searchbox.png
deleted file mode 100644
index 8ab579e526..0000000000
Binary files a/lms/static/admin/img/icon_searchbox.png and /dev/null differ
diff --git a/lms/static/admin/img/icon_success.gif b/lms/static/admin/img/icon_success.gif
deleted file mode 100644
index 5cf90a15aa..0000000000
Binary files a/lms/static/admin/img/icon_success.gif and /dev/null differ
diff --git a/lms/static/admin/img/inline-delete-8bit.png b/lms/static/admin/img/inline-delete-8bit.png
deleted file mode 100644
index 95caf59a8d..0000000000
Binary files a/lms/static/admin/img/inline-delete-8bit.png and /dev/null differ
diff --git a/lms/static/admin/img/inline-delete.png b/lms/static/admin/img/inline-delete.png
deleted file mode 100644
index d59bcd2444..0000000000
Binary files a/lms/static/admin/img/inline-delete.png and /dev/null differ
diff --git a/lms/static/admin/img/inline-restore-8bit.png b/lms/static/admin/img/inline-restore-8bit.png
deleted file mode 100644
index e087c8ead3..0000000000
Binary files a/lms/static/admin/img/inline-restore-8bit.png and /dev/null differ
diff --git a/lms/static/admin/img/inline-restore.png b/lms/static/admin/img/inline-restore.png
deleted file mode 100644
index efdd92ac39..0000000000
Binary files a/lms/static/admin/img/inline-restore.png and /dev/null differ
diff --git a/lms/static/admin/img/inline-splitter-bg.gif b/lms/static/admin/img/inline-splitter-bg.gif
deleted file mode 100644
index 32ac5b3498..0000000000
Binary files a/lms/static/admin/img/inline-splitter-bg.gif and /dev/null differ
diff --git a/lms/static/admin/img/nav-bg-grabber.gif b/lms/static/admin/img/nav-bg-grabber.gif
deleted file mode 100644
index 0a784fa769..0000000000
Binary files a/lms/static/admin/img/nav-bg-grabber.gif and /dev/null differ
diff --git a/lms/static/admin/img/nav-bg-reverse.gif b/lms/static/admin/img/nav-bg-reverse.gif
deleted file mode 100644
index f11029f90f..0000000000
Binary files a/lms/static/admin/img/nav-bg-reverse.gif and /dev/null differ
diff --git a/lms/static/admin/img/nav-bg-selected.gif b/lms/static/admin/img/nav-bg-selected.gif
deleted file mode 100644
index 98c5672ab3..0000000000
Binary files a/lms/static/admin/img/nav-bg-selected.gif and /dev/null differ
diff --git a/lms/static/admin/img/nav-bg.gif b/lms/static/admin/img/nav-bg.gif
deleted file mode 100644
index f8402b809d..0000000000
Binary files a/lms/static/admin/img/nav-bg.gif and /dev/null differ
diff --git a/lms/static/admin/img/selector-icons.gif b/lms/static/admin/img/selector-icons.gif
deleted file mode 100644
index 8809c4fb9a..0000000000
Binary files a/lms/static/admin/img/selector-icons.gif and /dev/null differ
diff --git a/lms/static/admin/img/selector-search.gif b/lms/static/admin/img/selector-search.gif
deleted file mode 100644
index 6d5f4c7492..0000000000
Binary files a/lms/static/admin/img/selector-search.gif and /dev/null differ
diff --git a/lms/static/admin/img/sorting-icons.gif b/lms/static/admin/img/sorting-icons.gif
deleted file mode 100644
index 451aae5987..0000000000
Binary files a/lms/static/admin/img/sorting-icons.gif and /dev/null differ
diff --git a/lms/static/admin/img/tool-left.gif b/lms/static/admin/img/tool-left.gif
deleted file mode 100644
index 011490ff3a..0000000000
Binary files a/lms/static/admin/img/tool-left.gif and /dev/null differ
diff --git a/lms/static/admin/img/tool-left_over.gif b/lms/static/admin/img/tool-left_over.gif
deleted file mode 100644
index 937e07bb1a..0000000000
Binary files a/lms/static/admin/img/tool-left_over.gif and /dev/null differ
diff --git a/lms/static/admin/img/tool-right.gif b/lms/static/admin/img/tool-right.gif
deleted file mode 100644
index cdc140cc59..0000000000
Binary files a/lms/static/admin/img/tool-right.gif and /dev/null differ
diff --git a/lms/static/admin/img/tool-right_over.gif b/lms/static/admin/img/tool-right_over.gif
deleted file mode 100644
index 4db977e838..0000000000
Binary files a/lms/static/admin/img/tool-right_over.gif and /dev/null differ
diff --git a/lms/static/admin/img/tooltag-add.gif b/lms/static/admin/img/tooltag-add.gif
deleted file mode 100644
index 8b53d49ae5..0000000000
Binary files a/lms/static/admin/img/tooltag-add.gif and /dev/null differ
diff --git a/lms/static/admin/img/tooltag-add_over.gif b/lms/static/admin/img/tooltag-add_over.gif
deleted file mode 100644
index bfc52f10de..0000000000
Binary files a/lms/static/admin/img/tooltag-add_over.gif and /dev/null differ
diff --git a/lms/static/admin/img/tooltag-arrowright.gif b/lms/static/admin/img/tooltag-arrowright.gif
deleted file mode 100644
index cdaaae77ed..0000000000
Binary files a/lms/static/admin/img/tooltag-arrowright.gif and /dev/null differ
diff --git a/lms/static/admin/img/tooltag-arrowright_over.gif b/lms/static/admin/img/tooltag-arrowright_over.gif
deleted file mode 100644
index 7163189604..0000000000
Binary files a/lms/static/admin/img/tooltag-arrowright_over.gif and /dev/null differ
diff --git a/lms/static/admin/js/LICENSE-JQUERY.txt b/lms/static/admin/js/LICENSE-JQUERY.txt
deleted file mode 100644
index a4c5bd76ac..0000000000
--- a/lms/static/admin/js/LICENSE-JQUERY.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2010 John Resig, http://jquery.com/
- 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
- 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/lms/static/admin/js/SelectBox.js b/lms/static/admin/js/SelectBox.js
deleted file mode 100644
index f28c861513..0000000000
--- a/lms/static/admin/js/SelectBox.js
+++ /dev/null
@@ -1,111 +0,0 @@
-var SelectBox = {
-    cache: new Object(),
-    init: function(id) {
-        var box = document.getElementById(id);
-        var node;
-        SelectBox.cache[id] = new Array();
-        var cache = SelectBox.cache[id];
-        for (var i = 0; (node = box.options[i]); i++) {
-            cache.push({value: node.value, text: node.text, displayed: 1});
-        }
-    },
-    redisplay: function(id) {
-        // Repopulate HTML select box from cache
-        var box = document.getElementById(id);
-        box.options.length = 0; // clear all options
-        for (var i = 0, j = SelectBox.cache[id].length; i < j; i++) {
-            var node = SelectBox.cache[id][i];
-            if (node.displayed) {
-                box.options[box.options.length] = new Option(node.text, node.value, false, false);
-            }
-        }
-    },
-    filter: function(id, text) {
-        // Redisplay the HTML select box, displaying only the choices containing ALL
-        // the words in text. (It's an AND search.)
-        var tokens = text.toLowerCase().split(/\s+/);
-        var node, token;
-        for (var i = 0; (node = SelectBox.cache[id][i]); i++) {
-            node.displayed = 1;
-            for (var j = 0; (token = tokens[j]); j++) {
-                if (node.text.toLowerCase().indexOf(token) == -1) {
-                    node.displayed = 0;
-                }
-            }
-        }
-        SelectBox.redisplay(id);
-    },
-    delete_from_cache: function(id, value) {
-        var node, delete_index = null;
-        for (var i = 0; (node = SelectBox.cache[id][i]); i++) {
-            if (node.value == value) {
-                delete_index = i;
-                break;
-            }
-        }
-        var j = SelectBox.cache[id].length - 1;
-        for (var i = delete_index; i < j; i++) {
-            SelectBox.cache[id][i] = SelectBox.cache[id][i+1];
-        }
-        SelectBox.cache[id].length--;
-    },
-    add_to_cache: function(id, option) {
-        SelectBox.cache[id].push({value: option.value, text: option.text, displayed: 1});
-    },
-    cache_contains: function(id, value) {
-        // Check if an item is contained in the cache
-        var node;
-        for (var i = 0; (node = SelectBox.cache[id][i]); i++) {
-            if (node.value == value) {
-                return true;
-            }
-        }
-        return false;
-    },
-    move: function(from, to) {
-        var from_box = document.getElementById(from);
-        var to_box = document.getElementById(to);
-        var option;
-        for (var i = 0; (option = from_box.options[i]); i++) {
-            if (option.selected && SelectBox.cache_contains(from, option.value)) {
-                SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1});
-                SelectBox.delete_from_cache(from, option.value);
-            }
-        }
-        SelectBox.redisplay(from);
-        SelectBox.redisplay(to);
-    },
-    move_all: function(from, to) {
-        var from_box = document.getElementById(from);
-        var to_box = document.getElementById(to);
-        var option;
-        for (var i = 0; (option = from_box.options[i]); i++) {
-            if (SelectBox.cache_contains(from, option.value)) {
-                SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1});
-                SelectBox.delete_from_cache(from, option.value);
-            }
-        }
-        SelectBox.redisplay(from);
-        SelectBox.redisplay(to);
-    },
-    sort: function(id) {
-        SelectBox.cache[id].sort( function(a, b) {
-            a = a.text.toLowerCase();
-            b = b.text.toLowerCase();
-            try {
-                if (a > b) return 1;
-                if (a < b) return -1;
-            }
-            catch (e) {
-                // silently fail on IE 'unknown' exception
-            }
-            return 0;
-        } );
-    },
-    select_all: function(id) {
-        var box = document.getElementById(id);
-        for (var i = 0; i < box.options.length; i++) {
-            box.options[i].selected = 'selected';
-        }
-    }
-}
diff --git a/lms/static/admin/js/SelectFilter2.js b/lms/static/admin/js/SelectFilter2.js
deleted file mode 100644
index 0accd080b7..0000000000
--- a/lms/static/admin/js/SelectFilter2.js
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-SelectFilter2 - Turns a multiple-select box into a filter interface.
-
-Requires core.js, SelectBox.js and addevent.js.
-*/
-(function($) {
-function findForm(node) {
-    // returns the node of the form containing the given node
-    if (node.tagName.toLowerCase() != 'form') {
-        return findForm(node.parentNode);
-    }
-    return node;
-}
-
-window.SelectFilter = {
-    init: function(field_id, field_name, is_stacked, admin_media_prefix) {
-        if (field_id.match(/__prefix__/)){
-            // Don't intialize on empty forms.
-            return;
-        }
-        var from_box = document.getElementById(field_id);
-        from_box.id += '_from'; // change its ID
-        from_box.className = 'filtered';
-
-        var ps = from_box.parentNode.getElementsByTagName('p');
-        for (var i=0; i<ps.length; i++) {
-            if (ps[i].className.indexOf("info") != -1) {
-                // Remove <p class="info">, because it just gets in the way.
-                from_box.parentNode.removeChild(ps[i]);
-            } else if (ps[i].className.indexOf("help") != -1) {
-                // Move help text up to the top so it isn't below the select
-                // boxes or wrapped off on the side to the right of the add
-                // button:
-                from_box.parentNode.insertBefore(ps[i], from_box.parentNode.firstChild);
-            }
-        }
-
-        // <div class="selector"> or <div class="selector stacked">
-        var selector_div = quickElement('div', from_box.parentNode);
-        selector_div.className = is_stacked ? 'selector stacked' : 'selector';
-
-        // <div class="selector-available">
-        var selector_available = quickElement('div', selector_div, '');
-        selector_available.className = 'selector-available';
-        var title_available = quickElement('h2', selector_available, interpolate(gettext('Available %s') + ' ', [field_name]));
-        quickElement('img', title_available, '', 'src', admin_media_prefix + 'img/icon-unknown.gif', 'width', '10', 'height', '10', 'class', 'help help-tooltip', 'title', interpolate(gettext('This is the list of available %s. You may choose some by selecting them in the box below and then clicking the "Choose" arrow between the two boxes.'), [field_name]));
-
-        var filter_p = quickElement('p', selector_available, '', 'id', field_id + '_filter');
-        filter_p.className = 'selector-filter';
-
-        var search_filter_label = quickElement('label', filter_p, '', 'for', field_id + "_input");
-
-        var search_selector_img = quickElement('img', search_filter_label, '', 'src', admin_media_prefix + 'img/selector-search.gif', 'class', 'help-tooltip', 'alt', '', 'title', interpolate(gettext("Type into this box to filter down the list of available %s."), [field_name]));
-
-        filter_p.appendChild(document.createTextNode(' '));
-
-        var filter_input = quickElement('input', filter_p, '', 'type', 'text', 'placeholder', gettext("Filter"));
-        filter_input.id = field_id + '_input';
-
-        selector_available.appendChild(from_box);
-        var choose_all = quickElement('a', selector_available, gettext('Choose all'), 'title', interpolate(gettext('Click to choose all %s at once.'), [field_name]), 'href', 'javascript: (function(){ SelectBox.move_all("' + field_id + '_from", "' + field_id + '_to"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_add_all_link');
-        choose_all.className = 'selector-chooseall';
-
-        // <ul class="selector-chooser">
-        var selector_chooser = quickElement('ul', selector_div, '');
-        selector_chooser.className = 'selector-chooser';
-        var add_link = quickElement('a', quickElement('li', selector_chooser, ''), gettext('Choose'), 'title', gettext('Choose'), 'href', 'javascript: (function(){ SelectBox.move("' + field_id + '_from","' + field_id + '_to"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_add_link');
-        add_link.className = 'selector-add';
-        var remove_link = quickElement('a', quickElement('li', selector_chooser, ''), gettext('Remove'), 'title', gettext('Remove'), 'href', 'javascript: (function(){ SelectBox.move("' + field_id + '_to","' + field_id + '_from"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_remove_link');
-        remove_link.className = 'selector-remove';
-
-        // <div class="selector-chosen">
-        var selector_chosen = quickElement('div', selector_div, '');
-        selector_chosen.className = 'selector-chosen';
-        var title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s') + ' ', [field_name]));
-        quickElement('img', title_chosen, '', 'src', admin_media_prefix + 'img/icon-unknown.gif', 'width', '10', 'height', '10', 'class', 'help help-tooltip', 'title', interpolate(gettext('This is the list of chosen %s. You may remove some by selecting them in the box below and then clicking the "Remove" arrow between the two boxes.'), [field_name]));
-
-        var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name'));
-        to_box.className = 'filtered';
-        var clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', 'javascript: (function() { SelectBox.move_all("' + field_id + '_to", "' + field_id + '_from"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_remove_all_link');
-        clear_all.className = 'selector-clearall';
-
-        from_box.setAttribute('name', from_box.getAttribute('name') + '_old');
-
-        // Set up the JavaScript event handlers for the select box filter interface
-        addEvent(filter_input, 'keyup', function(e) { SelectFilter.filter_key_up(e, field_id); });
-        addEvent(filter_input, 'keydown', function(e) { SelectFilter.filter_key_down(e, field_id); });
-        addEvent(from_box, 'change', function(e) { SelectFilter.refresh_icons(field_id) });
-        addEvent(to_box, 'change', function(e) { SelectFilter.refresh_icons(field_id) });
-        addEvent(from_box, 'dblclick', function() { SelectBox.move(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); });
-        addEvent(to_box, 'dblclick', function() { SelectBox.move(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); });
-        addEvent(findForm(from_box), 'submit', function() { SelectBox.select_all(field_id + '_to'); });
-        SelectBox.init(field_id + '_from');
-        SelectBox.init(field_id + '_to');
-        // Move selected from_box options to to_box
-        SelectBox.move(field_id + '_from', field_id + '_to');
-
-        if (!is_stacked) {
-            // In horizontal mode, give the same height to the two boxes.
-            var j_from_box = $(from_box);
-            var j_to_box = $(to_box);
-            var resize_filters = function() { j_to_box.height($(filter_p).outerHeight() + j_from_box.outerHeight()); }
-            if (j_from_box.outerHeight() > 0) {
-                resize_filters(); // This fieldset is already open. Resize now.
-            } else {
-                // This fieldset is probably collapsed. Wait for its 'show' event.
-                j_to_box.closest('fieldset').one('show.fieldset', resize_filters);
-            }
-        }
-
-        // Initial icon refresh
-        SelectFilter.refresh_icons(field_id);
-    },
-    refresh_icons: function(field_id) {
-        var from = $('#' + field_id + '_from');
-        var to = $('#' + field_id + '_to');
-        var is_from_selected = from.find('option:selected').length > 0;
-        var is_to_selected = to.find('option:selected').length > 0;
-        // Active if at least one item is selected
-        $('#' + field_id + '_add_link').toggleClass('active', is_from_selected);
-        $('#' + field_id + '_remove_link').toggleClass('active', is_to_selected);
-        // Active if the corresponding box isn't empty
-        $('#' + field_id + '_add_all_link').toggleClass('active', from.find('option').length > 0);
-        $('#' + field_id + '_remove_all_link').toggleClass('active', to.find('option').length > 0);
-    },
-    filter_key_up: function(event, field_id) {
-        var from = document.getElementById(field_id + '_from');
-        // don't submit form if user pressed Enter
-        if ((event.which && event.which == 13) || (event.keyCode && event.keyCode == 13)) {
-            from.selectedIndex = 0;
-            SelectBox.move(field_id + '_from', field_id + '_to');
-            from.selectedIndex = 0;
-            return false;
-        }
-        var temp = from.selectedIndex;
-        SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value);
-        from.selectedIndex = temp;
-        return true;
-    },
-    filter_key_down: function(event, field_id) {
-        var from = document.getElementById(field_id + '_from');
-        // right arrow -- move across
-        if ((event.which && event.which == 39) || (event.keyCode && event.keyCode == 39)) {
-            var old_index = from.selectedIndex;
-            SelectBox.move(field_id + '_from', field_id + '_to');
-            from.selectedIndex = (old_index == from.length) ? from.length - 1 : old_index;
-            return false;
-        }
-        // down arrow -- wrap around
-        if ((event.which && event.which == 40) || (event.keyCode && event.keyCode == 40)) {
-            from.selectedIndex = (from.length == from.selectedIndex + 1) ? 0 : from.selectedIndex + 1;
-        }
-        // up arrow -- wrap around
-        if ((event.which && event.which == 38) || (event.keyCode && event.keyCode == 38)) {
-            from.selectedIndex = (from.selectedIndex == 0) ? from.length - 1 : from.selectedIndex - 1;
-        }
-        return true;
-    }
-}
-
-})(django.jQuery);
diff --git a/lms/static/admin/js/actions.js b/lms/static/admin/js/actions.js
deleted file mode 100644
index 94aa6db934..0000000000
--- a/lms/static/admin/js/actions.js
+++ /dev/null
@@ -1,139 +0,0 @@
-(function($) {
-	$.fn.actions = function(opts) {
-		var options = $.extend({}, $.fn.actions.defaults, opts);
-		var actionCheckboxes = $(this);
-		var list_editable_changed = false;
-		checker = function(checked) {
-			if (checked) {
-				showQuestion();
-			} else {
-				reset();
-			}
-			$(actionCheckboxes).attr("checked", checked)
-				.parent().parent().toggleClass(options.selectedClass, checked);
-		}
-		updateCounter = function() {
-			var sel = $(actionCheckboxes).filter(":checked").length;
-			$(options.counterContainer).html(interpolate(
-			ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), {
-				sel: sel,
-				cnt: _actions_icnt
-			}, true));
-			$(options.allToggle).attr("checked", function() {
-				if (sel == actionCheckboxes.length) {
-					value = true;
-					showQuestion();
-				} else {
-					value = false;
-					clearAcross();
-				}
-				return value;
-			});
-		}
-		showQuestion = function() {
-			$(options.acrossClears).hide();
-			$(options.acrossQuestions).show();
-			$(options.allContainer).hide();
-		}
-		showClear = function() {
-			$(options.acrossClears).show();
-			$(options.acrossQuestions).hide();
-			$(options.actionContainer).toggleClass(options.selectedClass);
-			$(options.allContainer).show();
-			$(options.counterContainer).hide();
-		}
-		reset = function() {
-			$(options.acrossClears).hide();
-			$(options.acrossQuestions).hide();
-			$(options.allContainer).hide();
-			$(options.counterContainer).show();
-		}
-		clearAcross = function() {
-			reset();
-			$(options.acrossInput).val(0);
-			$(options.actionContainer).removeClass(options.selectedClass);
-		}
-		// Show counter by default
-		$(options.counterContainer).show();
-		// Check state of checkboxes and reinit state if needed
-		$(this).filter(":checked").each(function(i) {
-			$(this).parent().parent().toggleClass(options.selectedClass);
-			updateCounter();
-			if ($(options.acrossInput).val() == 1) {
-				showClear();
-			}
-		});
-		$(options.allToggle).show().click(function() {
-			checker($(this).attr("checked"));
-			updateCounter();
-		});
-		$("div.actions span.question a").click(function(event) {
-			event.preventDefault();
-			$(options.acrossInput).val(1);
-			showClear();
-		});
-		$("div.actions span.clear a").click(function(event) {
-			event.preventDefault();
-			$(options.allToggle).attr("checked", false);
-			clearAcross();
-			checker(0);
-			updateCounter();
-		});
-		lastChecked = null;
-		$(actionCheckboxes).click(function(event) {
-			if (!event) { var event = window.event; }
-			var target = event.target ? event.target : event.srcElement;
-			if (lastChecked && $.data(lastChecked) != $.data(target) && event.shiftKey == true) {
-				var inrange = false;
-				$(lastChecked).attr("checked", target.checked)
-					.parent().parent().toggleClass(options.selectedClass, target.checked);
-				$(actionCheckboxes).each(function() {
-					if ($.data(this) == $.data(lastChecked) || $.data(this) == $.data(target)) {
-						inrange = (inrange) ? false : true;
-					}
-					if (inrange) {
-						$(this).attr("checked", target.checked)
-							.parent().parent().toggleClass(options.selectedClass, target.checked);
-					}
-				});
-			}
-			$(target).parent().parent().toggleClass(options.selectedClass, target.checked);
-			lastChecked = target;
-			updateCounter();
-		});
-		$('form#changelist-form table#result_list tr').find('td:gt(0) :input').change(function() {
-			list_editable_changed = true;
-		});
-		$('form#changelist-form button[name="index"]').click(function(event) {
-			if (list_editable_changed) {
-				return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."));
-			}
-		});
-		$('form#changelist-form input[name="_save"]').click(function(event) {
-			var action_changed = false;
-			$('div.actions select option:selected').each(function() {
-				if ($(this).val()) {
-					action_changed = true;
-				}
-			});
-			if (action_changed) {
-				if (list_editable_changed) {
-					return confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action."));
-				} else {
-					return confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."));
-				}
-			}
-		});
-	}
-	/* Setup plugin defaults */
-	$.fn.actions.defaults = {
-		actionContainer: "div.actions",
-		counterContainer: "span.action-counter",
-		allContainer: "div.actions span.all",
-		acrossInput: "div.actions input.select-across",
-		acrossQuestions: "div.actions span.question",
-		acrossClears: "div.actions span.clear",
-		allToggle: "#action-toggle",
-		selectedClass: "selected"
-	}
-})(django.jQuery);
diff --git a/lms/static/admin/js/actions.min.js b/lms/static/admin/js/actions.min.js
deleted file mode 100644
index c4a01e4f6e..0000000000
--- a/lms/static/admin/js/actions.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-(function(a){a.fn.actions=function(g){var b=a.extend({},a.fn.actions.defaults,g),f=a(this),e=!1;checker=function(c){c?showQuestion():reset();a(f).attr("checked",c).parent().parent().toggleClass(b.selectedClass,c)};updateCounter=function(){var c=a(f).filter(":checked").length;a(b.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",c),{sel:c,cnt:_actions_icnt},!0));a(b.allToggle).attr("checked",function(){c==f.length?(value=!0,showQuestion()):(value=
-!1,clearAcross());return value})};showQuestion=function(){a(b.acrossClears).hide();a(b.acrossQuestions).show();a(b.allContainer).hide()};showClear=function(){a(b.acrossClears).show();a(b.acrossQuestions).hide();a(b.actionContainer).toggleClass(b.selectedClass);a(b.allContainer).show();a(b.counterContainer).hide()};reset=function(){a(b.acrossClears).hide();a(b.acrossQuestions).hide();a(b.allContainer).hide();a(b.counterContainer).show()};clearAcross=function(){reset();a(b.acrossInput).val(0);a(b.actionContainer).removeClass(b.selectedClass)};
-a(b.counterContainer).show();a(this).filter(":checked").each(function(){a(this).parent().parent().toggleClass(b.selectedClass);updateCounter();1==a(b.acrossInput).val()&&showClear()});a(b.allToggle).show().click(function(){checker(a(this).attr("checked"));updateCounter()});a("div.actions span.question a").click(function(c){c.preventDefault();a(b.acrossInput).val(1);showClear()});a("div.actions span.clear a").click(function(c){c.preventDefault();a(b.allToggle).attr("checked",!1);clearAcross();checker(0);
-updateCounter()});lastChecked=null;a(f).click(function(c){if(!c)c=window.event;var d=c.target?c.target:c.srcElement;if(lastChecked&&a.data(lastChecked)!=a.data(d)&&!0==c.shiftKey){var e=!1;a(lastChecked).attr("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked);a(f).each(function(){if(a.data(this)==a.data(lastChecked)||a.data(this)==a.data(d))e=e?!1:!0;e&&a(this).attr("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,
-d.checked);lastChecked=d;updateCounter()});a("form#changelist-form table#result_list tr").find("td:gt(0) :input").change(function(){e=!0});a('form#changelist-form button[name="index"]').click(function(){if(e)return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."))});a('form#changelist-form input[name="_save"]').click(function(){var b=!1;a("div.actions select option:selected").each(function(){a(this).val()&&(b=!0)});
-if(b)return e?confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action.")):confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."))})};a.fn.actions.defaults={actionContainer:"div.actions",counterContainer:"span.action-counter",allContainer:"div.actions span.all",acrossInput:"div.actions input.select-across",
-acrossQuestions:"div.actions span.question",acrossClears:"div.actions span.clear",allToggle:"#action-toggle",selectedClass:"selected"}})(django.jQuery);
diff --git a/lms/static/admin/js/admin/DateTimeShortcuts.js b/lms/static/admin/js/admin/DateTimeShortcuts.js
deleted file mode 100644
index 3ecc06f098..0000000000
--- a/lms/static/admin/js/admin/DateTimeShortcuts.js
+++ /dev/null
@@ -1,288 +0,0 @@
-// Inserts shortcut buttons after all of the following:
-//     <input type="text" class="vDateField">
-//     <input type="text" class="vTimeField">
-
-var DateTimeShortcuts = {
-    calendars: [],
-    calendarInputs: [],
-    clockInputs: [],
-    calendarDivName1: 'calendarbox', // name of calendar <div> that gets toggled
-    calendarDivName2: 'calendarin',  // name of <div> that contains calendar
-    calendarLinkName: 'calendarlink',// name of the link that is used to toggle
-    clockDivName: 'clockbox',        // name of clock <div> that gets toggled
-    clockLinkName: 'clocklink',      // name of the link that is used to toggle
-    shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts
-    admin_media_prefix: '',
-    init: function() {
-        // Get admin_media_prefix by grabbing it off the window object. It's
-        // set in the admin/base.html template, so if it's not there, someone's
-        // overridden the template. In that case, we'll set a clearly-invalid
-        // value in the hopes that someone will examine HTTP requests and see it.
-        if (window.__admin_media_prefix__ != undefined) {
-            DateTimeShortcuts.admin_media_prefix = window.__admin_media_prefix__;
-        } else {
-            DateTimeShortcuts.admin_media_prefix = '/missing-admin-media-prefix/';
-        }
-
-        var inputs = document.getElementsByTagName('input');
-        for (i=0; i<inputs.length; i++) {
-            var inp = inputs[i];
-            if (inp.getAttribute('type') == 'text' && inp.className.match(/vTimeField/)) {
-                DateTimeShortcuts.addClock(inp);
-            }
-            else if (inp.getAttribute('type') == 'text' && inp.className.match(/vDateField/)) {
-                DateTimeShortcuts.addCalendar(inp);
-            }
-        }
-    },
-    // Add clock widget to a given field
-    addClock: function(inp) {
-        var num = DateTimeShortcuts.clockInputs.length;
-        DateTimeShortcuts.clockInputs[num] = inp;
-
-        // Shortcut links (clock icon and "Now" link)
-        var shortcuts_span = document.createElement('span');
-        shortcuts_span.className = DateTimeShortcuts.shortCutsClass;
-        inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling);
-        var now_link = document.createElement('a');
-        now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().strftime('" + get_format('TIME_INPUT_FORMATS')[0] + "'));");
-        now_link.appendChild(document.createTextNode(gettext('Now')));
-        var clock_link = document.createElement('a');
-        clock_link.setAttribute('href', 'javascript:DateTimeShortcuts.openClock(' + num + ');');
-        clock_link.id = DateTimeShortcuts.clockLinkName + num;
-        quickElement('img', clock_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/icon_clock.gif', 'alt', gettext('Clock'));
-        shortcuts_span.appendChild(document.createTextNode('\240'));
-        shortcuts_span.appendChild(now_link);
-        shortcuts_span.appendChild(document.createTextNode('\240|\240'));
-        shortcuts_span.appendChild(clock_link);
-
-        // Create clock link div
-        //
-        // Markup looks like:
-        // <div id="clockbox1" class="clockbox module">
-        //     <h2>Choose a time</h2>
-        //     <ul class="timelist">
-        //         <li><a href="#">Now</a></li>
-        //         <li><a href="#">Midnight</a></li>
-        //         <li><a href="#">6 a.m.</a></li>
-        //         <li><a href="#">Noon</a></li>
-        //     </ul>
-        //     <p class="calendar-cancel"><a href="#">Cancel</a></p>
-        // </div>
-
-        var clock_box = document.createElement('div');
-        clock_box.style.display = 'none';
-        clock_box.style.position = 'absolute';
-        clock_box.className = 'clockbox module';
-        clock_box.setAttribute('id', DateTimeShortcuts.clockDivName + num);
-        document.body.appendChild(clock_box);
-        addEvent(clock_box, 'click', DateTimeShortcuts.cancelEventPropagation);
-
-        quickElement('h2', clock_box, gettext('Choose a time'));
-        var time_list = quickElement('ul', clock_box, '');
-        time_list.className = 'timelist';
-        var time_format = get_format('TIME_INPUT_FORMATS')[0];
-        quickElement("a", quickElement("li", time_list, ""), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().strftime('" + time_format + "'));");
-        quickElement("a", quickElement("li", time_list, ""), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date(1970,1,1,0,0,0,0).strftime('" + time_format + "'));");
-        quickElement("a", quickElement("li", time_list, ""), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date(1970,1,1,6,0,0,0).strftime('" + time_format + "'));");
-        quickElement("a", quickElement("li", time_list, ""), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date(1970,1,1,12,0,0,0).strftime('" + time_format + "'));");
-
-        var cancel_p = quickElement('p', clock_box, '');
-        cancel_p.className = 'calendar-cancel';
-        quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissClock(' + num + ');');
-        django.jQuery(document).bind('keyup', function(event) {
-            if (event.which == 27) {
-                // ESC key closes popup
-                DateTimeShortcuts.dismissClock(num);
-                event.preventDefault();
-            }
-        });
-    },
-    openClock: function(num) {
-        var clock_box = document.getElementById(DateTimeShortcuts.clockDivName+num)
-        var clock_link = document.getElementById(DateTimeShortcuts.clockLinkName+num)
-
-        // Recalculate the clockbox position
-        // is it left-to-right or right-to-left layout ?
-        if (getStyle(document.body,'direction')!='rtl') {
-            clock_box.style.left = findPosX(clock_link) + 17 + 'px';
-        }
-        else {
-            // since style's width is in em, it'd be tough to calculate
-            // px value of it. let's use an estimated px for now
-            // TODO: IE returns wrong value for findPosX when in rtl mode
-            //       (it returns as it was left aligned), needs to be fixed.
-            clock_box.style.left = findPosX(clock_link) - 110 + 'px';
-        }
-        clock_box.style.top = Math.max(0, findPosY(clock_link) - 30) + 'px';
-
-        // Show the clock box
-        clock_box.style.display = 'block';
-        addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissClock(num); return true; });
-    },
-    dismissClock: function(num) {
-       document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'none';
-       window.document.onclick = null;
-    },
-    handleClockQuicklink: function(num, val) {
-       DateTimeShortcuts.clockInputs[num].value = val;
-       DateTimeShortcuts.clockInputs[num].focus();
-       DateTimeShortcuts.dismissClock(num);
-    },
-    // Add calendar widget to a given field.
-    addCalendar: function(inp) {
-        var num = DateTimeShortcuts.calendars.length;
-
-        DateTimeShortcuts.calendarInputs[num] = inp;
-
-        // Shortcut links (calendar icon and "Today" link)
-        var shortcuts_span = document.createElement('span');
-        shortcuts_span.className = DateTimeShortcuts.shortCutsClass;
-        inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling);
-        var today_link = document.createElement('a');
-        today_link.setAttribute('href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);');
-        today_link.appendChild(document.createTextNode(gettext('Today')));
-        var cal_link = document.createElement('a');
-        cal_link.setAttribute('href', 'javascript:DateTimeShortcuts.openCalendar(' + num + ');');
-        cal_link.id = DateTimeShortcuts.calendarLinkName + num;
-        quickElement('img', cal_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/icon_calendar.gif', 'alt', gettext('Calendar'));
-        shortcuts_span.appendChild(document.createTextNode('\240'));
-        shortcuts_span.appendChild(today_link);
-        shortcuts_span.appendChild(document.createTextNode('\240|\240'));
-        shortcuts_span.appendChild(cal_link);
-
-        // Create calendarbox div.
-        //
-        // Markup looks like:
-        //
-        // <div id="calendarbox3" class="calendarbox module">
-        //     <h2>
-        //           <a href="#" class="link-previous">&lsaquo;</a>
-        //           <a href="#" class="link-next">&rsaquo;</a> February 2003
-        //     </h2>
-        //     <div class="calendar" id="calendarin3">
-        //         <!-- (cal) -->
-        //     </div>
-        //     <div class="calendar-shortcuts">
-        //          <a href="#">Yesterday</a> | <a href="#">Today</a> | <a href="#">Tomorrow</a>
-        //     </div>
-        //     <p class="calendar-cancel"><a href="#">Cancel</a></p>
-        // </div>
-        var cal_box = document.createElement('div');
-        cal_box.style.display = 'none';
-        cal_box.style.position = 'absolute';
-        cal_box.className = 'calendarbox module';
-        cal_box.setAttribute('id', DateTimeShortcuts.calendarDivName1 + num);
-        document.body.appendChild(cal_box);
-        addEvent(cal_box, 'click', DateTimeShortcuts.cancelEventPropagation);
-
-        // next-prev links
-        var cal_nav = quickElement('div', cal_box, '');
-        var cal_nav_prev = quickElement('a', cal_nav, '<', 'href', 'javascript:DateTimeShortcuts.drawPrev('+num+');');
-        cal_nav_prev.className = 'calendarnav-previous';
-        var cal_nav_next = quickElement('a', cal_nav, '>', 'href', 'javascript:DateTimeShortcuts.drawNext('+num+');');
-        cal_nav_next.className = 'calendarnav-next';
-
-        // main box
-        var cal_main = quickElement('div', cal_box, '', 'id', DateTimeShortcuts.calendarDivName2 + num);
-        cal_main.className = 'calendar';
-        DateTimeShortcuts.calendars[num] = new Calendar(DateTimeShortcuts.calendarDivName2 + num, DateTimeShortcuts.handleCalendarCallback(num));
-        DateTimeShortcuts.calendars[num].drawCurrent();
-
-        // calendar shortcuts
-        var shortcuts = quickElement('div', cal_box, '');
-        shortcuts.className = 'calendar-shortcuts';
-        quickElement('a', shortcuts, gettext('Yesterday'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', -1);');
-        shortcuts.appendChild(document.createTextNode('\240|\240'));
-        quickElement('a', shortcuts, gettext('Today'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);');
-        shortcuts.appendChild(document.createTextNode('\240|\240'));
-        quickElement('a', shortcuts, gettext('Tomorrow'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', +1);');
-
-        // cancel bar
-        var cancel_p = quickElement('p', cal_box, '');
-        cancel_p.className = 'calendar-cancel';
-        quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissCalendar(' + num + ');');
-        django.jQuery(document).bind('keyup', function(event) {
-            if (event.which == 27) {
-                // ESC key closes popup
-                DateTimeShortcuts.dismissCalendar(num);
-                event.preventDefault();
-            }
-        });
-    },
-    openCalendar: function(num) {
-        var cal_box = document.getElementById(DateTimeShortcuts.calendarDivName1+num)
-        var cal_link = document.getElementById(DateTimeShortcuts.calendarLinkName+num)
-        var inp = DateTimeShortcuts.calendarInputs[num];
-
-        // Determine if the current value in the input has a valid date.
-        // If so, draw the calendar with that date's year and month.
-        if (inp.value) {
-            var date_parts = inp.value.split('-');
-            var year = date_parts[0];
-            var month = parseFloat(date_parts[1]);
-            if (year.match(/\d\d\d\d/) && month >= 1 && month <= 12) {
-                DateTimeShortcuts.calendars[num].drawDate(month, year);
-            }
-        }
-
-        // Recalculate the clockbox position
-        // is it left-to-right or right-to-left layout ?
-        if (getStyle(document.body,'direction')!='rtl') {
-            cal_box.style.left = findPosX(cal_link) + 17 + 'px';
-        }
-        else {
-            // since style's width is in em, it'd be tough to calculate
-            // px value of it. let's use an estimated px for now
-            // TODO: IE returns wrong value for findPosX when in rtl mode
-            //       (it returns as it was left aligned), needs to be fixed.
-            cal_box.style.left = findPosX(cal_link) - 180 + 'px';
-        }
-        cal_box.style.top = Math.max(0, findPosY(cal_link) - 75) + 'px';
-
-        cal_box.style.display = 'block';
-        addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissCalendar(num); return true; });
-    },
-    dismissCalendar: function(num) {
-        document.getElementById(DateTimeShortcuts.calendarDivName1+num).style.display = 'none';
-        window.document.onclick = null;
-    },
-    drawPrev: function(num) {
-        DateTimeShortcuts.calendars[num].drawPreviousMonth();
-    },
-    drawNext: function(num) {
-        DateTimeShortcuts.calendars[num].drawNextMonth();
-    },
-    handleCalendarCallback: function(num) {
-        format = get_format('DATE_INPUT_FORMATS')[0];
-        // the format needs to be escaped a little
-        format = format.replace('\\', '\\\\');
-        format = format.replace('\r', '\\r');
-        format = format.replace('\n', '\\n');
-        format = format.replace('\t', '\\t');
-        format = format.replace("'", "\\'");
-        return ["function(y, m, d) { DateTimeShortcuts.calendarInputs[",
-               num,
-               "].value = new Date(y, m-1, d).strftime('",
-               format,
-               "');DateTimeShortcuts.calendarInputs[",
-               num,
-               "].focus();document.getElementById(DateTimeShortcuts.calendarDivName1+",
-               num,
-               ").style.display='none';}"].join('');
-    },
-    handleCalendarQuickLink: function(num, offset) {
-       var d = new Date();
-       d.setDate(d.getDate() + offset)
-       DateTimeShortcuts.calendarInputs[num].value = d.strftime(get_format('DATE_INPUT_FORMATS')[0]);
-       DateTimeShortcuts.calendarInputs[num].focus();
-       DateTimeShortcuts.dismissCalendar(num);
-    },
-    cancelEventPropagation: function(e) {
-        if (!e) e = window.event;
-        e.cancelBubble = true;
-        if (e.stopPropagation) e.stopPropagation();
-    }
-}
-
-addEvent(window, 'load', DateTimeShortcuts.init);
diff --git a/lms/static/admin/js/admin/RelatedObjectLookups.js b/lms/static/admin/js/admin/RelatedObjectLookups.js
deleted file mode 100644
index ce54fa5083..0000000000
--- a/lms/static/admin/js/admin/RelatedObjectLookups.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// Handles related-objects functionality: lookup link for raw_id_fields
-// and Add Another links.
-
-function html_unescape(text) {
-    // Unescape a string that was escaped using django.utils.html.escape.
-    text = text.replace(/&lt;/g, '<');
-    text = text.replace(/&gt;/g, '>');
-    text = text.replace(/&quot;/g, '"');
-    text = text.replace(/&#39;/g, "'");
-    text = text.replace(/&amp;/g, '&');
-    return text;
-}
-
-// IE doesn't accept periods or dashes in the window name, but the element IDs
-// we use to generate popup window names may contain them, therefore we map them
-// to allowed characters in a reversible way so that we can locate the correct 
-// element when the popup window is dismissed.
-function id_to_windowname(text) {
-    text = text.replace(/\./g, '__dot__');
-    text = text.replace(/\-/g, '__dash__');
-    return text;
-}
-
-function windowname_to_id(text) {
-    text = text.replace(/__dot__/g, '.');
-    text = text.replace(/__dash__/g, '-');
-    return text;
-}
-
-function showRelatedObjectLookupPopup(triggeringLink) {
-    var name = triggeringLink.id.replace(/^lookup_/, '');
-    name = id_to_windowname(name);
-    var href;
-    if (triggeringLink.href.search(/\?/) >= 0) {
-        href = triggeringLink.href + '&pop=1';
-    } else {
-        href = triggeringLink.href + '?pop=1';
-    }
-    var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
-    win.focus();
-    return false;
-}
-
-function dismissRelatedLookupPopup(win, chosenId) {
-    var name = windowname_to_id(win.name);
-    var elem = document.getElementById(name);
-    if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
-        elem.value += ',' + chosenId;
-    } else {
-        document.getElementById(name).value = chosenId;
-    }
-    win.close();
-}
-
-function showAddAnotherPopup(triggeringLink) {
-    var name = triggeringLink.id.replace(/^add_/, '');
-    name = id_to_windowname(name);
-    href = triggeringLink.href
-    if (href.indexOf('?') == -1) {
-        href += '?_popup=1';
-    } else {
-        href  += '&_popup=1';
-    }
-    var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
-    win.focus();
-    return false;
-}
-
-function dismissAddAnotherPopup(win, newId, newRepr) {
-    // newId and newRepr are expected to have previously been escaped by
-    // django.utils.html.escape.
-    newId = html_unescape(newId);
-    newRepr = html_unescape(newRepr);
-    var name = windowname_to_id(win.name);
-    var elem = document.getElementById(name);
-    if (elem) {
-        var elemName = elem.nodeName.toUpperCase();
-        if (elemName == 'SELECT') {
-            var o = new Option(newRepr, newId);
-            elem.options[elem.options.length] = o;
-            o.selected = true;
-        } else if (elemName == 'INPUT') {
-            if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
-                elem.value += ',' + newId;
-            } else {
-                elem.value = newId;
-            }
-        }
-    } else {
-        var toId = name + "_to";
-        elem = document.getElementById(toId);
-        var o = new Option(newRepr, newId);
-        SelectBox.add_to_cache(toId, o);
-        SelectBox.redisplay(toId);
-    }
-    win.close();
-}
diff --git a/lms/static/admin/js/admin/ordering.js b/lms/static/admin/js/admin/ordering.js
deleted file mode 100644
index 595be4d62b..0000000000
--- a/lms/static/admin/js/admin/ordering.js
+++ /dev/null
@@ -1,137 +0,0 @@
-addEvent(window, 'load', reorder_init);
-
-var lis;
-var top = 0;
-var left = 0;
-var height = 30;
-
-function reorder_init() {
-    lis = document.getElementsBySelector('ul#orderthese li');
-    var input = document.getElementsBySelector('input[name=order_]')[0];
-    setOrder(input.value.split(','));
-    input.disabled = true;
-    draw();
-    // Now initialize the dragging behavior
-    var limit = (lis.length - 1) * height;
-    for (var i = 0; i < lis.length; i++) {
-        var li = lis[i];
-        var img = document.getElementById('handle'+li.id);
-        li.style.zIndex = 1;
-        Drag.init(img, li, left + 10, left + 10, top + 10, top + 10 + limit);
-        li.onDragStart = startDrag;
-        li.onDragEnd = endDrag;
-        img.style.cursor = 'move';
-    }
-}
-
-function submitOrderForm() {
-    var inputOrder = document.getElementsBySelector('input[name=order_]')[0];
-    inputOrder.value = getOrder();
-    inputOrder.disabled=false;
-}
-
-function startDrag() {
-    this.style.zIndex = '10';
-    this.className = 'dragging';
-}
-
-function endDrag(x, y) {
-    this.style.zIndex = '1';
-    this.className = '';
-    // Work out how far along it has been dropped, using x co-ordinate
-    var oldIndex = this.index;
-    var newIndex = Math.round((y - 10 - top) / height);
-    // 'Snap' to the correct position
-    this.style.top = (10 + top + newIndex * height) + 'px';
-    this.index = newIndex;
-    moveItem(oldIndex, newIndex);
-}
-
-function moveItem(oldIndex, newIndex) {
-    // Swaps two items, adjusts the index and left co-ord for all others
-    if (oldIndex == newIndex) {
-        return; // Nothing to swap;
-    }
-    var direction, lo, hi;
-    if (newIndex > oldIndex) {
-        lo = oldIndex;
-        hi = newIndex;
-        direction = -1;
-    } else {
-        direction = 1;
-        hi = oldIndex;
-        lo = newIndex;
-    }
-    var lis2 = new Array(); // We will build the new order in this array
-    for (var i = 0; i < lis.length; i++) {
-        if (i < lo || i > hi) {
-            // Position of items not between the indexes is unaffected
-            lis2[i] = lis[i];
-            continue;
-        } else if (i == newIndex) {
-            lis2[i] = lis[oldIndex];
-            continue;
-        } else {
-            // Item is between the two indexes - move it along 1
-            lis2[i] = lis[i - direction];
-        }
-    }
-    // Re-index everything
-    reIndex(lis2);
-    lis = lis2;
-    draw();
-//    document.getElementById('hiddenOrder').value = getOrder();
-    document.getElementsBySelector('input[name=order_]')[0].value = getOrder();
-}
-
-function reIndex(lis) {
-    for (var i = 0; i < lis.length; i++) {
-        lis[i].index = i;
-    }
-}
-
-function draw() {
-    for (var i = 0; i < lis.length; i++) {
-        var li = lis[i];
-        li.index = i;
-        li.style.position = 'absolute';
-        li.style.left = (10 + left) + 'px';
-        li.style.top = (10 + top + (i * height)) + 'px';
-    }
-}
-
-function getOrder() {
-    var order = new Array(lis.length);
-    for (var i = 0; i < lis.length; i++) {
-        order[i] = lis[i].id.substring(1, 100);
-    }
-    return order.join(',');
-}
-
-function setOrder(id_list) {
-    /* Set the current order to match the lsit of IDs */
-    var temp_lis = new Array();
-    for (var i = 0; i < id_list.length; i++) {
-        var id = 'p' + id_list[i];
-        temp_lis[temp_lis.length] = document.getElementById(id);
-    }
-    reIndex(temp_lis);
-    lis = temp_lis;
-    draw();
-}
-
-function addEvent(elm, evType, fn, useCapture)
-// addEvent and removeEvent
-// cross-browser event handling for IE5+,  NS6 and Mozilla
-// By Scott Andrew
-{
-  if (elm.addEventListener){
-    elm.addEventListener(evType, fn, useCapture);
-    return true;
-  } else if (elm.attachEvent){
-    var r = elm.attachEvent("on"+evType, fn);
-    return r;
-  } else {
-    elm['on'+evType] = fn;
-  }
-}
diff --git a/lms/static/admin/js/calendar.js b/lms/static/admin/js/calendar.js
deleted file mode 100644
index 750e8ee463..0000000000
--- a/lms/static/admin/js/calendar.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-calendar.js - Calendar functions by Adrian Holovaty
-*/
-
-function removeChildren(a) { // "a" is reference to an object
-    while (a.hasChildNodes()) a.removeChild(a.lastChild);
-}
-
-// quickElement(tagType, parentReference, textInChildNode, [, attribute, attributeValue ...]);
-function quickElement() {
-    var obj = document.createElement(arguments[0]);
-    if (arguments[2] != '' && arguments[2] != null) {
-        var textNode = document.createTextNode(arguments[2]);
-        obj.appendChild(textNode);
-    }
-    var len = arguments.length;
-    for (var i = 3; i < len; i += 2) {
-        obj.setAttribute(arguments[i], arguments[i+1]);
-    }
-    arguments[1].appendChild(obj);
-    return obj;
-}
-
-// CalendarNamespace -- Provides a collection of HTML calendar-related helper functions
-var CalendarNamespace = {
-    // Translators: the names of months, keep the pipe (|) separators.
-    monthsOfYear: gettext('January|February|March|April|May|June|July|August|September|October|November|December').split('|'),
-    // Translators: abbreviations for days of the week, keep the pipe (|) separators.
-    daysOfWeek: gettext('S|M|T|W|T|F|S').split('|'),
-    firstDayOfWeek: parseInt(get_format('FIRST_DAY_OF_WEEK')),
-    isLeapYear: function(year) {
-        return (((year % 4)==0) && ((year % 100)!=0) || ((year % 400)==0));
-    },
-    getDaysInMonth: function(month,year) {
-        var days;
-        if (month==1 || month==3 || month==5 || month==7 || month==8 || month==10 || month==12) {
-            days = 31;
-        }
-        else if (month==4 || month==6 || month==9 || month==11) {
-            days = 30;
-        }
-        else if (month==2 && CalendarNamespace.isLeapYear(year)) {
-            days = 29;
-        }
-        else {
-            days = 28;
-        }
-        return days;
-    },
-    draw: function(month, year, div_id, callback) { // month = 1-12, year = 1-9999
-        var today = new Date();
-        var todayDay = today.getDate();
-        var todayMonth = today.getMonth()+1;
-        var todayYear = today.getFullYear();
-        var todayClass = '';
-
-        month = parseInt(month);
-        year = parseInt(year);
-        var calDiv = document.getElementById(div_id);
-        removeChildren(calDiv);
-        var calTable = document.createElement('table');
-        quickElement('caption', calTable, CalendarNamespace.monthsOfYear[month-1] + ' ' + year);
-        var tableBody = quickElement('tbody', calTable);
-
-        // Draw days-of-week header
-        var tableRow = quickElement('tr', tableBody);
-        for (var i = 0; i < 7; i++) {
-            quickElement('th', tableRow, CalendarNamespace.daysOfWeek[(i + CalendarNamespace.firstDayOfWeek) % 7]);
-        }
-
-        var startingPos = new Date(year, month-1, 1 - CalendarNamespace.firstDayOfWeek).getDay();
-        var days = CalendarNamespace.getDaysInMonth(month, year);
-
-        // Draw blanks before first of month
-        tableRow = quickElement('tr', tableBody);
-        for (var i = 0; i < startingPos; i++) {
-            var _cell = quickElement('td', tableRow, ' ');
-            _cell.style.backgroundColor = '#f3f3f3';
-        }
-
-        // Draw days of month
-        var currentDay = 1;
-        for (var i = startingPos; currentDay <= days; i++) {
-            if (i%7 == 0 && currentDay != 1) {
-                tableRow = quickElement('tr', tableBody);
-            }
-            if ((currentDay==todayDay) && (month==todayMonth) && (year==todayYear)) {
-                todayClass='today';
-            } else {
-                todayClass='';
-            }
-            var cell = quickElement('td', tableRow, '', 'class', todayClass);
-
-            quickElement('a', cell, currentDay, 'href', 'javascript:void(' + callback + '('+year+','+month+','+currentDay+'));');
-            currentDay++;
-        }
-
-        // Draw blanks after end of month (optional, but makes for valid code)
-        while (tableRow.childNodes.length < 7) {
-            var _cell = quickElement('td', tableRow, ' ');
-            _cell.style.backgroundColor = '#f3f3f3';
-        }
-
-        calDiv.appendChild(calTable);
-    }
-}
-
-// Calendar -- A calendar instance
-function Calendar(div_id, callback) {
-    // div_id (string) is the ID of the element in which the calendar will
-    //     be displayed
-    // callback (string) is the name of a JavaScript function that will be
-    //     called with the parameters (year, month, day) when a day in the
-    //     calendar is clicked
-    this.div_id = div_id;
-    this.callback = callback;
-    this.today = new Date();
-    this.currentMonth = this.today.getMonth() + 1;
-    this.currentYear = this.today.getFullYear();
-}
-Calendar.prototype = {
-    drawCurrent: function() {
-        CalendarNamespace.draw(this.currentMonth, this.currentYear, this.div_id, this.callback);
-    },
-    drawDate: function(month, year) {
-        this.currentMonth = month;
-        this.currentYear = year;
-        this.drawCurrent();
-    },
-    drawPreviousMonth: function() {
-        if (this.currentMonth == 1) {
-            this.currentMonth = 12;
-            this.currentYear--;
-        }
-        else {
-            this.currentMonth--;
-        }
-        this.drawCurrent();
-    },
-    drawNextMonth: function() {
-        if (this.currentMonth == 12) {
-            this.currentMonth = 1;
-            this.currentYear++;
-        }
-        else {
-            this.currentMonth++;
-        }
-        this.drawCurrent();
-    },
-    drawPreviousYear: function() {
-        this.currentYear--;
-        this.drawCurrent();
-    },
-    drawNextYear: function() {
-        this.currentYear++;
-        this.drawCurrent();
-    }
-}
diff --git a/lms/static/admin/js/collapse.js b/lms/static/admin/js/collapse.js
deleted file mode 100644
index 889e1a5dfc..0000000000
--- a/lms/static/admin/js/collapse.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function($) {
-	$(document).ready(function() {
-		// Add anchor tag for Show/Hide link
-		$("fieldset.collapse").each(function(i, elem) {
-			// Don't hide if fields in this fieldset have errors
-			if ($(elem).find("div.errors").length == 0) {
-				$(elem).addClass("collapsed").find("h2").first().append(' (<a id="fieldsetcollapser' +
-					i +'" class="collapse-toggle" href="#">' + gettext("Show") +
-					'</a>)');
-			}
-		});
-		// Add toggle to anchor tag
-		$("fieldset.collapse a.collapse-toggle").toggle(
-			function() { // Show
-				$(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset", [$(this).attr("id")]);
-				return false;
-			},
-			function() { // Hide
-				$(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset", [$(this).attr("id")]);
-				return false;
-			}
-		);
-	});
-})(django.jQuery);
diff --git a/lms/static/admin/js/collapse.min.js b/lms/static/admin/js/collapse.min.js
deleted file mode 100644
index 5e41b3c86c..0000000000
--- a/lms/static/admin/js/collapse.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(c,b){0==a(b).find("div.errors").length&&a(b).addClass("collapsed").find("h2").first().append(' (<a id="fieldsetcollapser'+c+'" class="collapse-toggle" href="#">'+gettext("Show")+"</a>)")});a("fieldset.collapse a.collapse-toggle").toggle(function(){a(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset",[a(this).attr("id")]);return!1},function(){a(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset",
-[a(this).attr("id")]);return!1})})})(django.jQuery);
diff --git a/lms/static/admin/js/compress.py b/lms/static/admin/js/compress.py
deleted file mode 100644
index a23b431750..0000000000
--- a/lms/static/admin/js/compress.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-import os
-import optparse
-import subprocess
-import sys
-
-here = os.path.dirname(__file__)
-
-
-def main():
-    usage = "usage: %prog [file1..fileN]"
-    description = """With no file paths given this script will automatically
-compress all jQuery-based files of the admin app. Requires the Google Closure
-Compiler library and Java version 6 or later."""
-    parser = optparse.OptionParser(usage, description=description)
-    parser.add_option("-c", dest="compiler", default="~/bin/compiler.jar",
-                      help="path to Closure Compiler jar file")
-    parser.add_option("-v", "--verbose",
-                      action="store_true", dest="verbose")
-    parser.add_option("-q", "--quiet",
-                      action="store_false", dest="verbose")
-    (options, args) = parser.parse_args()
-
-    compiler = os.path.expanduser(options.compiler)
-    if not os.path.exists(compiler):
-        sys.exit("Google Closure compiler jar file %s not found. Please use the -c option to specify the path." % compiler)
-
-    if not args:
-        if options.verbose:
-            sys.stdout.write("No filenames given; defaulting to admin scripts\n")
-        args = [os.path.join(here, f) for f in [
-            "actions.js", "collapse.js", "inlines.js", "prepopulate.js"]]
-
-    for arg in args:
-        if not arg.endswith(".js"):
-            arg = arg + ".js"
-        to_compress = os.path.expanduser(arg)
-        if os.path.exists(to_compress):
-            to_compress_min = "%s.min.js" % "".join(arg.rsplit(".js"))
-            cmd = "java -jar %s --js %s --js_output_file %s" % (compiler, to_compress, to_compress_min)
-            if options.verbose:
-                sys.stdout.write("Running: %s\n" % cmd)
-            subprocess.call(cmd.split())
-        else:
-            sys.stdout.write("File %s not found. Sure it exists?\n" % to_compress)
-
-if __name__ == '__main__':
-    main()
diff --git a/lms/static/admin/js/core.js b/lms/static/admin/js/core.js
deleted file mode 100644
index ab776509ba..0000000000
--- a/lms/static/admin/js/core.js
+++ /dev/null
@@ -1,211 +0,0 @@
-// Core javascript helper functions
-
-// basic browser identification & version
-var isOpera = (navigator.userAgent.indexOf("Opera")>=0) && parseFloat(navigator.appVersion);
-var isIE = ((document.all) && (!isOpera)) && parseFloat(navigator.appVersion.split("MSIE ")[1].split(";")[0]);
-
-// Cross-browser event handlers.
-function addEvent(obj, evType, fn) {
-    if (obj.addEventListener) {
-        obj.addEventListener(evType, fn, false);
-        return true;
-    } else if (obj.attachEvent) {
-        var r = obj.attachEvent("on" + evType, fn);
-        return r;
-    } else {
-        return false;
-    }
-}
-
-function removeEvent(obj, evType, fn) {
-    if (obj.removeEventListener) {
-        obj.removeEventListener(evType, fn, false);
-        return true;
-    } else if (obj.detachEvent) {
-        obj.detachEvent("on" + evType, fn);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-// quickElement(tagType, parentReference, textInChildNode, [, attribute, attributeValue ...]);
-function quickElement() {
-    var obj = document.createElement(arguments[0]);
-    if (arguments[2] != '' && arguments[2] != null) {
-        var textNode = document.createTextNode(arguments[2]);
-        obj.appendChild(textNode);
-    }
-    var len = arguments.length;
-    for (var i = 3; i < len; i += 2) {
-        obj.setAttribute(arguments[i], arguments[i+1]);
-    }
-    arguments[1].appendChild(obj);
-    return obj;
-}
-
-// ----------------------------------------------------------------------------
-// Cross-browser xmlhttp object
-// from http://jibbering.com/2002/4/httprequest.html
-// ----------------------------------------------------------------------------
-var xmlhttp;
-/*@cc_on @*/
-/*@if (@_jscript_version >= 5)
-    try {
-        xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-    } catch (e) {
-        try {
-            xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-        } catch (E) {
-            xmlhttp = false;
-        }
-    }
-@else
-    xmlhttp = false;
-@end @*/
-if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-  xmlhttp = new XMLHttpRequest();
-}
-
-// ----------------------------------------------------------------------------
-// Find-position functions by PPK
-// See http://www.quirksmode.org/js/findpos.html
-// ----------------------------------------------------------------------------
-function findPosX(obj) {
-    var curleft = 0;
-    if (obj.offsetParent) {
-        while (obj.offsetParent) {
-            curleft += obj.offsetLeft - ((isOpera) ? 0 : obj.scrollLeft);
-            obj = obj.offsetParent;
-        }
-        // IE offsetParent does not include the top-level
-        if (isIE && obj.parentElement){
-            curleft += obj.offsetLeft - obj.scrollLeft;
-        }
-    } else if (obj.x) {
-        curleft += obj.x;
-    }
-    return curleft;
-}
-
-function findPosY(obj) {
-    var curtop = 0;
-    if (obj.offsetParent) {
-        while (obj.offsetParent) {
-            curtop += obj.offsetTop - ((isOpera) ? 0 : obj.scrollTop);
-            obj = obj.offsetParent;
-        }
-        // IE offsetParent does not include the top-level
-        if (isIE && obj.parentElement){
-            curtop += obj.offsetTop - obj.scrollTop;
-        }
-    } else if (obj.y) {
-        curtop += obj.y;
-    }
-    return curtop;
-}
-
-//-----------------------------------------------------------------------------
-// Date object extensions
-// ----------------------------------------------------------------------------
-
-Date.prototype.getTwelveHours = function() {
-    hours = this.getHours();
-    if (hours == 0) {
-        return 12;
-    }
-    else {
-        return hours <= 12 ? hours : hours-12
-    }
-}
-
-Date.prototype.getTwoDigitMonth = function() {
-    return (this.getMonth() < 9) ? '0' + (this.getMonth()+1) : (this.getMonth()+1);
-}
-
-Date.prototype.getTwoDigitDate = function() {
-    return (this.getDate() < 10) ? '0' + this.getDate() : this.getDate();
-}
-
-Date.prototype.getTwoDigitTwelveHour = function() {
-    return (this.getTwelveHours() < 10) ? '0' + this.getTwelveHours() : this.getTwelveHours();
-}
-
-Date.prototype.getTwoDigitHour = function() {
-    return (this.getHours() < 10) ? '0' + this.getHours() : this.getHours();
-}
-
-Date.prototype.getTwoDigitMinute = function() {
-    return (this.getMinutes() < 10) ? '0' + this.getMinutes() : this.getMinutes();
-}
-
-Date.prototype.getTwoDigitSecond = function() {
-    return (this.getSeconds() < 10) ? '0' + this.getSeconds() : this.getSeconds();
-}
-
-Date.prototype.getHourMinute = function() {
-    return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute();
-}
-
-Date.prototype.getHourMinuteSecond = function() {
-    return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute() + ':' + this.getTwoDigitSecond();
-}
-
-Date.prototype.strftime = function(format) {
-    var fields = {
-        c: this.toString(),
-        d: this.getTwoDigitDate(),
-        H: this.getTwoDigitHour(),
-        I: this.getTwoDigitTwelveHour(),
-        m: this.getTwoDigitMonth(),
-        M: this.getTwoDigitMinute(),
-        p: (this.getHours() >= 12) ? 'PM' : 'AM',
-        S: this.getTwoDigitSecond(),
-        w: '0' + this.getDay(),
-        x: this.toLocaleDateString(),
-        X: this.toLocaleTimeString(),
-        y: ('' + this.getFullYear()).substr(2, 4),
-        Y: '' + this.getFullYear(),
-        '%' : '%'
-    };
-    var result = '', i = 0;
-    while (i < format.length) {
-        if (format.charAt(i) === '%') {
-            result = result + fields[format.charAt(i + 1)];
-            ++i;
-        }
-        else {
-            result = result + format.charAt(i);
-        }
-        ++i;
-    }
-    return result;
-}
-
-// ----------------------------------------------------------------------------
-// String object extensions
-// ----------------------------------------------------------------------------
-String.prototype.pad_left = function(pad_length, pad_string) {
-    var new_string = this;
-    for (var i = 0; new_string.length < pad_length; i++) {
-        new_string = pad_string + new_string;
-    }
-    return new_string;
-}
-
-// ----------------------------------------------------------------------------
-// Get the computed style for and element
-// ----------------------------------------------------------------------------
-function getStyle(oElm, strCssRule){
-    var strValue = "";
-    if(document.defaultView && document.defaultView.getComputedStyle){
-        strValue = document.defaultView.getComputedStyle(oElm, "").getPropertyValue(strCssRule);
-    }
-    else if(oElm.currentStyle){
-        strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){
-            return p1.toUpperCase();
-        });
-        strValue = oElm.currentStyle[strCssRule];
-    }
-    return strValue;
-}
diff --git a/lms/static/admin/js/dateparse.js b/lms/static/admin/js/dateparse.js
deleted file mode 100644
index e46ab1dc29..0000000000
--- a/lms/static/admin/js/dateparse.js
+++ /dev/null
@@ -1,241 +0,0 @@
-/* 'Magic' date parsing, by Simon Willison (6th October 2003)
-   http://simon.incutio.com/archive/2003/10/06/betterDateInput
-   Adapted for 6newslawrence.com, 28th January 2004
-*/
-
-/* Finds the index of the first occurence of item in the array, or -1 if not found */
-if (typeof Array.prototype.indexOf == 'undefined') {
-    Array.prototype.indexOf = function(item) {
-        var len = this.length;
-        for (var i = 0; i < len; i++) {
-            if (this[i] == item) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-/* Returns an array of items judged 'true' by the passed in test function */
-if (typeof Array.prototype.filter == 'undefined') {
-    Array.prototype.filter = function(test) {
-        var matches = [];
-        var len = this.length;
-        for (var i = 0; i < len; i++) {
-            if (test(this[i])) {
-                matches[matches.length] = this[i];
-            }
-        }
-        return matches;
-    };
-}
-
-// Translators: the names of months, keep the pipe (|) separators.
-var monthNames = gettext("January|February|March|April|May|June|July|August|September|October|November|December").split("|");
-// Translators: the names of days, keep the pipe (|) separators.
-var weekdayNames = gettext("Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday").split("|");
-
-/* Takes a string, returns the index of the month matching that string, throws
-   an error if 0 or more than 1 matches
-*/
-function parseMonth(month) {
-    var matches = monthNames.filter(function(item) { 
-        return new RegExp("^" + month, "i").test(item);
-    });
-    if (matches.length == 0) {
-        throw new Error("Invalid month string");
-    }
-    if (matches.length > 1) {
-        throw new Error("Ambiguous month");
-    }
-    return monthNames.indexOf(matches[0]);
-}
-/* Same as parseMonth but for days of the week */
-function parseWeekday(weekday) {
-    var matches = weekdayNames.filter(function(item) {
-        return new RegExp("^" + weekday, "i").test(item);
-    });
-    if (matches.length == 0) {
-        throw new Error("Invalid day string");
-    }
-    if (matches.length > 1) {
-        throw new Error("Ambiguous weekday");
-    }
-    return weekdayNames.indexOf(matches[0]);
-}
-
-/* Array of objects, each has 're', a regular expression and 'handler', a 
-   function for creating a date from something that matches the regular 
-   expression. Handlers may throw errors if string is unparseable. 
-*/
-var dateParsePatterns = [
-    // Today
-    {   re: /^tod/i,
-        handler: function() { 
-            return new Date();
-        } 
-    },
-    // Tomorrow
-    {   re: /^tom/i,
-        handler: function() {
-            var d = new Date(); 
-            d.setDate(d.getDate() + 1); 
-            return d;
-        }
-    },
-    // Yesterday
-    {   re: /^yes/i,
-        handler: function() {
-            var d = new Date();
-            d.setDate(d.getDate() - 1);
-            return d;
-        }
-    },
-    // 4th
-    {   re: /^(\d{1,2})(st|nd|rd|th)?$/i, 
-        handler: function(bits) {
-            var d = new Date();
-            d.setDate(parseInt(bits[1], 10));
-            return d;
-        }
-    },
-    // 4th Jan
-    {   re: /^(\d{1,2})(?:st|nd|rd|th)? (\w+)$/i, 
-        handler: function(bits) {
-            var d = new Date();
-            d.setDate(1);
-            d.setMonth(parseMonth(bits[2]));
-            d.setDate(parseInt(bits[1], 10));
-            return d;
-        }
-    },
-    // 4th Jan 2003
-    {   re: /^(\d{1,2})(?:st|nd|rd|th)? (\w+),? (\d{4})$/i,
-        handler: function(bits) {
-            var d = new Date();
-            d.setDate(1);
-            d.setYear(bits[3]);
-            d.setMonth(parseMonth(bits[2]));
-            d.setDate(parseInt(bits[1], 10));
-            return d;
-        }
-    },
-    // Jan 4th
-    {   re: /^(\w+) (\d{1,2})(?:st|nd|rd|th)?$/i, 
-        handler: function(bits) {
-            var d = new Date();
-            d.setDate(1);
-            d.setMonth(parseMonth(bits[1]));
-            d.setDate(parseInt(bits[2], 10));
-            return d;
-        }
-    },
-    // Jan 4th 2003
-    {   re: /^(\w+) (\d{1,2})(?:st|nd|rd|th)?,? (\d{4})$/i,
-        handler: function(bits) {
-            var d = new Date();
-            d.setDate(1);
-            d.setYear(bits[3]);
-            d.setMonth(parseMonth(bits[1]));
-            d.setDate(parseInt(bits[2], 10));
-            return d;
-        }
-    },
-    // next Tuesday - this is suspect due to weird meaning of "next"
-    {   re: /^next (\w+)$/i,
-        handler: function(bits) {
-            var d = new Date();
-            var day = d.getDay();
-            var newDay = parseWeekday(bits[1]);
-            var addDays = newDay - day;
-            if (newDay <= day) {
-                addDays += 7;
-            }
-            d.setDate(d.getDate() + addDays);
-            return d;
-        }
-    },
-    // last Tuesday
-    {   re: /^last (\w+)$/i,
-        handler: function(bits) {
-            throw new Error("Not yet implemented");
-        }
-    },
-    // mm/dd/yyyy (American style)
-    {   re: /(\d{1,2})\/(\d{1,2})\/(\d{4})/,
-        handler: function(bits) {
-            var d = new Date();
-            d.setDate(1);
-            d.setYear(bits[3]);
-            d.setMonth(parseInt(bits[1], 10) - 1); // Because months indexed from 0
-            d.setDate(parseInt(bits[2], 10));
-            return d;
-        }
-    },
-    // yyyy-mm-dd (ISO style)
-    {   re: /(\d{4})-(\d{1,2})-(\d{1,2})/,
-        handler: function(bits) {
-            var d = new Date();
-            d.setDate(1);
-            d.setYear(parseInt(bits[1]));
-            d.setMonth(parseInt(bits[2], 10) - 1);
-            d.setDate(parseInt(bits[3], 10));
-            return d;
-        }
-    },
-];
-
-function parseDateString(s) {
-    for (var i = 0; i < dateParsePatterns.length; i++) {
-        var re = dateParsePatterns[i].re;
-        var handler = dateParsePatterns[i].handler;
-        var bits = re.exec(s);
-        if (bits) {
-            return handler(bits);
-        }
-    }
-    throw new Error("Invalid date string");
-}
-
-function fmt00(x) {
-    // fmt00: Tags leading zero onto numbers 0 - 9.
-    // Particularly useful for displaying results from Date methods.
-    //
-    if (Math.abs(parseInt(x)) < 10){
-        x = "0"+ Math.abs(x);
-    }
-    return x;
-}
-
-function parseDateStringISO(s) {
-    try {
-        var d = parseDateString(s);
-        return d.getFullYear() + '-' + (fmt00(d.getMonth() + 1)) + '-' + fmt00(d.getDate())
-    }
-    catch (e) { return s; }
-}
-function magicDate(input) {
-    var messagespan = input.id + 'Msg';
-    try {
-        var d = parseDateString(input.value);
-        input.value = d.getFullYear() + '-' + (fmt00(d.getMonth() + 1)) + '-' + 
-            fmt00(d.getDate());
-        input.className = '';
-        // Human readable date
-        if (document.getElementById(messagespan)) {
-            document.getElementById(messagespan).firstChild.nodeValue = d.toDateString();
-            document.getElementById(messagespan).className = 'normal';
-        }
-    }
-    catch (e) {
-        input.className = 'error';
-        var message = e.message;
-        // Fix for IE6 bug
-        if (message.indexOf('is null or not an object') > -1) {
-            message = 'Invalid date string';
-        }
-        if (document.getElementById(messagespan)) {
-            document.getElementById(messagespan).firstChild.nodeValue = message;
-            document.getElementById(messagespan).className = 'error';
-        }
-    }
-}
diff --git a/lms/static/admin/js/getElementsBySelector.js b/lms/static/admin/js/getElementsBySelector.js
deleted file mode 100644
index 15b57a1908..0000000000
--- a/lms/static/admin/js/getElementsBySelector.js
+++ /dev/null
@@ -1,167 +0,0 @@
-/* document.getElementsBySelector(selector)
-   - returns an array of element objects from the current document
-     matching the CSS selector. Selectors can contain element names, 
-     class names and ids and can be nested. For example:
-     
-       elements = document.getElementsBySelect('div#main p a.external')
-     
-     Will return an array of all 'a' elements with 'external' in their 
-     class attribute that are contained inside 'p' elements that are 
-     contained inside the 'div' element which has id="main"
-
-   New in version 0.4: Support for CSS2 and CSS3 attribute selectors:
-   See http://www.w3.org/TR/css3-selectors/#attribute-selectors
-
-   Version 0.4 - Simon Willison, March 25th 2003
-   -- Works in Phoenix 0.5, Mozilla 1.3, Opera 7, Internet Explorer 6, Internet Explorer 5 on Windows
-   -- Opera 7 fails 
-*/
-
-function getAllChildren(e) {
-  // Returns all children of element. Workaround required for IE5/Windows. Ugh.
-  return e.all ? e.all : e.getElementsByTagName('*');
-}
-
-document.getElementsBySelector = function(selector) {
-  // Attempt to fail gracefully in lesser browsers
-  if (!document.getElementsByTagName) {
-    return new Array();
-  }
-  // Split selector in to tokens
-  var tokens = selector.split(' ');
-  var currentContext = new Array(document);
-  for (var i = 0; i < tokens.length; i++) {
-    token = tokens[i].replace(/^\s+/,'').replace(/\s+$/,'');;
-    if (token.indexOf('#') > -1) {
-      // Token is an ID selector
-      var bits = token.split('#');
-      var tagName = bits[0];
-      var id = bits[1];
-      var element = document.getElementById(id);
-      if (!element || (tagName && element.nodeName.toLowerCase() != tagName)) {
-        // ID not found or tag with that ID not found, return false.
-        return new Array();
-      }
-      // Set currentContext to contain just this element
-      currentContext = new Array(element);
-      continue; // Skip to next token
-    }
-    if (token.indexOf('.') > -1) {
-      // Token contains a class selector
-      var bits = token.split('.');
-      var tagName = bits[0];
-      var className = bits[1];
-      if (!tagName) {
-        tagName = '*';
-      }
-      // Get elements matching tag, filter them for class selector
-      var found = new Array;
-      var foundCount = 0;
-      for (var h = 0; h < currentContext.length; h++) {
-        var elements;
-        if (tagName == '*') {
-            elements = getAllChildren(currentContext[h]);
-        } else {
-            try {
-                elements = currentContext[h].getElementsByTagName(tagName);
-            }
-            catch(e) {
-                elements = [];
-            }
-        }
-        for (var j = 0; j < elements.length; j++) {
-          found[foundCount++] = elements[j];
-        }
-      }
-      currentContext = new Array;
-      var currentContextIndex = 0;
-      for (var k = 0; k < found.length; k++) {
-        if (found[k].className && found[k].className.match(new RegExp('\\b'+className+'\\b'))) {
-          currentContext[currentContextIndex++] = found[k];
-        }
-      }
-      continue; // Skip to next token
-    }
-    // Code to deal with attribute selectors
-    if (token.match(/^(\w*)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/)) {
-      var tagName = RegExp.$1;
-      var attrName = RegExp.$2;
-      var attrOperator = RegExp.$3;
-      var attrValue = RegExp.$4;
-      if (!tagName) {
-        tagName = '*';
-      }
-      // Grab all of the tagName elements within current context
-      var found = new Array;
-      var foundCount = 0;
-      for (var h = 0; h < currentContext.length; h++) {
-        var elements;
-        if (tagName == '*') {
-            elements = getAllChildren(currentContext[h]);
-        } else {
-            elements = currentContext[h].getElementsByTagName(tagName);
-        }
-        for (var j = 0; j < elements.length; j++) {
-          found[foundCount++] = elements[j];
-        }
-      }
-      currentContext = new Array;
-      var currentContextIndex = 0;
-      var checkFunction; // This function will be used to filter the elements
-      switch (attrOperator) {
-        case '=': // Equality
-          checkFunction = function(e) { return (e.getAttribute(attrName) == attrValue); };
-          break;
-        case '~': // Match one of space seperated words 
-          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('\\b'+attrValue+'\\b'))); };
-          break;
-        case '|': // Match start with value followed by optional hyphen
-          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('^'+attrValue+'-?'))); };
-          break;
-        case '^': // Match starts with value
-          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) == 0); };
-          break;
-        case '$': // Match ends with value - fails with "Warning" in Opera 7
-          checkFunction = function(e) { return (e.getAttribute(attrName).lastIndexOf(attrValue) == e.getAttribute(attrName).length - attrValue.length); };
-          break;
-        case '*': // Match ends with value
-          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) > -1); };
-          break;
-        default :
-          // Just test for existence of attribute
-          checkFunction = function(e) { return e.getAttribute(attrName); };
-      }
-      currentContext = new Array;
-      var currentContextIndex = 0;
-      for (var k = 0; k < found.length; k++) {
-        if (checkFunction(found[k])) {
-          currentContext[currentContextIndex++] = found[k];
-        }
-      }
-      // alert('Attribute Selector: '+tagName+' '+attrName+' '+attrOperator+' '+attrValue);
-      continue; // Skip to next token
-    }
-    // If we get here, token is JUST an element (not a class or ID selector)
-    tagName = token;
-    var found = new Array;
-    var foundCount = 0;
-    for (var h = 0; h < currentContext.length; h++) {
-      var elements = currentContext[h].getElementsByTagName(tagName);
-      for (var j = 0; j < elements.length; j++) {
-        found[foundCount++] = elements[j];
-      }
-    }
-    currentContext = found;
-  }
-  return currentContext;
-}
-
-/* That revolting regular expression explained 
-/^(\w+)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
-  \---/  \---/\-------------/    \-------/
-    |      |         |               |
-    |      |         |           The value
-    |      |    ~,|,^,$,* or =
-    |   Attribute 
-   Tag
-*/
diff --git a/lms/static/admin/js/inlines.js b/lms/static/admin/js/inlines.js
deleted file mode 100644
index bddd6f75ba..0000000000
--- a/lms/static/admin/js/inlines.js
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Django admin inlines
- *
- * Based on jQuery Formset 1.1
- * @author Stanislaus Madueke (stan DOT madueke AT gmail DOT com)
- * @requires jQuery 1.2.6 or later
- *
- * Copyright (c) 2009, Stanislaus Madueke
- * All rights reserved.
- *
- * Spiced up with Code from Zain Memon's GSoC project 2009
- * and modified for Django by Jannis Leidel
- *
- * Licensed under the New BSD License
- * See: http://www.opensource.org/licenses/bsd-license.php
- */
-(function($) {
-	$.fn.formset = function(opts) {
-		var options = $.extend({}, $.fn.formset.defaults, opts);
-		var updateElementIndex = function(el, prefix, ndx) {
-			var id_regex = new RegExp("(" + prefix + "-(\\d+|__prefix__))");
-			var replacement = prefix + "-" + ndx;
-			if ($(el).attr("for")) {
-				$(el).attr("for", $(el).attr("for").replace(id_regex, replacement));
-			}
-			if (el.id) {
-				el.id = el.id.replace(id_regex, replacement);
-			}
-			if (el.name) {
-				el.name = el.name.replace(id_regex, replacement);
-			}
-		};
-		var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").attr("autocomplete", "off");
-		var nextIndex = parseInt(totalForms.val());
-		var maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").attr("autocomplete", "off");
-		// only show the add button if we are allowed to add more items,
-        // note that max_num = None translates to a blank string.
-		var showAddButton = maxForms.val() == '' || (maxForms.val()-totalForms.val()) > 0;
-		$(this).each(function(i) {
-			$(this).not("." + options.emptyCssClass).addClass(options.formCssClass);
-		});
-		if ($(this).length && showAddButton) {
-			var addButton;
-			if ($(this).attr("tagName") == "TR") {
-				// If forms are laid out as table rows, insert the
-				// "add" button in a new table row:
-				var numCols = this.eq(0).children().length;
-				$(this).parent().append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a href="javascript:void(0)">' + options.addText + "</a></tr>");
-				addButton = $(this).parent().find("tr:last a");
-			} else {
-				// Otherwise, insert it immediately after the last form:
-				$(this).filter(":last").after('<div class="' + options.addCssClass + '"><a href="javascript:void(0)">' + options.addText + "</a></div>");
-				addButton = $(this).filter(":last").next().find("a");
-			}
-			addButton.click(function() {
-				var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS");
-				var template = $("#" + options.prefix + "-empty");
-				var row = template.clone(true);
-				row.removeClass(options.emptyCssClass)
-				    .addClass(options.formCssClass)
-				    .attr("id", options.prefix + "-" + nextIndex);
-				if (row.is("tr")) {
-					// If the forms are laid out in table rows, insert
-					// the remove button into the last table cell:
-					row.children(":last").append('<div><a class="' + options.deleteCssClass +'" href="javascript:void(0)">' + options.deleteText + "</a></div>");
-				} else if (row.is("ul") || row.is("ol")) {
-					// If they're laid out as an ordered/unordered list,
-					// insert an <li> after the last list item:
-					row.append('<li><a class="' + options.deleteCssClass +'" href="javascript:void(0)">' + options.deleteText + "</a></li>");
-				} else {
-					// Otherwise, just insert the remove button as the
-					// last child element of the form's container:
-					row.children(":first").append('<span><a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText + "</a></span>");
-				}
-				row.find("*").each(function() {
-					updateElementIndex(this, options.prefix, totalForms.val());
-				});
-				// Insert the new form when it has been fully edited
-				row.insertBefore($(template));
-				// Update number of total forms
-				$(totalForms).val(parseInt(totalForms.val()) + 1);
-				nextIndex += 1;
-				// Hide add button in case we've hit the max, except we want to add infinitely
-				if ((maxForms.val() != '') && (maxForms.val()-totalForms.val()) <= 0) {
-					addButton.parent().hide();
-				}
-				// The delete button of each row triggers a bunch of other things
-				row.find("a." + options.deleteCssClass).click(function() {
-					// Remove the parent form containing this button:
-					var row = $(this).parents("." + options.formCssClass);
-					row.remove();
-					nextIndex -= 1;
-					// If a post-delete callback was provided, call it with the deleted form:
-					if (options.removed) {
-						options.removed(row);
-					}
-					// Update the TOTAL_FORMS form count.
-					var forms = $("." + options.formCssClass);
-					$("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length);
-					// Show add button again once we drop below max
-					if ((maxForms.val() == '') || (maxForms.val()-forms.length) > 0) {
-						addButton.parent().show();
-					}
-					// Also, update names and ids for all remaining form controls
-					// so they remain in sequence:
-					for (var i=0, formCount=forms.length; i<formCount; i++)
-					{
-						updateElementIndex($(forms).get(i), options.prefix, i);
-						$(forms.get(i)).find("*").each(function() {
-							updateElementIndex(this, options.prefix, i);
-						});
-					}
-					return false;
-				});
-				// If a post-add callback was supplied, call it with the added form:
-				if (options.added) {
-					options.added(row);
-				}
-				return false;
-			});
-		}
-		return this;
-	}
-	/* Setup plugin defaults */
-	$.fn.formset.defaults = {
-		prefix: "form",					// The form prefix for your django formset
-		addText: "add another",			// Text for the add link
-		deleteText: "remove",			// Text for the delete link
-		addCssClass: "add-row",			// CSS class applied to the add link
-		deleteCssClass: "delete-row",	// CSS class applied to the delete link
-		emptyCssClass: "empty-row",		// CSS class applied to the empty row
-		formCssClass: "dynamic-form",	// CSS class applied to each form in a formset
-		added: null,					// Function called each time a new form is added
-		removed: null					// Function called each time a form is deleted
-	}
-})(django.jQuery);
diff --git a/lms/static/admin/js/inlines.min.js b/lms/static/admin/js/inlines.min.js
deleted file mode 100644
index 5631cd5cf2..0000000000
--- a/lms/static/admin/js/inlines.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-(function(b){b.fn.formset=function(c){var a=b.extend({},b.fn.formset.defaults,c),j=function(a,e,d){var i=RegExp("("+e+"-(\\d+|__prefix__))"),e=e+"-"+d;b(a).attr("for")&&b(a).attr("for",b(a).attr("for").replace(i,e));if(a.id)a.id=a.id.replace(i,e);if(a.name)a.name=a.name.replace(i,e)},c=b("#id_"+a.prefix+"-TOTAL_FORMS").attr("autocomplete","off"),g=parseInt(c.val()),f=b("#id_"+a.prefix+"-MAX_NUM_FORMS").attr("autocomplete","off"),c=""==f.val()||0<f.val()-c.val();b(this).each(function(){b(this).not("."+
-a.emptyCssClass).addClass(a.formCssClass)});if(b(this).length&&c){var h;"TR"==b(this).attr("tagName")?(c=this.eq(0).children().length,b(this).parent().append('<tr class="'+a.addCssClass+'"><td colspan="'+c+'"><a href="javascript:void(0)">'+a.addText+"</a></tr>"),h=b(this).parent().find("tr:last a")):(b(this).filter(":last").after('<div class="'+a.addCssClass+'"><a href="javascript:void(0)">'+a.addText+"</a></div>"),h=b(this).filter(":last").next().find("a"));h.click(function(){var c=b("#id_"+a.prefix+
-"-TOTAL_FORMS"),e=b("#"+a.prefix+"-empty"),d=e.clone(!0);d.removeClass(a.emptyCssClass).addClass(a.formCssClass).attr("id",a.prefix+"-"+g);d.is("tr")?d.children(":last").append('<div><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></div>"):d.is("ul")||d.is("ol")?d.append('<li><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></li>"):d.children(":first").append('<span><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+
-"</a></span>");d.find("*").each(function(){j(this,a.prefix,c.val())});d.insertBefore(b(e));b(c).val(parseInt(c.val())+1);g+=1;""!=f.val()&&0>=f.val()-c.val()&&h.parent().hide();d.find("a."+a.deleteCssClass).click(function(){var c=b(this).parents("."+a.formCssClass);c.remove();g-=1;a.removed&&a.removed(c);c=b("."+a.formCssClass);b("#id_"+a.prefix+"-TOTAL_FORMS").val(c.length);(""==f.val()||0<f.val()-c.length)&&h.parent().show();for(var d=0,e=c.length;d<e;d++)j(b(c).get(d),a.prefix,d),b(c.get(d)).find("*").each(function(){j(this,
-a.prefix,d)});return!1});a.added&&a.added(d);return!1})}return this};b.fn.formset.defaults={prefix:"form",addText:"add another",deleteText:"remove",addCssClass:"add-row",deleteCssClass:"delete-row",emptyCssClass:"empty-row",formCssClass:"dynamic-form",added:null,removed:null}})(django.jQuery);
diff --git a/lms/static/admin/js/jquery.init.js b/lms/static/admin/js/jquery.init.js
deleted file mode 100644
index dd4605c368..0000000000
--- a/lms/static/admin/js/jquery.init.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Puts the included jQuery into our own namespace using noConflict and passing
- * it 'true'. This ensures that the included jQuery doesn't pollute the global
- * namespace (i.e. this preserves pre-existing values for both window.$ and
- * window.jQuery).
- */
-var django = {
-    "jQuery": jQuery.noConflict(true)
-};
diff --git a/lms/static/admin/js/jquery.js b/lms/static/admin/js/jquery.js
deleted file mode 100644
index fff6776433..0000000000
--- a/lms/static/admin/js/jquery.js
+++ /dev/null
@@ -1,6240 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.2
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Sat Feb 13 22:33:48 2010 -0500
- */
-(function( window, undefined ) {
-
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// A simple way to check for HTML strings or ID strings
-	// (both of which we optimize for)
-	quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,
-
-	// Is it a simple selector
-	isSimple = /^.[^:#\[\.,]*$/,
-
-	// Check if a string has a non-whitespace character in it
-	rnotwhite = /\S/,
-
-	// Used for trimming whitespace
-	rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-
-	// Keep a UserAgent string for use with jQuery.browser
-	userAgent = navigator.userAgent,
-
-	// For matching the engine and version of the browser
-	browserMatch,
-	
-	// Has the ready events already been bound?
-	readyBound = false,
-	
-	// The functions to execute on DOM ready
-	readyList = [],
-
-	// The ready event handler
-	DOMContentLoaded,
-
-	// Save a reference to some core methods
-	toString = Object.prototype.toString,
-	hasOwnProperty = Object.prototype.hasOwnProperty,
-	push = Array.prototype.push,
-	slice = Array.prototype.slice,
-	indexOf = Array.prototype.indexOf;
-
-jQuery.fn = jQuery.prototype = {
-	init: function( selector, context ) {
-		var match, elem, ret, doc;
-
-		// Handle $(""), $(null), or $(undefined)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-		}
-		
-		// The body element only exists once, optimize finding it
-		if ( selector === "body" && !context ) {
-			this.context = document;
-			this[0] = document.body;
-			this.selector = "body";
-			this.length = 1;
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			// Are we dealing with HTML string or an ID?
-			match = quickExpr.exec( selector );
-
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					doc = (context ? context.ownerDocument || context : document);
-
-					// If a single string is passed in and it's a single tag
-					// just do a createElement and skip the rest
-					ret = rsingleTag.exec( selector );
-
-					if ( ret ) {
-						if ( jQuery.isPlainObject( context ) ) {
-							selector = [ document.createElement( ret[1] ) ];
-							jQuery.fn.attr.call( selector, context, true );
-
-						} else {
-							selector = [ doc.createElement( ret[1] ) ];
-						}
-
-					} else {
-						ret = buildFragment( [ match[1] ], [ doc ] );
-						selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
-					}
-					
-					return jQuery.merge( this, selector );
-					
-				// HANDLE: $("#id")
-				} else {
-					elem = document.getElementById( match[2] );
-
-					if ( elem ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $("TAG")
-			} else if ( !context && /^\w+$/.test( selector ) ) {
-				this.selector = selector;
-				this.context = document;
-				selector = document.getElementsByTagName( selector );
-				return jQuery.merge( this, selector );
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return (context || rootjQuery).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return jQuery( context ).find( selector );
-			}
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if (selector.selector !== undefined) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The current version of jQuery being used
-	jquery: "1.4.2",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return slice.call( this, 0 );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems, name, selector ) {
-		// Build a new jQuery matched element set
-		var ret = jQuery();
-
-		if ( jQuery.isArray( elems ) ) {
-			push.apply( ret, elems );
-		
-		} else {
-			jQuery.merge( ret, elems );
-		}
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		ret.context = this.context;
-
-		if ( name === "find" ) {
-			ret.selector = this.selector + (this.selector ? " " : "") + selector;
-		} else if ( name ) {
-			ret.selector = this.selector + "." + name + "(" + selector + ")";
-		}
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-	
-	ready: function( fn ) {
-		// Attach the listeners
-		jQuery.bindReady();
-
-		// If the DOM is already ready
-		if ( jQuery.isReady ) {
-			// Execute the function immediately
-			fn.call( document, jQuery );
-
-		// Otherwise, remember the function for later
-		} else if ( readyList ) {
-			// Add the function to the wait list
-			readyList.push( fn );
-		}
-
-		return this;
-	},
-	
-	eq: function( i ) {
-		return i === -1 ?
-			this.slice( i ) :
-			this.slice( i, +i + 1 );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ),
-			"slice", slice.call(arguments).join(",") );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-	
-	end: function() {
-		return this.prevObject || jQuery(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	// copy reference to target object
-	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging object literal values or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) {
-					var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src
-						: jQuery.isArray(copy) ? [] : {};
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		window.$ = _$;
-
-		if ( deep ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-	
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-	
-	// Handle when the DOM is ready
-	ready: function() {
-		// Make sure that the DOM is not already loaded
-		if ( !jQuery.isReady ) {
-			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-			if ( !document.body ) {
-				return setTimeout( jQuery.ready, 13 );
-			}
-
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
-
-			// If there are functions bound, to execute
-			if ( readyList ) {
-				// Execute all of them
-				var fn, i = 0;
-				while ( (fn = readyList[ i++ ]) ) {
-					fn.call( document, jQuery );
-				}
-
-				// Reset the list of functions
-				readyList = null;
-			}
-
-			// Trigger any bound ready events
-			if ( jQuery.fn.triggerHandler ) {
-				jQuery( document ).triggerHandler( "ready" );
-			}
-		}
-	},
-	
-	bindReady: function() {
-		if ( readyBound ) {
-			return;
-		}
-
-		readyBound = true;
-
-		// Catch cases where $(document).ready() is called after the
-		// browser event has already occurred.
-		if ( document.readyState === "complete" ) {
-			return jQuery.ready();
-		}
-
-		// Mozilla, Opera and webkit nightlies currently support this event
-		if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-			
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
-
-		// If IE event model is used
-		} else if ( document.attachEvent ) {
-			// ensure firing before onload,
-			// maybe late but safe also for iframes
-			document.attachEvent("onreadystatechange", DOMContentLoaded);
-			
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var toplevel = false;
-
-			try {
-				toplevel = window.frameElement == null;
-			} catch(e) {}
-
-			if ( document.documentElement.doScroll && toplevel ) {
-				doScrollCheck();
-			}
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return toString.call(obj) === "[object Function]";
-	},
-
-	isArray: function( obj ) {
-		return toString.call(obj) === "[object Array]";
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) {
-			return false;
-		}
-		
-		// Not own constructor property must be Object
-		if ( obj.constructor
-			&& !hasOwnProperty.call(obj, "constructor")
-			&& !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
-			return false;
-		}
-		
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-	
-		var key;
-		for ( key in obj ) {}
-		
-		return key === undefined || hasOwnProperty.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		for ( var name in obj ) {
-			return false;
-		}
-		return true;
-	},
-	
-	error: function( msg ) {
-		throw msg;
-	},
-	
-	parseJSON: function( data ) {
-		if ( typeof data !== "string" || !data ) {
-			return null;
-		}
-
-		// Make sure leading/trailing whitespace is removed (IE can't handle it)
-		data = jQuery.trim( data );
-		
-		// Make sure the incoming data is actual JSON
-		// Logic borrowed from http://json.org/json2.js
-		if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
-			.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
-			.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
-
-			// Try to use the native JSON parser first
-			return window.JSON && window.JSON.parse ?
-				window.JSON.parse( data ) :
-				(new Function("return " + data))();
-
-		} else {
-			jQuery.error( "Invalid JSON: " + data );
-		}
-	},
-
-	noop: function() {},
-
-	// Evalulates a script in a global context
-	globalEval: function( data ) {
-		if ( data && rnotwhite.test(data) ) {
-			// Inspired by code by Andrea Giammarchi
-			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
-			var head = document.getElementsByTagName("head")[0] || document.documentElement,
-				script = document.createElement("script");
-
-			script.type = "text/javascript";
-
-			if ( jQuery.support.scriptEval ) {
-				script.appendChild( document.createTextNode( data ) );
-			} else {
-				script.text = data;
-			}
-
-			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709).
-			head.insertBefore( script, head.firstChild );
-			head.removeChild( script );
-		}
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0,
-			length = object.length,
-			isObj = length === undefined || jQuery.isFunction(object);
-
-		if ( args ) {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.apply( object[ name ], args ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.apply( object[ i++ ], args ) === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( var value = object[0];
-					i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
-			}
-		}
-
-		return object;
-	},
-
-	trim: function( text ) {
-		return (text || "").replace( rtrim, "" );
-	},
-
-	// results is for internal usage only
-	makeArray: function( array, results ) {
-		var ret = results || [];
-
-		if ( array != null ) {
-			// The window, strings (and functions) also have 'length'
-			// The extra typeof function check is to prevent crashes
-			// in Safari 2 (See: #3039)
-			if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) {
-				push.call( ret, array );
-			} else {
-				jQuery.merge( ret, array );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, array ) {
-		if ( array.indexOf ) {
-			return array.indexOf( elem );
-		}
-
-		for ( var i = 0, length = array.length; i < length; i++ ) {
-			if ( array[ i ] === elem ) {
-				return i;
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var i = first.length, j = 0;
-
-		if ( typeof second.length === "number" ) {
-			for ( var l = second.length; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-		
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var ret = [];
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			if ( !inv !== !callback( elems[ i ], i ) ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var ret = [], value;
-
-		// Go through the array, translating each of the items to their
-		// new value (or values).
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			value = callback( elems[ i ], i, arg );
-
-			if ( value != null ) {
-				ret[ ret.length ] = value;
-			}
-		}
-
-		return ret.concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	proxy: function( fn, proxy, thisObject ) {
-		if ( arguments.length === 2 ) {
-			if ( typeof proxy === "string" ) {
-				thisObject = fn;
-				fn = thisObject[ proxy ];
-				proxy = undefined;
-
-			} else if ( proxy && !jQuery.isFunction( proxy ) ) {
-				thisObject = proxy;
-				proxy = undefined;
-			}
-		}
-
-		if ( !proxy && fn ) {
-			proxy = function() {
-				return fn.apply( thisObject || this, arguments );
-			};
-		}
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		if ( fn ) {
-			proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
-		}
-
-		// So proxy can be declared as an argument
-		return proxy;
-	},
-
-	// Use of jQuery.browser is frowned upon.
-	// More details: http://docs.jquery.com/Utilities/jQuery.browser
-	uaMatch: function( ua ) {
-		ua = ua.toLowerCase();
-
-		var match = /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-			/(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) ||
-			/(msie) ([\w.]+)/.exec( ua ) ||
-			!/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) ||
-		  	[];
-
-		return { browser: match[1] || "", version: match[2] || "0" };
-	},
-
-	browser: {}
-});
-
-browserMatch = jQuery.uaMatch( userAgent );
-if ( browserMatch.browser ) {
-	jQuery.browser[ browserMatch.browser ] = true;
-	jQuery.browser.version = browserMatch.version;
-}
-
-// Deprecated, use jQuery.browser.webkit instead
-if ( jQuery.browser.webkit ) {
-	jQuery.browser.safari = true;
-}
-
-if ( indexOf ) {
-	jQuery.inArray = function( elem, array ) {
-		return indexOf.call( array, elem );
-	};
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-
-// Cleanup functions for the document ready method
-if ( document.addEventListener ) {
-	DOMContentLoaded = function() {
-		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-		jQuery.ready();
-	};
-
-} else if ( document.attachEvent ) {
-	DOMContentLoaded = function() {
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( document.readyState === "complete" ) {
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	};
-}
-
-// The DOM ready check for Internet Explorer
-function doScrollCheck() {
-	if ( jQuery.isReady ) {
-		return;
-	}
-
-	try {
-		// If IE is used, use the trick by Diego Perini
-		// http://javascript.nwbox.com/IEContentLoaded/
-		document.documentElement.doScroll("left");
-	} catch( error ) {
-		setTimeout( doScrollCheck, 1 );
-		return;
-	}
-
-	// and execute any waiting functions
-	jQuery.ready();
-}
-
-function evalScript( i, elem ) {
-	if ( elem.src ) {
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
-	} else {
-		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
-	}
-
-	if ( elem.parentNode ) {
-		elem.parentNode.removeChild( elem );
-	}
-}
-
-// Mutifunctional method to get and set values to a collection
-// The value/s can be optionally by executed if its a function
-function access( elems, key, value, exec, fn, pass ) {
-	var length = elems.length;
-	
-	// Setting many attributes
-	if ( typeof key === "object" ) {
-		for ( var k in key ) {
-			access( elems, k, key[k], exec, fn, value );
-		}
-		return elems;
-	}
-	
-	// Setting one attribute
-	if ( value !== undefined ) {
-		// Optionally, function values get executed if exec is true
-		exec = !pass && exec && jQuery.isFunction(value);
-		
-		for ( var i = 0; i < length; i++ ) {
-			fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
-		}
-		
-		return elems;
-	}
-	
-	// Getting an attribute
-	return length ? fn( elems[0], key ) : undefined;
-}
-
-function now() {
-	return (new Date).getTime();
-}
-(function() {
-
-	jQuery.support = {};
-
-	var root = document.documentElement,
-		script = document.createElement("script"),
-		div = document.createElement("div"),
-		id = "script" + now();
-
-	div.style.display = "none";
-	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-
-	var all = div.getElementsByTagName("*"),
-		a = div.getElementsByTagName("a")[0];
-
-	// Can't get basic test support
-	if ( !all || !all.length || !a ) {
-		return;
-	}
-
-	jQuery.support = {
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: div.firstChild.nodeType === 3,
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName("tbody").length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName("link").length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText insted)
-		style: /red/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: a.getAttribute("href") === "/a",
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.55$/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Make sure that if no value is specified for a checkbox
-		// that it defaults to "on".
-		// (WebKit defaults to "" instead)
-		checkOn: div.getElementsByTagName("input")[0].value === "on",
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected,
-
-		parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null,
-
-		// Will be defined later
-		deleteExpando: true,
-		checkClone: false,
-		scriptEval: false,
-		noCloneEvent: true,
-		boxModel: null
-	};
-
-	script.type = "text/javascript";
-	try {
-		script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
-	} catch(e) {}
-
-	root.insertBefore( script, root.firstChild );
-
-	// Make sure that the execution of code works by injecting a script
-	// tag with appendChild/createTextNode
-	// (IE doesn't support this, fails, and uses .text instead)
-	if ( window[ id ] ) {
-		jQuery.support.scriptEval = true;
-		delete window[ id ];
-	}
-
-	// Test to see if it's possible to delete an expando from an element
-	// Fails in Internet Explorer
-	try {
-		delete script.test;
-	
-	} catch(e) {
-		jQuery.support.deleteExpando = false;
-	}
-
-	root.removeChild( script );
-
-	if ( div.attachEvent && div.fireEvent ) {
-		div.attachEvent("onclick", function click() {
-			// Cloning a node shouldn't copy over any
-			// bound event handlers (IE does this)
-			jQuery.support.noCloneEvent = false;
-			div.detachEvent("onclick", click);
-		});
-		div.cloneNode(true).fireEvent("onclick");
-	}
-
-	div = document.createElement("div");
-	div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
-
-	var fragment = document.createDocumentFragment();
-	fragment.appendChild( div.firstChild );
-
-	// WebKit doesn't clone checked state correctly in fragments
-	jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
-
-	// Figure out if the W3C box model works as expected
-	// document.body must exist before we can do this
-	jQuery(function() {
-		var div = document.createElement("div");
-		div.style.width = div.style.paddingLeft = "1px";
-
-		document.body.appendChild( div );
-		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
-		document.body.removeChild( div ).style.display = 'none';
-
-		div = null;
-	});
-
-	// Technique from Juriy Zaytsev
-	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
-	var eventSupported = function( eventName ) { 
-		var el = document.createElement("div"); 
-		eventName = "on" + eventName; 
-
-		var isSupported = (eventName in el); 
-		if ( !isSupported ) { 
-			el.setAttribute(eventName, "return;"); 
-			isSupported = typeof el[eventName] === "function"; 
-		} 
-		el = null; 
-
-		return isSupported; 
-	};
-	
-	jQuery.support.submitBubbles = eventSupported("submit");
-	jQuery.support.changeBubbles = eventSupported("change");
-
-	// release memory in IE
-	root = script = div = all = a = null;
-})();
-
-jQuery.props = {
-	"for": "htmlFor",
-	"class": "className",
-	readonly: "readOnly",
-	maxlength: "maxLength",
-	cellspacing: "cellSpacing",
-	rowspan: "rowSpan",
-	colspan: "colSpan",
-	tabindex: "tabIndex",
-	usemap: "useMap",
-	frameborder: "frameBorder"
-};
-var expando = "jQuery" + now(), uuid = 0, windowData = {};
-
-jQuery.extend({
-	cache: {},
-	
-	expando:expando,
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"embed": true,
-		"object": true,
-		"applet": true
-	},
-
-	data: function( elem, name, data ) {
-		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
-			return;
-		}
-
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ], cache = jQuery.cache, thisCache;
-
-		if ( !id && typeof name === "string" && data === undefined ) {
-			return null;
-		}
-
-		// Compute a unique ID for the element
-		if ( !id ) { 
-			id = ++uuid;
-		}
-
-		// Avoid generating a new cache unless none exists and we
-		// want to manipulate it.
-		if ( typeof name === "object" ) {
-			elem[ expando ] = id;
-			thisCache = cache[ id ] = jQuery.extend(true, {}, name);
-
-		} else if ( !cache[ id ] ) {
-			elem[ expando ] = id;
-			cache[ id ] = {};
-		}
-
-		thisCache = cache[ id ];
-
-		// Prevent overriding the named cache with undefined values
-		if ( data !== undefined ) {
-			thisCache[ name ] = data;
-		}
-
-		return typeof name === "string" ? thisCache[ name ] : thisCache;
-	},
-
-	removeData: function( elem, name ) {
-		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
-			return;
-		}
-
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
-
-		// If we want to remove a specific section of the element's data
-		if ( name ) {
-			if ( thisCache ) {
-				// Remove the section of cache data
-				delete thisCache[ name ];
-
-				// If we've removed all the data, remove the element's cache
-				if ( jQuery.isEmptyObject(thisCache) ) {
-					jQuery.removeData( elem );
-				}
-			}
-
-		// Otherwise, we want to remove all of the element's data
-		} else {
-			if ( jQuery.support.deleteExpando ) {
-				delete elem[ jQuery.expando ];
-
-			} else if ( elem.removeAttribute ) {
-				elem.removeAttribute( jQuery.expando );
-			}
-
-			// Completely remove the data cache
-			delete cache[ id ];
-		}
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		if ( typeof key === "undefined" && this.length ) {
-			return jQuery.data( this[0] );
-
-		} else if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		var parts = key.split(".");
-		parts[1] = parts[1] ? "." + parts[1] : "";
-
-		if ( value === undefined ) {
-			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
-
-			if ( data === undefined && this.length ) {
-				data = jQuery.data( this[0], key );
-			}
-			return data === undefined && parts[1] ?
-				this.data( parts[0] ) :
-				data;
-		} else {
-			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
-				jQuery.data( this, key, value );
-			});
-		}
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		if ( !elem ) {
-			return;
-		}
-
-		type = (type || "fx") + "queue";
-		var q = jQuery.data( elem, type );
-
-		// Speed up dequeue by getting out quickly if this is just a lookup
-		if ( !data ) {
-			return q || [];
-		}
-
-		if ( !q || jQuery.isArray(data) ) {
-			q = jQuery.data( elem, type, jQuery.makeArray(data) );
-
-		} else {
-			q.push( data );
-		}
-
-		return q;
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ), fn = queue.shift();
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-		}
-
-		if ( fn ) {
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift("inprogress");
-			}
-
-			fn.call(elem, function() {
-				jQuery.dequeue(elem, type);
-			});
-		}
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-		}
-
-		if ( data === undefined ) {
-			return jQuery.queue( this[0], type );
-		}
-		return this.each(function( i, elem ) {
-			var queue = jQuery.queue( this, type, data );
-
-			if ( type === "fx" && queue[0] !== "inprogress" ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function() {
-			var elem = this;
-			setTimeout(function() {
-				jQuery.dequeue( elem, type );
-			}, time );
-		});
-	},
-
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	}
-});
-var rclass = /[\n\t]/g,
-	rspace = /\s+/,
-	rreturn = /\r/g,
-	rspecialurl = /href|src|style/,
-	rtype = /(button|input)/i,
-	rfocusable = /(button|input|object|select|textarea)/i,
-	rclickable = /^(a|area)$/i,
-	rradiocheck = /radio|checkbox/;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return access( this, name, value, true, jQuery.attr );
-	},
-
-	removeAttr: function( name, fn ) {
-		return this.each(function(){
-			jQuery.attr( this, name, "" );
-			if ( this.nodeType === 1 ) {
-				this.removeAttribute( name );
-			}
-		});
-	},
-
-	addClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.addClass( value.call(this, i, self.attr("class")) );
-			});
-		}
-
-		if ( value && typeof value === "string" ) {
-			var classNames = (value || "").split( rspace );
-
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
-
-				if ( elem.nodeType === 1 ) {
-					if ( !elem.className ) {
-						elem.className = value;
-
-					} else {
-						var className = " " + elem.className + " ", setClass = elem.className;
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
-								setClass += " " + classNames[c];
-							}
-						}
-						elem.className = jQuery.trim( setClass );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.removeClass( value.call(this, i, self.attr("class")) );
-			});
-		}
-
-		if ( (value && typeof value === "string") || value === undefined ) {
-			var classNames = (value || "").split(rspace);
-
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
-
-				if ( elem.nodeType === 1 && elem.className ) {
-					if ( value ) {
-						var className = (" " + elem.className + " ").replace(rclass, " ");
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							className = className.replace(" " + classNames[c] + " ", " ");
-						}
-						elem.className = jQuery.trim( className );
-
-					} else {
-						elem.className = "";
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value, isBool = typeof stateVal === "boolean";
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className, i = 0, self = jQuery(this),
-					state = stateVal,
-					classNames = value.split( rspace );
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space seperated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
-				}
-
-			} else if ( type === "undefined" || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery.data( this, "__className__", this.className );
-				}
-
-				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ";
-		for ( var i = 0, l = this.length; i < l; i++ ) {
-			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		if ( value === undefined ) {
-			var elem = this[0];
-
-			if ( elem ) {
-				if ( jQuery.nodeName( elem, "option" ) ) {
-					return (elem.attributes.value || {}).specified ? elem.value : elem.text;
-				}
-
-				// We need to handle select boxes special
-				if ( jQuery.nodeName( elem, "select" ) ) {
-					var index = elem.selectedIndex,
-						values = [],
-						options = elem.options,
-						one = elem.type === "select-one";
-
-					// Nothing was selected
-					if ( index < 0 ) {
-						return null;
-					}
-
-					// Loop through all the selected options
-					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-						var option = options[ i ];
-
-						if ( option.selected ) {
-							// Get the specifc value for the option
-							value = jQuery(option).val();
-
-							// We don't need an array for one selects
-							if ( one ) {
-								return value;
-							}
-
-							// Multi-Selects return an array
-							values.push( value );
-						}
-					}
-
-					return values;
-				}
-
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
-					return elem.getAttribute("value") === null ? "on" : elem.value;
-				}
-				
-
-				// Everything else, we just grab the value
-				return (elem.value || "").replace(rreturn, "");
-
-			}
-
-			return undefined;
-		}
-
-		var isFunction = jQuery.isFunction(value);
-
-		return this.each(function(i) {
-			var self = jQuery(this), val = value;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call(this, i, self.val());
-			}
-
-			// Typecast each time if the value is a Function and the appended
-			// value is therefore different each time.
-			if ( typeof val === "number" ) {
-				val += "";
-			}
-
-			if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
-				this.checked = jQuery.inArray( self.val(), val ) >= 0;
-
-			} else if ( jQuery.nodeName( this, "select" ) ) {
-				var values = jQuery.makeArray(val);
-
-				jQuery( "option", this ).each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
-
-				if ( !values.length ) {
-					this.selectedIndex = -1;
-				}
-
-			} else {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	attrFn: {
-		val: true,
-		css: true,
-		html: true,
-		text: true,
-		data: true,
-		width: true,
-		height: true,
-		offset: true
-	},
-		
-	attr: function( elem, name, value, pass ) {
-		// don't set attributes on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return undefined;
-		}
-
-		if ( pass && name in jQuery.attrFn ) {
-			return jQuery(elem)[name](value);
-		}
-
-		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
-			// Whether we are setting (or getting)
-			set = value !== undefined;
-
-		// Try to normalize/fix the name
-		name = notxml && jQuery.props[ name ] || name;
-
-		// Only do all the following if this is a node (faster for style)
-		if ( elem.nodeType === 1 ) {
-			// These attributes require special treatment
-			var special = rspecialurl.test( name );
-
-			// Safari mis-reports the default selected property of an option
-			// Accessing the parent's selectedIndex property fixes it
-			if ( name === "selected" && !jQuery.support.optSelected ) {
-				var parent = elem.parentNode;
-				if ( parent ) {
-					parent.selectedIndex;
-	
-					// Make sure that it also works with optgroups, see #5701
-					if ( parent.parentNode ) {
-						parent.parentNode.selectedIndex;
-					}
-				}
-			}
-
-			// If applicable, access the attribute via the DOM 0 way
-			if ( name in elem && notxml && !special ) {
-				if ( set ) {
-					// We can't allow the type property to be changed (since it causes problems in IE)
-					if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
-						jQuery.error( "type property can't be changed" );
-					}
-
-					elem[ name ] = value;
-				}
-
-				// browsers index elements by id/name on forms, give priority to attributes.
-				if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
-					return elem.getAttributeNode( name ).nodeValue;
-				}
-
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				if ( name === "tabIndex" ) {
-					var attributeNode = elem.getAttributeNode( "tabIndex" );
-
-					return attributeNode && attributeNode.specified ?
-						attributeNode.value :
-						rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-							0 :
-							undefined;
-				}
-
-				return elem[ name ];
-			}
-
-			if ( !jQuery.support.style && notxml && name === "style" ) {
-				if ( set ) {
-					elem.style.cssText = "" + value;
-				}
-
-				return elem.style.cssText;
-			}
-
-			if ( set ) {
-				// convert the value to a string (all browsers do this but IE) see #1070
-				elem.setAttribute( name, "" + value );
-			}
-
-			var attr = !jQuery.support.hrefNormalized && notxml && special ?
-					// Some attributes require a special call on IE
-					elem.getAttribute( name, 2 ) :
-					elem.getAttribute( name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return attr === null ? undefined : attr;
-		}
-
-		// elem is actually elem.style ... set the style
-		// Using attr for specific style information is now deprecated. Use style instead.
-		return jQuery.style( elem, name, value );
-	}
-});
-var rnamespaces = /\.(.*)$/,
-	fcleanup = function( nm ) {
-		return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
-			return "\\" + ch;
-		});
-	};
-
-/*
- * A number of helper functions used for managing events.
- * Many of the ideas behind this code originated from
- * Dean Edwards' addEvent library.
- */
-jQuery.event = {
-
-	// Bind an event to an element
-	// Original by Dean Edwards
-	add: function( elem, types, handler, data ) {
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// For whatever reason, IE has trouble passing the window object
-		// around, causing it to be cloned in the process
-		if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) {
-			elem = window;
-		}
-
-		var handleObjIn, handleObj;
-
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-		}
-
-		// Make sure that the function being executed has a unique ID
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure
-		var elemData = jQuery.data( elem );
-
-		// If no elemData is found then we must be trying to bind to one of the
-		// banned noData elements
-		if ( !elemData ) {
-			return;
-		}
-
-		var events = elemData.events = elemData.events || {},
-			eventHandle = elemData.handle, eventHandle;
-
-		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function() {
-				// Handle the second event of a trigger and when
-				// an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
-					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-		}
-
-		// Add elem as a property of the handle function
-		// This is to prevent a memory leak with non-native events in IE.
-		eventHandle.elem = elem;
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		var type, i = 0, namespaces;
-
-		while ( (type = types[ i++ ]) ) {
-			handleObj = handleObjIn ?
-				jQuery.extend({}, handleObjIn) :
-				{ handler: handler, data: data };
-
-			// Namespaced event handlers
-			if ( type.indexOf(".") > -1 ) {
-				namespaces = type.split(".");
-				type = namespaces.shift();
-				handleObj.namespace = namespaces.slice(0).sort().join(".");
-
-			} else {
-				namespaces = [];
-				handleObj.namespace = "";
-			}
-
-			handleObj.type = type;
-			handleObj.guid = handler.guid;
-
-			// Get the current list of functions bound to this event
-			var handlers = events[ type ],
-				special = jQuery.event.special[ type ] || {};
-
-			// Init the event handler queue
-			if ( !handlers ) {
-				handlers = events[ type ] = [];
-
-				// Check for a special event handler
-				// Only use addEventListener/attachEvent if the special
-				// events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-			
-			if ( special.add ) { 
-				special.add.call( elem, handleObj ); 
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add the function to the element's handler list
-			handlers.push( handleObj );
-
-			// Keep track of which events have been used, for global triggering
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	global: {},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, pos ) {
-		// don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
-			elemData = jQuery.data( elem ),
-			events = elemData && elemData.events;
-
-		if ( !elemData || !events ) {
-			return;
-		}
-
-		// types is actually an event object here
-		if ( types && types.type ) {
-			handler = types.handler;
-			types = types.type;
-		}
-
-		// Unbind all events for the element
-		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
-			types = types || "";
-
-			for ( type in events ) {
-				jQuery.event.remove( elem, type + types );
-			}
-
-			return;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).unbind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		while ( (type = types[ i++ ]) ) {
-			origType = type;
-			handleObj = null;
-			all = type.indexOf(".") < 0;
-			namespaces = [];
-
-			if ( !all ) {
-				// Namespaced event handlers
-				namespaces = type.split(".");
-				type = namespaces.shift();
-
-				namespace = new RegExp("(^|\\.)" + 
-					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)")
-			}
-
-			eventType = events[ type ];
-
-			if ( !eventType ) {
-				continue;
-			}
-
-			if ( !handler ) {
-				for ( var j = 0; j < eventType.length; j++ ) {
-					handleObj = eventType[ j ];
-
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						jQuery.event.remove( elem, origType, handleObj.handler, j );
-						eventType.splice( j--, 1 );
-					}
-				}
-
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-
-			for ( var j = pos || 0; j < eventType.length; j++ ) {
-				handleObj = eventType[ j ];
-
-				if ( handler.guid === handleObj.guid ) {
-					// remove the given handler for the given type
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						if ( pos == null ) {
-							eventType.splice( j--, 1 );
-						}
-
-						if ( special.remove ) {
-							special.remove.call( elem, handleObj );
-						}
-					}
-
-					if ( pos != null ) {
-						break;
-					}
-				}
-			}
-
-			// remove generic event handler if no more handlers exist
-			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
-					removeEvent( elem, type, elemData.handle );
-				}
-
-				ret = null;
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			var handle = elemData.handle;
-			if ( handle ) {
-				handle.elem = null;
-			}
-
-			delete elemData.events;
-			delete elemData.handle;
-
-			if ( jQuery.isEmptyObject( elemData ) ) {
-				jQuery.removeData( elem );
-			}
-		}
-	},
-
-	// bubbling is internal
-	trigger: function( event, data, elem /*, bubbling */ ) {
-		// Event object or event type
-		var type = event.type || event,
-			bubbling = arguments[3];
-
-		if ( !bubbling ) {
-			event = typeof event === "object" ?
-				// jQuery.Event object
-				event[expando] ? event :
-				// Object literal
-				jQuery.extend( jQuery.Event(type), event ) :
-				// Just the event type (string)
-				jQuery.Event(type);
-
-			if ( type.indexOf("!") >= 0 ) {
-				event.type = type = type.slice(0, -1);
-				event.exclusive = true;
-			}
-
-			// Handle a global trigger
-			if ( !elem ) {
-				// Don't bubble custom events when global (to avoid too much overhead)
-				event.stopPropagation();
-
-				// Only trigger if we've ever bound an event for it
-				if ( jQuery.event.global[ type ] ) {
-					jQuery.each( jQuery.cache, function() {
-						if ( this.events && this.events[type] ) {
-							jQuery.event.trigger( event, data, this.handle.elem );
-						}
-					});
-				}
-			}
-
-			// Handle triggering a single element
-
-			// don't do events on text and comment nodes
-			if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-				return undefined;
-			}
-
-			// Clean up in case it is reused
-			event.result = undefined;
-			event.target = elem;
-
-			// Clone the incoming data, if any
-			data = jQuery.makeArray( data );
-			data.unshift( event );
-		}
-
-		event.currentTarget = elem;
-
-		// Trigger the event, it is assumed that "handle" is a function
-		var handle = jQuery.data( elem, "handle" );
-		if ( handle ) {
-			handle.apply( elem, data );
-		}
-
-		var parent = elem.parentNode || elem.ownerDocument;
-
-		// Trigger an inline bound script
-		try {
-			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
-				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
-					event.result = false;
-				}
-			}
-
-		// prevent IE from throwing an error for some elements with some event types, see #3533
-		} catch (e) {}
-
-		if ( !event.isPropagationStopped() && parent ) {
-			jQuery.event.trigger( event, data, parent, true );
-
-		} else if ( !event.isDefaultPrevented() ) {
-			var target = event.target, old,
-				isClick = jQuery.nodeName(target, "a") && type === "click",
-				special = jQuery.event.special[ type ] || {};
-
-			if ( (!special._default || special._default.call( elem, event ) === false) && 
-				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
-
-				try {
-					if ( target[ type ] ) {
-						// Make sure that we don't accidentally re-trigger the onFOO events
-						old = target[ "on" + type ];
-
-						if ( old ) {
-							target[ "on" + type ] = null;
-						}
-
-						jQuery.event.triggered = true;
-						target[ type ]();
-					}
-
-				// prevent IE from throwing an error for some elements with some event types, see #3533
-				} catch (e) {}
-
-				if ( old ) {
-					target[ "on" + type ] = old;
-				}
-
-				jQuery.event.triggered = false;
-			}
-		}
-	},
-
-	handle: function( event ) {
-		var all, handlers, namespaces, namespace, events;
-
-		event = arguments[0] = jQuery.event.fix( event || window.event );
-		event.currentTarget = this;
-
-		// Namespaced event handlers
-		all = event.type.indexOf(".") < 0 && !event.exclusive;
-
-		if ( !all ) {
-			namespaces = event.type.split(".");
-			event.type = namespaces.shift();
-			namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
-		}
-
-		var events = jQuery.data(this, "events"), handlers = events[ event.type ];
-
-		if ( events && handlers ) {
-			// Clone the handlers to prevent manipulation
-			handlers = handlers.slice(0);
-
-			for ( var j = 0, l = handlers.length; j < l; j++ ) {
-				var handleObj = handlers[ j ];
-
-				// Filter the functions by class
-				if ( all || namespace.test( handleObj.namespace ) ) {
-					// Pass in a reference to the handler function itself
-					// So that we can later remove it
-					event.handler = handleObj.handler;
-					event.data = handleObj.data;
-					event.handleObj = handleObj;
-	
-					var ret = handleObj.handler.apply( this, arguments );
-
-					if ( ret !== undefined ) {
-						event.result = ret;
-						if ( ret === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-
-					if ( event.isImmediatePropagationStopped() ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-
-	fix: function( event ) {
-		if ( event[ expando ] ) {
-			return event;
-		}
-
-		// store a copy of the original event object
-		// and "clone" to set read-only properties
-		var originalEvent = event;
-		event = jQuery.Event( originalEvent );
-
-		for ( var i = this.props.length, prop; i; ) {
-			prop = this.props[ --i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Fix target property, if necessary
-		if ( !event.target ) {
-			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
-		}
-
-		// check if target is a textnode (safari)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Add relatedTarget, if necessary
-		if ( !event.relatedTarget && event.fromElement ) {
-			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
-		}
-
-		// Calculate pageX/Y if missing and clientX/Y available
-		if ( event.pageX == null && event.clientX != null ) {
-			var doc = document.documentElement, body = document.body;
-			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
-			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
-		}
-
-		// Add which for key events
-		if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) {
-			event.which = event.charCode || event.keyCode;
-		}
-
-		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
-		if ( !event.metaKey && event.ctrlKey ) {
-			event.metaKey = event.ctrlKey;
-		}
-
-		// Add which for click: 1 === left; 2 === middle; 3 === right
-		// Note: button is not normalized, so don't use it
-		if ( !event.which && event.button !== undefined ) {
-			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
-		}
-
-		return event;
-	},
-
-	// Deprecated, use jQuery.guid instead
-	guid: 1E8,
-
-	// Deprecated, use jQuery.proxy instead
-	proxy: jQuery.proxy,
-
-	special: {
-		ready: {
-			// Make sure the ready event is setup
-			setup: jQuery.bindReady,
-			teardown: jQuery.noop
-		},
-
-		live: {
-			add: function( handleObj ) {
-				jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) ); 
-			},
-
-			remove: function( handleObj ) {
-				var remove = true,
-					type = handleObj.origType.replace(rnamespaces, "");
-				
-				jQuery.each( jQuery.data(this, "events").live || [], function() {
-					if ( type === this.origType.replace(rnamespaces, "") ) {
-						remove = false;
-						return false;
-					}
-				});
-
-				if ( remove ) {
-					jQuery.event.remove( this, handleObj.origType, liveHandler );
-				}
-			}
-
-		},
-
-		beforeunload: {
-			setup: function( data, namespaces, eventHandle ) {
-				// We only want to do this special case on windows
-				if ( this.setInterval ) {
-					this.onbeforeunload = eventHandle;
-				}
-
-				return false;
-			},
-			teardown: function( namespaces, eventHandle ) {
-				if ( this.onbeforeunload === eventHandle ) {
-					this.onbeforeunload = null;
-				}
-			}
-		}
-	}
-};
-
-var removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		elem.removeEventListener( type, handle, false );
-	} : 
-	function( elem, type, handle ) {
-		elem.detachEvent( "on" + type, handle );
-	};
-
-jQuery.Event = function( src ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !this.preventDefault ) {
-		return new jQuery.Event( src );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// timeStamp is buggy for some events on Firefox(#3843)
-	// So we won't rely on the native value
-	this.timeStamp = now();
-
-	// Mark it as fixed
-	this[ expando ] = true;
-};
-
-function returnFalse() {
-	return false;
-}
-function returnTrue() {
-	return true;
-}
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	preventDefault: function() {
-		this.isDefaultPrevented = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-		
-		// if preventDefault exists run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-		}
-		// otherwise set the returnValue property of the original event to false (IE)
-		e.returnValue = false;
-	},
-	stopPropagation: function() {
-		this.isPropagationStopped = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-		// if stopPropagation exists run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-		// otherwise set the cancelBubble property of the original event to true (IE)
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	},
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse
-};
-
-// Checks if an event happened on an element within another element
-// Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function( event ) {
-	// Check if mouse(over|out) are still within the same parent element
-	var parent = event.relatedTarget;
-
-	// Firefox sometimes assigns relatedTarget a XUL element
-	// which we cannot access the parentNode property of
-	try {
-		// Traverse up the tree
-		while ( parent && parent !== this ) {
-			parent = parent.parentNode;
-		}
-
-		if ( parent !== this ) {
-			// set the correct event type
-			event.type = event.data;
-
-			// handle event if we actually just moused on to a non sub-element
-			jQuery.event.handle.apply( this, arguments );
-		}
-
-	// assuming we've left the element since we most likely mousedover a xul element
-	} catch(e) { }
-},
-
-// In case of event delegation, we only need to rename the event.type,
-// liveHandler will take care of the rest.
-delegate = function( event ) {
-	event.type = event.data;
-	jQuery.event.handle.apply( this, arguments );
-};
-
-// Create mouseenter and mouseleave events
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		setup: function( data ) {
-			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
-		},
-		teardown: function( data ) {
-			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
-		}
-	};
-});
-
-// submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function( data, namespaces ) {
-			if ( this.nodeName.toLowerCase() !== "form" ) {
-				jQuery.event.add(this, "click.specialSubmit", function( e ) {
-					var elem = e.target, type = elem.type;
-
-					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
-						return trigger( "submit", this, arguments );
-					}
-				});
-	 
-				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
-					var elem = e.target, type = elem.type;
-
-					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
-						return trigger( "submit", this, arguments );
-					}
-				});
-
-			} else {
-				return false;
-			}
-		},
-
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialSubmit" );
-		}
-	};
-
-}
-
-// change delegation, happens here so we have bind.
-if ( !jQuery.support.changeBubbles ) {
-
-	var formElems = /textarea|input|select/i,
-
-	changeFilters,
-
-	getVal = function( elem ) {
-		var type = elem.type, val = elem.value;
-
-		if ( type === "radio" || type === "checkbox" ) {
-			val = elem.checked;
-
-		} else if ( type === "select-multiple" ) {
-			val = elem.selectedIndex > -1 ?
-				jQuery.map( elem.options, function( elem ) {
-					return elem.selected;
-				}).join("-") :
-				"";
-
-		} else if ( elem.nodeName.toLowerCase() === "select" ) {
-			val = elem.selectedIndex;
-		}
-
-		return val;
-	},
-
-	testChange = function testChange( e ) {
-		var elem = e.target, data, val;
-
-		if ( !formElems.test( elem.nodeName ) || elem.readOnly ) {
-			return;
-		}
-
-		data = jQuery.data( elem, "_change_data" );
-		val = getVal(elem);
-
-		// the current data will be also retrieved by beforeactivate
-		if ( e.type !== "focusout" || elem.type !== "radio" ) {
-			jQuery.data( elem, "_change_data", val );
-		}
-		
-		if ( data === undefined || val === data ) {
-			return;
-		}
-
-		if ( data != null || val ) {
-			e.type = "change";
-			return jQuery.event.trigger( e, arguments[1], elem );
-		}
-	};
-
-	jQuery.event.special.change = {
-		filters: {
-			focusout: testChange, 
-
-			click: function( e ) {
-				var elem = e.target, type = elem.type;
-
-				if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
-					return testChange.call( this, e );
-				}
-			},
-
-			// Change has to be called before submit
-			// Keydown will be called before keypress, which is used in submit-event delegation
-			keydown: function( e ) {
-				var elem = e.target, type = elem.type;
-
-				if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
-					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
-					type === "select-multiple" ) {
-					return testChange.call( this, e );
-				}
-			},
-
-			// Beforeactivate happens also before the previous element is blurred
-			// with this event you can't trigger a change event, but you can store
-			// information/focus[in] is not needed anymore
-			beforeactivate: function( e ) {
-				var elem = e.target;
-				jQuery.data( elem, "_change_data", getVal(elem) );
-			}
-		},
-
-		setup: function( data, namespaces ) {
-			if ( this.type === "file" ) {
-				return false;
-			}
-
-			for ( var type in changeFilters ) {
-				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
-			}
-
-			return formElems.test( this.nodeName );
-		},
-
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialChange" );
-
-			return formElems.test( this.nodeName );
-		}
-	};
-
-	changeFilters = jQuery.event.special.change.filters;
-}
-
-function trigger( type, elem, args ) {
-	args[0].type = type;
-	return jQuery.event.handle.apply( elem, args );
-}
-
-// Create "bubbling" focus and blur events
-if ( document.addEventListener ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				this.addEventListener( orig, handler, true );
-			}, 
-			teardown: function() { 
-				this.removeEventListener( orig, handler, true );
-			}
-		};
-
-		function handler( e ) { 
-			e = jQuery.event.fix( e );
-			e.type = fix;
-			return jQuery.event.handle.call( this, e );
-		}
-	});
-}
-
-jQuery.each(["bind", "one"], function( i, name ) {
-	jQuery.fn[ name ] = function( type, data, fn ) {
-		// Handle object literals
-		if ( typeof type === "object" ) {
-			for ( var key in type ) {
-				this[ name ](key, data, type[key], fn);
-			}
-			return this;
-		}
-		
-		if ( jQuery.isFunction( data ) ) {
-			fn = data;
-			data = undefined;
-		}
-
-		var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
-			jQuery( this ).unbind( event, handler );
-			return fn.apply( this, arguments );
-		}) : fn;
-
-		if ( type === "unload" && name !== "one" ) {
-			this.one( type, data, fn );
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.add( this[i], type, handler, data );
-			}
-		}
-
-		return this;
-	};
-});
-
-jQuery.fn.extend({
-	unbind: function( type, fn ) {
-		// Handle object literals
-		if ( typeof type === "object" && !type.preventDefault ) {
-			for ( var key in type ) {
-				this.unbind(key, type[key]);
-			}
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.remove( this[i], type, fn );
-			}
-		}
-
-		return this;
-	},
-	
-	delegate: function( selector, types, data, fn ) {
-		return this.live( types, data, fn, selector );
-	},
-	
-	undelegate: function( selector, types, fn ) {
-		if ( arguments.length === 0 ) {
-				return this.unbind( "live" );
-		
-		} else {
-			return this.die( types, null, fn, selector );
-		}
-	},
-	
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-
-	triggerHandler: function( type, data ) {
-		if ( this[0] ) {
-			var event = jQuery.Event( type );
-			event.preventDefault();
-			event.stopPropagation();
-			jQuery.event.trigger( event, data, this[0] );
-			return event.result;
-		}
-	},
-
-	toggle: function( fn ) {
-		// Save reference to arguments for access in closure
-		var args = arguments, i = 1;
-
-		// link all the functions, so any of them can unbind this click handler
-		while ( i < args.length ) {
-			jQuery.proxy( fn, args[ i++ ] );
-		}
-
-		return this.click( jQuery.proxy( fn, function( event ) {
-			// Figure out which function to execute
-			var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-			jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-			// Make sure that clicks stop
-			event.preventDefault();
-
-			// and execute the function
-			return args[ lastToggle ].apply( this, arguments ) || false;
-		}));
-	},
-
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-});
-
-var liveMap = {
-	focus: "focusin",
-	blur: "focusout",
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-};
-
-jQuery.each(["live", "die"], function( i, name ) {
-	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
-		var type, i = 0, match, namespaces, preType,
-			selector = origSelector || this.selector,
-			context = origSelector ? this : jQuery( this.context );
-
-		if ( jQuery.isFunction( data ) ) {
-			fn = data;
-			data = undefined;
-		}
-
-		types = (types || "").split(" ");
-
-		while ( (type = types[ i++ ]) != null ) {
-			match = rnamespaces.exec( type );
-			namespaces = "";
-
-			if ( match )  {
-				namespaces = match[0];
-				type = type.replace( rnamespaces, "" );
-			}
-
-			if ( type === "hover" ) {
-				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
-				continue;
-			}
-
-			preType = type;
-
-			if ( type === "focus" || type === "blur" ) {
-				types.push( liveMap[ type ] + namespaces );
-				type = type + namespaces;
-
-			} else {
-				type = (liveMap[ type ] || type) + namespaces;
-			}
-
-			if ( name === "live" ) {
-				// bind live handler
-				context.each(function(){
-					jQuery.event.add( this, liveConvert( type, selector ),
-						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
-				});
-
-			} else {
-				// unbind live handler
-				context.unbind( liveConvert( type, selector ), fn );
-			}
-		}
-		
-		return this;
-	}
-});
-
-function liveHandler( event ) {
-	var stop, elems = [], selectors = [], args = arguments,
-		related, match, handleObj, elem, j, i, l, data,
-		events = jQuery.data( this, "events" );
-
-	// Make sure we avoid non-left-click bubbling in Firefox (#3861)
-	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
-		return;
-	}
-
-	event.liveFired = this;
-
-	var live = events.live.slice(0);
-
-	for ( j = 0; j < live.length; j++ ) {
-		handleObj = live[j];
-
-		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
-			selectors.push( handleObj.selector );
-
-		} else {
-			live.splice( j--, 1 );
-		}
-	}
-
-	match = jQuery( event.target ).closest( selectors, event.currentTarget );
-
-	for ( i = 0, l = match.length; i < l; i++ ) {
-		for ( j = 0; j < live.length; j++ ) {
-			handleObj = live[j];
-
-			if ( match[i].selector === handleObj.selector ) {
-				elem = match[i].elem;
-				related = null;
-
-				// Those two events require additional checking
-				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
-					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
-				}
-
-				if ( !related || related !== elem ) {
-					elems.push({ elem: elem, handleObj: handleObj });
-				}
-			}
-		}
-	}
-
-	for ( i = 0, l = elems.length; i < l; i++ ) {
-		match = elems[i];
-		event.currentTarget = match.elem;
-		event.data = match.handleObj.data;
-		event.handleObj = match.handleObj;
-
-		if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) {
-			stop = false;
-			break;
-		}
-	}
-
-	return stop;
-}
-
-function liveConvert( type, selector ) {
-	return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&");
-}
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( fn ) {
-		return fn ? this.bind( name, fn ) : this.trigger( name );
-	};
-
-	if ( jQuery.attrFn ) {
-		jQuery.attrFn[ name ] = true;
-	}
-});
-
-// Prevent memory leaks in IE
-// Window isn't included so as not to unbind existing unload events
-// More info:
-//  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
-if ( window.attachEvent && !window.addEventListener ) {
-	window.attachEvent("onunload", function() {
-		for ( var id in jQuery.cache ) {
-			if ( jQuery.cache[ id ].handle ) {
-				// Try/Catch is to handle iframes being unloaded, see #4280
-				try {
-					jQuery.event.remove( jQuery.cache[ id ].handle.elem );
-				} catch(e) {}
-			}
-		}
-	});
-}
-/*!
- * Sizzle CSS Selector Engine - v1.0
- *  Copyright 2009, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){
-
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-	done = 0,
-	toString = Object.prototype.toString,
-	hasDuplicate = false,
-	baseHasDuplicate = true;
-
-// Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
-// function. If that is the case, discard the hasDuplicate value.
-//   Thus far that includes Google Chrome.
-[0, 0].sort(function(){
-	baseHasDuplicate = false;
-	return 0;
-});
-
-var Sizzle = function(selector, context, results, seed) {
-	results = results || [];
-	var origContext = context = context || document;
-
-	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
-		return [];
-	}
-	
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	var parts = [], m, set, checkSet, extra, prune = true, contextXML = isXML(context),
-		soFar = selector;
-	
-	// Reset the position of the chunker regexp (start from head)
-	while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) {
-		soFar = m[3];
-		
-		parts.push( m[1] );
-		
-		if ( m[2] ) {
-			extra = m[3];
-			break;
-		}
-	}
-
-	if ( parts.length > 1 && origPOS.exec( selector ) ) {
-		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
-			set = posProcess( parts[0] + parts[1], context );
-		} else {
-			set = Expr.relative[ parts[0] ] ?
-				[ context ] :
-				Sizzle( parts.shift(), context );
-
-			while ( parts.length ) {
-				selector = parts.shift();
-
-				if ( Expr.relative[ selector ] ) {
-					selector += parts.shift();
-				}
-				
-				set = posProcess( selector, set );
-			}
-		}
-	} else {
-		// Take a shortcut and set the context if the root selector is an ID
-		// (but not if it'll be faster if the inner selector is an ID)
-		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
-				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
-			var ret = Sizzle.find( parts.shift(), context, contextXML );
-			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
-		}
-
-		if ( context ) {
-			var ret = seed ?
-				{ expr: parts.pop(), set: makeArray(seed) } :
-				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
-			set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;
-
-			if ( parts.length > 0 ) {
-				checkSet = makeArray(set);
-			} else {
-				prune = false;
-			}
-
-			while ( parts.length ) {
-				var cur = parts.pop(), pop = cur;
-
-				if ( !Expr.relative[ cur ] ) {
-					cur = "";
-				} else {
-					pop = parts.pop();
-				}
-
-				if ( pop == null ) {
-					pop = context;
-				}
-
-				Expr.relative[ cur ]( checkSet, pop, contextXML );
-			}
-		} else {
-			checkSet = parts = [];
-		}
-	}
-
-	if ( !checkSet ) {
-		checkSet = set;
-	}
-
-	if ( !checkSet ) {
-		Sizzle.error( cur || selector );
-	}
-
-	if ( toString.call(checkSet) === "[object Array]" ) {
-		if ( !prune ) {
-			results.push.apply( results, checkSet );
-		} else if ( context && context.nodeType === 1 ) {
-			for ( var i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
-					results.push( set[i] );
-				}
-			}
-		} else {
-			for ( var i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
-					results.push( set[i] );
-				}
-			}
-		}
-	} else {
-		makeArray( checkSet, results );
-	}
-
-	if ( extra ) {
-		Sizzle( extra, origContext, results, seed );
-		Sizzle.uniqueSort( results );
-	}
-
-	return results;
-};
-
-Sizzle.uniqueSort = function(results){
-	if ( sortOrder ) {
-		hasDuplicate = baseHasDuplicate;
-		results.sort(sortOrder);
-
-		if ( hasDuplicate ) {
-			for ( var i = 1; i < results.length; i++ ) {
-				if ( results[i] === results[i-1] ) {
-					results.splice(i--, 1);
-				}
-			}
-		}
-	}
-
-	return results;
-};
-
-Sizzle.matches = function(expr, set){
-	return Sizzle(expr, null, null, set);
-};
-
-Sizzle.find = function(expr, context, isXML){
-	var set, match;
-
-	if ( !expr ) {
-		return [];
-	}
-
-	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
-		var type = Expr.order[i], match;
-		
-		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
-			var left = match[1];
-			match.splice(1,1);
-
-			if ( left.substr( left.length - 1 ) !== "\\" ) {
-				match[1] = (match[1] || "").replace(/\\/g, "");
-				set = Expr.find[ type ]( match, context, isXML );
-				if ( set != null ) {
-					expr = expr.replace( Expr.match[ type ], "" );
-					break;
-				}
-			}
-		}
-	}
-
-	if ( !set ) {
-		set = context.getElementsByTagName("*");
-	}
-
-	return {set: set, expr: expr};
-};
-
-Sizzle.filter = function(expr, set, inplace, not){
-	var old = expr, result = [], curLoop = set, match, anyFound,
-		isXMLFilter = set && set[0] && isXML(set[0]);
-
-	while ( expr && set.length ) {
-		for ( var type in Expr.filter ) {
-			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
-				var filter = Expr.filter[ type ], found, item, left = match[1];
-				anyFound = false;
-
-				match.splice(1,1);
-
-				if ( left.substr( left.length - 1 ) === "\\" ) {
-					continue;
-				}
-
-				if ( curLoop === result ) {
-					result = [];
-				}
-
-				if ( Expr.preFilter[ type ] ) {
-					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
-
-					if ( !match ) {
-						anyFound = found = true;
-					} else if ( match === true ) {
-						continue;
-					}
-				}
-
-				if ( match ) {
-					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
-						if ( item ) {
-							found = filter( item, match, i, curLoop );
-							var pass = not ^ !!found;
-
-							if ( inplace && found != null ) {
-								if ( pass ) {
-									anyFound = true;
-								} else {
-									curLoop[i] = false;
-								}
-							} else if ( pass ) {
-								result.push( item );
-								anyFound = true;
-							}
-						}
-					}
-				}
-
-				if ( found !== undefined ) {
-					if ( !inplace ) {
-						curLoop = result;
-					}
-
-					expr = expr.replace( Expr.match[ type ], "" );
-
-					if ( !anyFound ) {
-						return [];
-					}
-
-					break;
-				}
-			}
-		}
-
-		// Improper expression
-		if ( expr === old ) {
-			if ( anyFound == null ) {
-				Sizzle.error( expr );
-			} else {
-				break;
-			}
-		}
-
-		old = expr;
-	}
-
-	return curLoop;
-};
-
-Sizzle.error = function( msg ) {
-	throw "Syntax error, unrecognized expression: " + msg;
-};
-
-var Expr = Sizzle.selectors = {
-	order: [ "ID", "NAME", "TAG" ],
-	match: {
-		ID: /#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-		CLASS: /\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,
-		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
-		TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,
-		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
-		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
-		PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
-	},
-	leftMatch: {},
-	attrMap: {
-		"class": "className",
-		"for": "htmlFor"
-	},
-	attrHandle: {
-		href: function(elem){
-			return elem.getAttribute("href");
-		}
-	},
-	relative: {
-		"+": function(checkSet, part){
-			var isPartStr = typeof part === "string",
-				isTag = isPartStr && !/\W/.test(part),
-				isPartStrNotTag = isPartStr && !isTag;
-
-			if ( isTag ) {
-				part = part.toLowerCase();
-			}
-
-			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
-				if ( (elem = checkSet[i]) ) {
-					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
-
-					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
-						elem || false :
-						elem === part;
-				}
-			}
-
-			if ( isPartStrNotTag ) {
-				Sizzle.filter( part, checkSet, true );
-			}
-		},
-		">": function(checkSet, part){
-			var isPartStr = typeof part === "string";
-
-			if ( isPartStr && !/\W/.test(part) ) {
-				part = part.toLowerCase();
-
-				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-					var elem = checkSet[i];
-					if ( elem ) {
-						var parent = elem.parentNode;
-						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
-					}
-				}
-			} else {
-				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-					var elem = checkSet[i];
-					if ( elem ) {
-						checkSet[i] = isPartStr ?
-							elem.parentNode :
-							elem.parentNode === part;
-					}
-				}
-
-				if ( isPartStr ) {
-					Sizzle.filter( part, checkSet, true );
-				}
-			}
-		},
-		"": function(checkSet, part, isXML){
-			var doneName = done++, checkFn = dirCheck;
-
-			if ( typeof part === "string" && !/\W/.test(part) ) {
-				var nodeCheck = part = part.toLowerCase();
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
-		},
-		"~": function(checkSet, part, isXML){
-			var doneName = done++, checkFn = dirCheck;
-
-			if ( typeof part === "string" && !/\W/.test(part) ) {
-				var nodeCheck = part = part.toLowerCase();
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
-		}
-	},
-	find: {
-		ID: function(match, context, isXML){
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-				return m ? [m] : [];
-			}
-		},
-		NAME: function(match, context){
-			if ( typeof context.getElementsByName !== "undefined" ) {
-				var ret = [], results = context.getElementsByName(match[1]);
-
-				for ( var i = 0, l = results.length; i < l; i++ ) {
-					if ( results[i].getAttribute("name") === match[1] ) {
-						ret.push( results[i] );
-					}
-				}
-
-				return ret.length === 0 ? null : ret;
-			}
-		},
-		TAG: function(match, context){
-			return context.getElementsByTagName(match[1]);
-		}
-	},
-	preFilter: {
-		CLASS: function(match, curLoop, inplace, result, not, isXML){
-			match = " " + match[1].replace(/\\/g, "") + " ";
-
-			if ( isXML ) {
-				return match;
-			}
-
-			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
-				if ( elem ) {
-					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
-						if ( !inplace ) {
-							result.push( elem );
-						}
-					} else if ( inplace ) {
-						curLoop[i] = false;
-					}
-				}
-			}
-
-			return false;
-		},
-		ID: function(match){
-			return match[1].replace(/\\/g, "");
-		},
-		TAG: function(match, curLoop){
-			return match[1].toLowerCase();
-		},
-		CHILD: function(match){
-			if ( match[1] === "nth" ) {
-				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
-					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
-					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
-
-				// calculate the numbers (first)n+(last) including if they are negative
-				match[2] = (test[1] + (test[2] || 1)) - 0;
-				match[3] = test[3] - 0;
-			}
-
-			// TODO: Move to normal caching system
-			match[0] = done++;
-
-			return match;
-		},
-		ATTR: function(match, curLoop, inplace, result, not, isXML){
-			var name = match[1].replace(/\\/g, "");
-			
-			if ( !isXML && Expr.attrMap[name] ) {
-				match[1] = Expr.attrMap[name];
-			}
-
-			if ( match[2] === "~=" ) {
-				match[4] = " " + match[4] + " ";
-			}
-
-			return match;
-		},
-		PSEUDO: function(match, curLoop, inplace, result, not){
-			if ( match[1] === "not" ) {
-				// If we're dealing with a complex expression, or a simple one
-				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
-					match[3] = Sizzle(match[3], null, null, curLoop);
-				} else {
-					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
-					if ( !inplace ) {
-						result.push.apply( result, ret );
-					}
-					return false;
-				}
-			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
-				return true;
-			}
-			
-			return match;
-		},
-		POS: function(match){
-			match.unshift( true );
-			return match;
-		}
-	},
-	filters: {
-		enabled: function(elem){
-			return elem.disabled === false && elem.type !== "hidden";
-		},
-		disabled: function(elem){
-			return elem.disabled === true;
-		},
-		checked: function(elem){
-			return elem.checked === true;
-		},
-		selected: function(elem){
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			elem.parentNode.selectedIndex;
-			return elem.selected === true;
-		},
-		parent: function(elem){
-			return !!elem.firstChild;
-		},
-		empty: function(elem){
-			return !elem.firstChild;
-		},
-		has: function(elem, i, match){
-			return !!Sizzle( match[3], elem ).length;
-		},
-		header: function(elem){
-			return /h\d/i.test( elem.nodeName );
-		},
-		text: function(elem){
-			return "text" === elem.type;
-		},
-		radio: function(elem){
-			return "radio" === elem.type;
-		},
-		checkbox: function(elem){
-			return "checkbox" === elem.type;
-		},
-		file: function(elem){
-			return "file" === elem.type;
-		},
-		password: function(elem){
-			return "password" === elem.type;
-		},
-		submit: function(elem){
-			return "submit" === elem.type;
-		},
-		image: function(elem){
-			return "image" === elem.type;
-		},
-		reset: function(elem){
-			return "reset" === elem.type;
-		},
-		button: function(elem){
-			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
-		},
-		input: function(elem){
-			return /input|select|textarea|button/i.test(elem.nodeName);
-		}
-	},
-	setFilters: {
-		first: function(elem, i){
-			return i === 0;
-		},
-		last: function(elem, i, match, array){
-			return i === array.length - 1;
-		},
-		even: function(elem, i){
-			return i % 2 === 0;
-		},
-		odd: function(elem, i){
-			return i % 2 === 1;
-		},
-		lt: function(elem, i, match){
-			return i < match[3] - 0;
-		},
-		gt: function(elem, i, match){
-			return i > match[3] - 0;
-		},
-		nth: function(elem, i, match){
-			return match[3] - 0 === i;
-		},
-		eq: function(elem, i, match){
-			return match[3] - 0 === i;
-		}
-	},
-	filter: {
-		PSEUDO: function(elem, match, i, array){
-			var name = match[1], filter = Expr.filters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-			} else if ( name === "contains" ) {
-				return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0;
-			} else if ( name === "not" ) {
-				var not = match[3];
-
-				for ( var i = 0, l = not.length; i < l; i++ ) {
-					if ( not[i] === elem ) {
-						return false;
-					}
-				}
-
-				return true;
-			} else {
-				Sizzle.error( "Syntax error, unrecognized expression: " + name );
-			}
-		},
-		CHILD: function(elem, match){
-			var type = match[1], node = elem;
-			switch (type) {
-				case 'only':
-				case 'first':
-					while ( (node = node.previousSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
-					if ( type === "first" ) { 
-						return true; 
-					}
-					node = elem;
-				case 'last':
-					while ( (node = node.nextSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
-					return true;
-				case 'nth':
-					var first = match[2], last = match[3];
-
-					if ( first === 1 && last === 0 ) {
-						return true;
-					}
-					
-					var doneName = match[0],
-						parent = elem.parentNode;
-	
-					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
-						var count = 0;
-						for ( node = parent.firstChild; node; node = node.nextSibling ) {
-							if ( node.nodeType === 1 ) {
-								node.nodeIndex = ++count;
-							}
-						} 
-						parent.sizcache = doneName;
-					}
-					
-					var diff = elem.nodeIndex - last;
-					if ( first === 0 ) {
-						return diff === 0;
-					} else {
-						return ( diff % first === 0 && diff / first >= 0 );
-					}
-			}
-		},
-		ID: function(elem, match){
-			return elem.nodeType === 1 && elem.getAttribute("id") === match;
-		},
-		TAG: function(elem, match){
-			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
-		},
-		CLASS: function(elem, match){
-			return (" " + (elem.className || elem.getAttribute("class")) + " ")
-				.indexOf( match ) > -1;
-		},
-		ATTR: function(elem, match){
-			var name = match[1],
-				result = Expr.attrHandle[ name ] ?
-					Expr.attrHandle[ name ]( elem ) :
-					elem[ name ] != null ?
-						elem[ name ] :
-						elem.getAttribute( name ),
-				value = result + "",
-				type = match[2],
-				check = match[4];
-
-			return result == null ?
-				type === "!=" :
-				type === "=" ?
-				value === check :
-				type === "*=" ?
-				value.indexOf(check) >= 0 :
-				type === "~=" ?
-				(" " + value + " ").indexOf(check) >= 0 :
-				!check ?
-				value && result !== false :
-				type === "!=" ?
-				value !== check :
-				type === "^=" ?
-				value.indexOf(check) === 0 :
-				type === "$=" ?
-				value.substr(value.length - check.length) === check :
-				type === "|=" ?
-				value === check || value.substr(0, check.length + 1) === check + "-" :
-				false;
-		},
-		POS: function(elem, match, i, array){
-			var name = match[2], filter = Expr.setFilters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-			}
-		}
-	}
-};
-
-var origPOS = Expr.match.POS;
-
-for ( var type in Expr.match ) {
-	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );
-	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, function(all, num){
-		return "\\" + (num - 0 + 1);
-	}));
-}
-
-var makeArray = function(array, results) {
-	array = Array.prototype.slice.call( array, 0 );
-
-	if ( results ) {
-		results.push.apply( results, array );
-		return results;
-	}
-	
-	return array;
-};
-
-// Perform a simple check to determine if the browser is capable of
-// converting a NodeList to an array using builtin methods.
-// Also verifies that the returned array holds DOM nodes
-// (which is not the case in the Blackberry browser)
-try {
-	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
-
-// Provide a fallback method if it does not work
-} catch(e){
-	makeArray = function(array, results) {
-		var ret = results || [];
-
-		if ( toString.call(array) === "[object Array]" ) {
-			Array.prototype.push.apply( ret, array );
-		} else {
-			if ( typeof array.length === "number" ) {
-				for ( var i = 0, l = array.length; i < l; i++ ) {
-					ret.push( array[i] );
-				}
-			} else {
-				for ( var i = 0; array[i]; i++ ) {
-					ret.push( array[i] );
-				}
-			}
-		}
-
-		return ret;
-	};
-}
-
-var sortOrder;
-
-if ( document.documentElement.compareDocumentPosition ) {
-	sortOrder = function( a, b ) {
-		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
-			return a.compareDocumentPosition ? -1 : 1;
-		}
-
-		var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
-		if ( ret === 0 ) {
-			hasDuplicate = true;
-		}
-		return ret;
-	};
-} else if ( "sourceIndex" in document.documentElement ) {
-	sortOrder = function( a, b ) {
-		if ( !a.sourceIndex || !b.sourceIndex ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
-			return a.sourceIndex ? -1 : 1;
-		}
-
-		var ret = a.sourceIndex - b.sourceIndex;
-		if ( ret === 0 ) {
-			hasDuplicate = true;
-		}
-		return ret;
-	};
-} else if ( document.createRange ) {
-	sortOrder = function( a, b ) {
-		if ( !a.ownerDocument || !b.ownerDocument ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
-			return a.ownerDocument ? -1 : 1;
-		}
-
-		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
-		aRange.setStart(a, 0);
-		aRange.setEnd(a, 0);
-		bRange.setStart(b, 0);
-		bRange.setEnd(b, 0);
-		var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
-		if ( ret === 0 ) {
-			hasDuplicate = true;
-		}
-		return ret;
-	};
-}
-
-// Utility function for retreiving the text value of an array of DOM nodes
-function getText( elems ) {
-	var ret = "", elem;
-
-	for ( var i = 0; elems[i]; i++ ) {
-		elem = elems[i];
-
-		// Get the text from text nodes and CDATA nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
-			ret += elem.nodeValue;
-
-		// Traverse everything else, except comment nodes
-		} else if ( elem.nodeType !== 8 ) {
-			ret += getText( elem.childNodes );
-		}
-	}
-
-	return ret;
-}
-
-// Check to see if the browser returns elements by name when
-// querying by getElementById (and provide a workaround)
-(function(){
-	// We're going to inject a fake input element with a specified name
-	var form = document.createElement("div"),
-		id = "script" + (new Date).getTime();
-	form.innerHTML = "<a name='" + id + "'/>";
-
-	// Inject it into the root element, check its status, and remove it quickly
-	var root = document.documentElement;
-	root.insertBefore( form, root.firstChild );
-
-	// The workaround has to do additional checks after a getElementById
-	// Which slows things down for other browsers (hence the branching)
-	if ( document.getElementById( id ) ) {
-		Expr.find.ID = function(match, context, isXML){
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-				return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
-			}
-		};
-
-		Expr.filter.ID = function(elem, match){
-			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-			return elem.nodeType === 1 && node && node.nodeValue === match;
-		};
-	}
-
-	root.removeChild( form );
-	root = form = null; // release memory in IE
-})();
-
-(function(){
-	// Check to see if the browser returns only elements
-	// when doing getElementsByTagName("*")
-
-	// Create a fake element
-	var div = document.createElement("div");
-	div.appendChild( document.createComment("") );
-
-	// Make sure no comments are found
-	if ( div.getElementsByTagName("*").length > 0 ) {
-		Expr.find.TAG = function(match, context){
-			var results = context.getElementsByTagName(match[1]);
-
-			// Filter out possible comments
-			if ( match[1] === "*" ) {
-				var tmp = [];
-
-				for ( var i = 0; results[i]; i++ ) {
-					if ( results[i].nodeType === 1 ) {
-						tmp.push( results[i] );
-					}
-				}
-
-				results = tmp;
-			}
-
-			return results;
-		};
-	}
-
-	// Check to see if an attribute returns normalized href attributes
-	div.innerHTML = "<a href='#'></a>";
-	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
-			div.firstChild.getAttribute("href") !== "#" ) {
-		Expr.attrHandle.href = function(elem){
-			return elem.getAttribute("href", 2);
-		};
-	}
-
-	div = null; // release memory in IE
-})();
-
-if ( document.querySelectorAll ) {
-	(function(){
-		var oldSizzle = Sizzle, div = document.createElement("div");
-		div.innerHTML = "<p class='TEST'></p>";
-
-		// Safari can't handle uppercase or unicode characters when
-		// in quirks mode.
-		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
-			return;
-		}
-	
-		Sizzle = function(query, context, extra, seed){
-			context = context || document;
-
-			// Only use querySelectorAll on non-XML documents
-			// (ID selectors don't work in non-HTML documents)
-			if ( !seed && context.nodeType === 9 && !isXML(context) ) {
-				try {
-					return makeArray( context.querySelectorAll(query), extra );
-				} catch(e){}
-			}
-		
-			return oldSizzle(query, context, extra, seed);
-		};
-
-		for ( var prop in oldSizzle ) {
-			Sizzle[ prop ] = oldSizzle[ prop ];
-		}
-
-		div = null; // release memory in IE
-	})();
-}
-
-(function(){
-	var div = document.createElement("div");
-
-	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
-
-	// Opera can't find a second classname (in 9.6)
-	// Also, make sure that getElementsByClassName actually exists
-	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
-		return;
-	}
-
-	// Safari caches class attributes, doesn't catch changes (in 3.2)
-	div.lastChild.className = "e";
-
-	if ( div.getElementsByClassName("e").length === 1 ) {
-		return;
-	}
-	
-	Expr.order.splice(1, 0, "CLASS");
-	Expr.find.CLASS = function(match, context, isXML) {
-		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
-			return context.getElementsByClassName(match[1]);
-		}
-	};
-
-	div = null; // release memory in IE
-})();
-
-function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-		if ( elem ) {
-			elem = elem[dir];
-			var match = false;
-
-			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 && !isXML ){
-					elem.sizcache = doneName;
-					elem.sizset = i;
-				}
-
-				if ( elem.nodeName.toLowerCase() === cur ) {
-					match = elem;
-					break;
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-		if ( elem ) {
-			elem = elem[dir];
-			var match = false;
-
-			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 ) {
-					if ( !isXML ) {
-						elem.sizcache = doneName;
-						elem.sizset = i;
-					}
-					if ( typeof cur !== "string" ) {
-						if ( elem === cur ) {
-							match = true;
-							break;
-						}
-
-					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
-						match = elem;
-						break;
-					}
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-var contains = document.compareDocumentPosition ? function(a, b){
-	return !!(a.compareDocumentPosition(b) & 16);
-} : function(a, b){
-	return a !== b && (a.contains ? a.contains(b) : true);
-};
-
-var isXML = function(elem){
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833) 
-	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-var posProcess = function(selector, context){
-	var tmpSet = [], later = "", match,
-		root = context.nodeType ? [context] : context;
-
-	// Position selectors must be done after the filter
-	// And so must :not(positional) so we move all PSEUDOs to the end
-	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
-		later += match[0];
-		selector = selector.replace( Expr.match.PSEUDO, "" );
-	}
-
-	selector = Expr.relative[selector] ? selector + "*" : selector;
-
-	for ( var i = 0, l = root.length; i < l; i++ ) {
-		Sizzle( selector, root[i], tmpSet );
-	}
-
-	return Sizzle.filter( later, tmpSet );
-};
-
-// EXPOSE
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.filters;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = getText;
-jQuery.isXMLDoc = isXML;
-jQuery.contains = contains;
-
-return;
-
-window.Sizzle = Sizzle;
-
-})();
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
-	// Note: This RegExp should be improved, or likely pulled from Sizzle
-	rmultiselector = /,/,
-	slice = Array.prototype.slice;
-
-// Implement the identical functionality for filter and not
-var winnow = function( elements, qualifier, keep ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return !!qualifier.call( elem, i, elem ) === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return (elem === qualifier) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem, i ) {
-		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
-	});
-};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var ret = this.pushStack( "", "find", selector ), length = 0;
-
-		for ( var i = 0, l = this.length; i < l; i++ ) {
-			length = ret.length;
-			jQuery.find( selector, this[i], ret );
-
-			if ( i > 0 ) {
-				// Make sure that the results are unique
-				for ( var n = length; n < ret.length; n++ ) {
-					for ( var r = 0; r < length; r++ ) {
-						if ( ret[r] === ret[n] ) {
-							ret.splice(n--, 1);
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return ret;
-	},
-
-	has: function( target ) {
-		var targets = jQuery( target );
-		return this.filter(function() {
-			for ( var i = 0, l = targets.length; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false), "not", selector);
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true), "filter", selector );
-	},
-	
-	is: function( selector ) {
-		return !!selector && jQuery.filter( selector, this ).length > 0;
-	},
-
-	closest: function( selectors, context ) {
-		if ( jQuery.isArray( selectors ) ) {
-			var ret = [], cur = this[0], match, matches = {}, selector;
-
-			if ( cur && selectors.length ) {
-				for ( var i = 0, l = selectors.length; i < l; i++ ) {
-					selector = selectors[i];
-
-					if ( !matches[selector] ) {
-						matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
-							jQuery( selector, context || this.context ) :
-							selector;
-					}
-				}
-
-				while ( cur && cur.ownerDocument && cur !== context ) {
-					for ( selector in matches ) {
-						match = matches[selector];
-
-						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
-							ret.push({ selector: selector, elem: cur });
-							delete matches[selector];
-						}
-					}
-					cur = cur.parentNode;
-				}
-			}
-
-			return ret;
-		}
-
-		var pos = jQuery.expr.match.POS.test( selectors ) ? 
-			jQuery( selectors, context || this.context ) : null;
-
-		return this.map(function( i, cur ) {
-			while ( cur && cur.ownerDocument && cur !== context ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
-					return cur;
-				}
-				cur = cur.parentNode;
-			}
-			return null;
-		});
-	},
-	
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-		if ( !elem || typeof elem === "string" ) {
-			return jQuery.inArray( this[0],
-				// If it receives a string, the selector is used
-				// If it receives nothing, the siblings are used
-				elem ? jQuery( elem ) : this.parent().children() );
-		}
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context || this.context ) :
-				jQuery.makeArray( selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
-			all :
-			jQuery.unique( all ) );
-	},
-
-	andSelf: function() {
-		return this.add( this.prevObject );
-	}
-});
-
-// A painfully simple check to see if an element is disconnected
-// from a document (should be improved, where feasible).
-function isDisconnected( node ) {
-	return !node || !node.parentNode || node.parentNode.nodeType === 11;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return jQuery.nth( elem, 2, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return jQuery.nth( elem, 2, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( elem.parentNode.firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.makeArray( elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-		
-		if ( !runtil.test( name ) ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		ret = this.length > 1 ? jQuery.unique( ret ) : ret;
-
-		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
-			ret = ret.reverse();
-		}
-
-		return this.pushStack( ret, name, slice.call(arguments).join(",") );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return jQuery.find.matches(expr, elems);
-	},
-	
-	dir: function( elem, dir, until ) {
-		var matched = [], cur = elem[dir];
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	nth: function( cur, result, dir, elem ) {
-		result = result || 1;
-		var num = 0;
-
-		for ( ; cur; cur = cur[dir] ) {
-			if ( cur.nodeType === 1 && ++num === result ) {
-				break;
-			}
-		}
-
-		return cur;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g,
-	rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnocache = /<script|<object|<embed|<option|<style/i,
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,  // checked="checked" or checked (html5)
-	fcloseTag = function( all, front, tag ) {
-		return rselfClosing.test( tag ) ?
-			all :
-			front + "></" + tag + ">";
-	},
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		area: [ 1, "<map>", "</map>" ],
-		_default: [ 0, "", "" ]
-	};
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// IE can't serialize <link> and <script> tags normally
-if ( !jQuery.support.htmlSerialize ) {
-	wrapMap._default = [ 1, "div<div>", "</div>" ];
-}
-
-jQuery.fn.extend({
-	text: function( text ) {
-		if ( jQuery.isFunction(text) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.text( text.call(this, i, self.text()) );
-			});
-		}
-
-		if ( typeof text !== "object" && text !== undefined ) {
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-		}
-
-		return jQuery.text( this );
-	},
-
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append(this);
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ), contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		return this.each(function() {
-			jQuery( this ).wrapAll( html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.insertBefore( elem, this.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this );
-			});
-		} else if ( arguments.length ) {
-			var set = jQuery(arguments[0]);
-			set.push.apply( set, this.toArray() );
-			return this.pushStack( set, "before", arguments );
-		}
-	},
-
-	after: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			});
-		} else if ( arguments.length ) {
-			var set = this.pushStack( this, "after", arguments );
-			set.push.apply( set, jQuery(arguments[0]).toArray() );
-			return set;
-		}
-	},
-	
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
-				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( elem.getElementsByTagName("*") );
-					jQuery.cleanData( [ elem ] );
-				}
-
-				if ( elem.parentNode ) {
-					 elem.parentNode.removeChild( elem );
-				}
-			}
-		}
-		
-		return this;
-	},
-
-	empty: function() {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( elem.getElementsByTagName("*") );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-		}
-		
-		return this;
-	},
-
-	clone: function( events ) {
-		// Do the clone
-		var ret = this.map(function() {
-			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
-				// IE copies events bound via attachEvent when
-				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
-				// In order to get around this, we use innerHTML.
-				// Unfortunately, this means some modifications to
-				// attributes in IE that are actually only stored
-				// as properties will not be copied (such as the
-				// the name attribute on an input).
-				var html = this.outerHTML, ownerDocument = this.ownerDocument;
-				if ( !html ) {
-					var div = ownerDocument.createElement("div");
-					div.appendChild( this.cloneNode(true) );
-					html = div.innerHTML;
-				}
-
-				return jQuery.clean([html.replace(rinlinejQuery, "")
-					// Handle the case in IE 8 where action=/test/> self-closes a tag
-					.replace(/=([^="'>\s]+\/)>/g, '="$1">')
-					.replace(rleadingWhitespace, "")], ownerDocument)[0];
-			} else {
-				return this.cloneNode(true);
-			}
-		});
-
-		// Copy the events from the original to the clone
-		if ( events === true ) {
-			cloneCopyEvent( this, ret );
-			cloneCopyEvent( this.find("*"), ret.find("*") );
-		}
-
-		// Return the cloned set
-		return ret;
-	},
-
-	html: function( value ) {
-		if ( value === undefined ) {
-			return this[0] && this[0].nodeType === 1 ?
-				this[0].innerHTML.replace(rinlinejQuery, "") :
-				null;
-
-		// See if we can take a shortcut and just use innerHTML
-		} else if ( typeof value === "string" && !rnocache.test( value ) &&
-			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
-			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
-
-			value = value.replace(rxhtmlTag, fcloseTag);
-
-			try {
-				for ( var i = 0, l = this.length; i < l; i++ ) {
-					// Remove element nodes and prevent memory leaks
-					if ( this[i].nodeType === 1 ) {
-						jQuery.cleanData( this[i].getElementsByTagName("*") );
-						this[i].innerHTML = value;
-					}
-				}
-
-			// If using innerHTML throws an exception, use the fallback method
-			} catch(e) {
-				this.empty().append( value );
-			}
-
-		} else if ( jQuery.isFunction( value ) ) {
-			this.each(function(i){
-				var self = jQuery(this), old = self.html();
-				self.empty().append(function(){
-					return value.call( this, i, old );
-				});
-			});
-
-		} else {
-			this.empty().append( value );
-		}
-
-		return this;
-	},
-
-	replaceWith: function( value ) {
-		if ( this[0] && this[0].parentNode ) {
-			// Make sure that the elements are removed from the DOM before they are inserted
-			// this can help fix replacing a parent with child elements
-			if ( jQuery.isFunction( value ) ) {
-				return this.each(function(i) {
-					var self = jQuery(this), old = self.html();
-					self.replaceWith( value.call( this, i, old ) );
-				});
-			}
-
-			if ( typeof value !== "string" ) {
-				value = jQuery(value).detach();
-			}
-
-			return this.each(function() {
-				var next = this.nextSibling, parent = this.parentNode;
-
-				jQuery(this).remove();
-
-				if ( next ) {
-					jQuery(next).before( value );
-				} else {
-					jQuery(parent).append( value );
-				}
-			});
-		} else {
-			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
-		}
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, table, callback ) {
-		var results, first, value = args[0], scripts = [], fragment, parent;
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
-			return this.each(function() {
-				jQuery(this).domManip( args, table, callback, true );
-			});
-		}
-
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				args[0] = value.call(this, i, table ? self.html() : undefined);
-				self.domManip( args, table, callback );
-			});
-		}
-
-		if ( this[0] ) {
-			parent = value && value.parentNode;
-
-			// If we're in a fragment, just use that instead of building a new one
-			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
-				results = { fragment: parent };
-
-			} else {
-				results = buildFragment( args, this, scripts );
-			}
-			
-			fragment = results.fragment;
-			
-			if ( fragment.childNodes.length === 1 ) {
-				first = fragment = fragment.firstChild;
-			} else {
-				first = fragment.firstChild;
-			}
-
-			if ( first ) {
-				table = table && jQuery.nodeName( first, "tr" );
-
-				for ( var i = 0, l = this.length; i < l; i++ ) {
-					callback.call(
-						table ?
-							root(this[i], first) :
-							this[i],
-						i > 0 || results.cacheable || this.length > 1  ?
-							fragment.cloneNode(true) :
-							fragment
-					);
-				}
-			}
-
-			if ( scripts.length ) {
-				jQuery.each( scripts, evalScript );
-			}
-		}
-
-		return this;
-
-		function root( elem, cur ) {
-			return jQuery.nodeName(elem, "table") ?
-				(elem.getElementsByTagName("tbody")[0] ||
-				elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
-				elem;
-		}
-	}
-});
-
-function cloneCopyEvent(orig, ret) {
-	var i = 0;
-
-	ret.each(function() {
-		if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
-			return;
-		}
-
-		var oldData = jQuery.data( orig[i++] ), curData = jQuery.data( this, oldData ), events = oldData && oldData.events;
-
-		if ( events ) {
-			delete curData.handle;
-			curData.events = {};
-
-			for ( var type in events ) {
-				for ( var handler in events[ type ] ) {
-					jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
-				}
-			}
-		}
-	});
-}
-
-function buildFragment( args, nodes, scripts ) {
-	var fragment, cacheable, cacheresults,
-		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
-
-	// Only cache "small" (1/2 KB) strings that are associated with the main document
-	// Cloning options loses the selected state, so don't cache them
-	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
-	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
-	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
-		!rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
-
-		cacheable = true;
-		cacheresults = jQuery.fragments[ args[0] ];
-		if ( cacheresults ) {
-			if ( cacheresults !== 1 ) {
-				fragment = cacheresults;
-			}
-		}
-	}
-
-	if ( !fragment ) {
-		fragment = doc.createDocumentFragment();
-		jQuery.clean( args, doc, fragment, scripts );
-	}
-
-	if ( cacheable ) {
-		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
-	}
-
-	return { fragment: fragment, cacheable: cacheable };
-}
-
-jQuery.fragments = {};
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var ret = [], insert = jQuery( selector ),
-			parent = this.length === 1 && this[0].parentNode;
-		
-		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
-			insert[ original ]( this[0] );
-			return this;
-			
-		} else {
-			for ( var i = 0, l = insert.length; i < l; i++ ) {
-				var elems = (i > 0 ? this.clone(true) : this).get();
-				jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
-				ret = ret.concat( elems );
-			}
-		
-			return this.pushStack( ret, name, insert.selector );
-		}
-	};
-});
-
-jQuery.extend({
-	clean: function( elems, context, fragment, scripts ) {
-		context = context || document;
-
-		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if ( typeof context.createElement === "undefined" ) {
-			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
-		}
-
-		var ret = [];
-
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( typeof elem === "number" ) {
-				elem += "";
-			}
-
-			if ( !elem ) {
-				continue;
-			}
-
-			// Convert html string into DOM nodes
-			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
-				elem = context.createTextNode( elem );
-
-			} else if ( typeof elem === "string" ) {
-				// Fix "XHTML"-style tags in all browsers
-				elem = elem.replace(rxhtmlTag, fcloseTag);
-
-				// Trim whitespace, otherwise indexOf won't work as expected
-				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
-					wrap = wrapMap[ tag ] || wrapMap._default,
-					depth = wrap[0],
-					div = context.createElement("div");
-
-				// Go to html and back, then peel off extra wrappers
-				div.innerHTML = wrap[1] + elem + wrap[2];
-
-				// Move to the right depth
-				while ( depth-- ) {
-					div = div.lastChild;
-				}
-
-				// Remove IE's autoinserted <tbody> from table fragments
-				if ( !jQuery.support.tbody ) {
-
-					// String was a <table>, *may* have spurious <tbody>
-					var hasBody = rtbody.test(elem),
-						tbody = tag === "table" && !hasBody ?
-							div.firstChild && div.firstChild.childNodes :
-
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !hasBody ?
-								div.childNodes :
-								[];
-
-					for ( var j = tbody.length - 1; j >= 0 ; --j ) {
-						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
-							tbody[ j ].parentNode.removeChild( tbody[ j ] );
-						}
-					}
-
-				}
-
-				// IE completely kills leading whitespace when innerHTML is used
-				if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-					div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
-				}
-
-				elem = div.childNodes;
-			}
-
-			if ( elem.nodeType ) {
-				ret.push( elem );
-			} else {
-				ret = jQuery.merge( ret, elem );
-			}
-		}
-
-		if ( fragment ) {
-			for ( var i = 0; ret[i]; i++ ) {
-				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
-					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
-				
-				} else {
-					if ( ret[i].nodeType === 1 ) {
-						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
-					}
-					fragment.appendChild( ret[i] );
-				}
-			}
-		}
-
-		return ret;
-	},
-	
-	cleanData: function( elems ) {
-		var data, id, cache = jQuery.cache,
-			special = jQuery.event.special,
-			deleteExpando = jQuery.support.deleteExpando;
-		
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			id = elem[ jQuery.expando ];
-			
-			if ( id ) {
-				data = cache[ id ];
-				
-				if ( data.events ) {
-					for ( var type in data.events ) {
-						if ( special[ type ] ) {
-							jQuery.event.remove( elem, type );
-
-						} else {
-							removeEvent( elem, type, data.handle );
-						}
-					}
-				}
-				
-				if ( deleteExpando ) {
-					delete elem[ jQuery.expando ];
-
-				} else if ( elem.removeAttribute ) {
-					elem.removeAttribute( jQuery.expando );
-				}
-				
-				delete cache[ id ];
-			}
-		}
-	}
-});
-// exclude the following css properties to add px
-var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
-	ralpha = /alpha\([^)]*\)/,
-	ropacity = /opacity=([^)]*)/,
-	rfloat = /float/i,
-	rdashAlpha = /-([a-z])/ig,
-	rupper = /([A-Z])/g,
-	rnumpx = /^-?\d+(?:px)?$/i,
-	rnum = /^-?\d/,
-
-	cssShow = { position: "absolute", visibility: "hidden", display:"block" },
-	cssWidth = [ "Left", "Right" ],
-	cssHeight = [ "Top", "Bottom" ],
-
-	// cache check for defaultView.getComputedStyle
-	getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
-	// normalize float css property
-	styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat",
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn.css = function( name, value ) {
-	return access( this, name, value, true, function( elem, name, value ) {
-		if ( value === undefined ) {
-			return jQuery.curCSS( elem, name );
-		}
-		
-		if ( typeof value === "number" && !rexclude.test(name) ) {
-			value += "px";
-		}
-
-		jQuery.style( elem, name, value );
-	});
-};
-
-jQuery.extend({
-	style: function( elem, name, value ) {
-		// don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return undefined;
-		}
-
-		// ignore negative width and height values #1599
-		if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) {
-			value = undefined;
-		}
-
-		var style = elem.style || elem, set = value !== undefined;
-
-		// IE uses filters for opacity
-		if ( !jQuery.support.opacity && name === "opacity" ) {
-			if ( set ) {
-				// IE has trouble with opacity if it does not have layout
-				// Force it by setting the zoom level
-				style.zoom = 1;
-
-				// Set the alpha filter to set the opacity
-				var opacity = parseInt( value, 10 ) + "" === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
-				var filter = style.filter || jQuery.curCSS( elem, "filter" ) || "";
-				style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity;
-			}
-
-			return style.filter && style.filter.indexOf("opacity=") >= 0 ?
-				(parseFloat( ropacity.exec(style.filter)[1] ) / 100) + "":
-				"";
-		}
-
-		// Make sure we're using the right name for getting the float value
-		if ( rfloat.test( name ) ) {
-			name = styleFloat;
-		}
-
-		name = name.replace(rdashAlpha, fcamelCase);
-
-		if ( set ) {
-			style[ name ] = value;
-		}
-
-		return style[ name ];
-	},
-
-	css: function( elem, name, force, extra ) {
-		if ( name === "width" || name === "height" ) {
-			var val, props = cssShow, which = name === "width" ? cssWidth : cssHeight;
-
-			function getWH() {
-				val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
-
-				if ( extra === "border" ) {
-					return;
-				}
-
-				jQuery.each( which, function() {
-					if ( !extra ) {
-						val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
-					}
-
-					if ( extra === "margin" ) {
-						val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
-					} else {
-						val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
-					}
-				});
-			}
-
-			if ( elem.offsetWidth !== 0 ) {
-				getWH();
-			} else {
-				jQuery.swap( elem, props, getWH );
-			}
-
-			return Math.max(0, Math.round(val));
-		}
-
-		return jQuery.curCSS( elem, name, force );
-	},
-
-	curCSS: function( elem, name, force ) {
-		var ret, style = elem.style, filter;
-
-		// IE uses filters for opacity
-		if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
-			ret = ropacity.test(elem.currentStyle.filter || "") ?
-				(parseFloat(RegExp.$1) / 100) + "" :
-				"";
-
-			return ret === "" ?
-				"1" :
-				ret;
-		}
-
-		// Make sure we're using the right name for getting the float value
-		if ( rfloat.test( name ) ) {
-			name = styleFloat;
-		}
-
-		if ( !force && style && style[ name ] ) {
-			ret = style[ name ];
-
-		} else if ( getComputedStyle ) {
-
-			// Only "float" is needed here
-			if ( rfloat.test( name ) ) {
-				name = "float";
-			}
-
-			name = name.replace( rupper, "-$1" ).toLowerCase();
-
-			var defaultView = elem.ownerDocument.defaultView;
-
-			if ( !defaultView ) {
-				return null;
-			}
-
-			var computedStyle = defaultView.getComputedStyle( elem, null );
-
-			if ( computedStyle ) {
-				ret = computedStyle.getPropertyValue( name );
-			}
-
-			// We should always get a number back from opacity
-			if ( name === "opacity" && ret === "" ) {
-				ret = "1";
-			}
-
-		} else if ( elem.currentStyle ) {
-			var camelCase = name.replace(rdashAlpha, fcamelCase);
-
-			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
-
-			// From the awesome hack by Dean Edwards
-			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-			// If we're not dealing with a regular pixel number
-			// but a number that has a weird ending, we need to convert it to pixels
-			if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
-				// Remember the original values
-				var left = style.left, rsLeft = elem.runtimeStyle.left;
-
-				// Put in the new values to get a computed value out
-				elem.runtimeStyle.left = elem.currentStyle.left;
-				style.left = camelCase === "fontSize" ? "1em" : (ret || 0);
-				ret = style.pixelLeft + "px";
-
-				// Revert the changed values
-				style.left = left;
-				elem.runtimeStyle.left = rsLeft;
-			}
-		}
-
-		return ret;
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		callback.call( elem );
-
-		// Revert the old values
-		for ( var name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-	}
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		var width = elem.offsetWidth, height = elem.offsetHeight,
-			skip = elem.nodeName.toLowerCase() === "tr";
-
-		return width === 0 && height === 0 && !skip ?
-			true :
-			width > 0 && height > 0 && !skip ?
-				false :
-				jQuery.curCSS(elem, "display") === "none";
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-var jsc = now(),
-	rscript = /<script(.|\s)*?\/script>/gi,
-	rselectTextarea = /select|textarea/i,
-	rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,
-	jsre = /=\?(&|$)/,
-	rquery = /\?/,
-	rts = /(\?|&)_=.*?(&|$)/,
-	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
-	r20 = /%20/g,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load;
-
-jQuery.fn.extend({
-	load: function( url, params, callback ) {
-		if ( typeof url !== "string" ) {
-			return _load.call( this, url );
-
-		// Don't do a request if no elements are being requested
-		} else if ( !this.length ) {
-			return this;
-		}
-
-		var off = url.indexOf(" ");
-		if ( off >= 0 ) {
-			var selector = url.slice(off, url.length);
-			url = url.slice(0, off);
-		}
-
-		// Default to a GET request
-		var type = "GET";
-
-		// If the second parameter was provided
-		if ( params ) {
-			// If it's a function
-			if ( jQuery.isFunction( params ) ) {
-				// We assume that it's the callback
-				callback = params;
-				params = null;
-
-			// Otherwise, build a param string
-			} else if ( typeof params === "object" ) {
-				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
-				type = "POST";
-			}
-		}
-
-		var self = this;
-
-		// Request the remote document
-		jQuery.ajax({
-			url: url,
-			type: type,
-			dataType: "html",
-			data: params,
-			complete: function( res, status ) {
-				// If successful, inject the HTML into all the matched elements
-				if ( status === "success" || status === "notmodified" ) {
-					// See if a selector was specified
-					self.html( selector ?
-						// Create a dummy div to hold the results
-						jQuery("<div />")
-							// inject the contents of the document in, removing the scripts
-							// to avoid any 'Permission Denied' errors in IE
-							.append(res.responseText.replace(rscript, ""))
-
-							// Locate the specified elements
-							.find(selector) :
-
-						// If not, just inject the full result
-						res.responseText );
-				}
-
-				if ( callback ) {
-					self.each( callback, [res.responseText, status, res] );
-				}
-			}
-		});
-
-		return this;
-	},
-
-	serialize: function() {
-		return jQuery.param(this.serializeArray());
-	},
-	serializeArray: function() {
-		return this.map(function() {
-			return this.elements ? jQuery.makeArray(this.elements) : this;
-		})
-		.filter(function() {
-			return this.name && !this.disabled &&
-				(this.checked || rselectTextarea.test(this.nodeName) ||
-					rinput.test(this.type));
-		})
-		.map(function( i, elem ) {
-			var val = jQuery(this).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray(val) ?
-					jQuery.map( val, function( val, i ) {
-						return { name: elem.name, value: val };
-					}) :
-					{ name: elem.name, value: val };
-		}).get();
-	}
-});
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function( i, o ) {
-	jQuery.fn[o] = function( f ) {
-		return this.bind(o, f);
-	};
-});
-
-jQuery.extend({
-
-	get: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = null;
-		}
-
-		return jQuery.ajax({
-			type: "GET",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get(url, null, callback, "script");
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get(url, data, callback, "json");
-	},
-
-	post: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = {};
-		}
-
-		return jQuery.ajax({
-			type: "POST",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	ajaxSetup: function( settings ) {
-		jQuery.extend( jQuery.ajaxSettings, settings );
-	},
-
-	ajaxSettings: {
-		url: location.href,
-		global: true,
-		type: "GET",
-		contentType: "application/x-www-form-urlencoded",
-		processData: true,
-		async: true,
-		/*
-		timeout: 0,
-		data: null,
-		username: null,
-		password: null,
-		traditional: false,
-		*/
-		// Create the request object; Microsoft failed to properly
-		// implement the XMLHttpRequest in IE7 (can't request local files),
-		// so we use the ActiveXObject when it is available
-		// This function can be overriden by calling jQuery.ajaxSetup
-		xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
-			function() {
-				return new window.XMLHttpRequest();
-			} :
-			function() {
-				try {
-					return new window.ActiveXObject("Microsoft.XMLHTTP");
-				} catch(e) {}
-			},
-		accepts: {
-			xml: "application/xml, text/xml",
-			html: "text/html",
-			script: "text/javascript, application/javascript",
-			json: "application/json, text/javascript",
-			text: "text/plain",
-			_default: "*/*"
-		}
-	},
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajax: function( origSettings ) {
-		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings);
-		
-		var jsonp, status, data,
-			callbackContext = origSettings && origSettings.context || s,
-			type = s.type.toUpperCase();
-
-		// convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Handle JSONP Parameter Callbacks
-		if ( s.dataType === "jsonp" ) {
-			if ( type === "GET" ) {
-				if ( !jsre.test( s.url ) ) {
-					s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
-				}
-			} else if ( !s.data || !jsre.test(s.data) ) {
-				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
-			}
-			s.dataType = "json";
-		}
-
-		// Build temporary JSONP function
-		if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
-			jsonp = s.jsonpCallback || ("jsonp" + jsc++);
-
-			// Replace the =? sequence both in the query string and the data
-			if ( s.data ) {
-				s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
-			}
-
-			s.url = s.url.replace(jsre, "=" + jsonp + "$1");
-
-			// We need to make sure
-			// that a JSONP style response is executed properly
-			s.dataType = "script";
-
-			// Handle JSONP-style loading
-			window[ jsonp ] = window[ jsonp ] || function( tmp ) {
-				data = tmp;
-				success();
-				complete();
-				// Garbage collect
-				window[ jsonp ] = undefined;
-
-				try {
-					delete window[ jsonp ];
-				} catch(e) {}
-
-				if ( head ) {
-					head.removeChild( script );
-				}
-			};
-		}
-
-		if ( s.dataType === "script" && s.cache === null ) {
-			s.cache = false;
-		}
-
-		if ( s.cache === false && type === "GET" ) {
-			var ts = now();
-
-			// try replacing _= if it is there
-			var ret = s.url.replace(rts, "$1_=" + ts + "$2");
-
-			// if nothing was replaced, add timestamp to the end
-			s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
-		}
-
-		// If data is available, append data to url for get requests
-		if ( s.data && type === "GET" ) {
-			s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
-		}
-
-		// Watch for a new set of requests
-		if ( s.global && ! jQuery.active++ ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
-
-		// Matches an absolute URL, and saves the domain
-		var parts = rurl.exec( s.url ),
-			remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
-
-		// If we're requesting a remote document
-		// and trying to load JSON or Script with a GET
-		if ( s.dataType === "script" && type === "GET" && remote ) {
-			var head = document.getElementsByTagName("head")[0] || document.documentElement;
-			var script = document.createElement("script");
-			script.src = s.url;
-			if ( s.scriptCharset ) {
-				script.charset = s.scriptCharset;
-			}
-
-			// Handle Script loading
-			if ( !jsonp ) {
-				var done = false;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function() {
-					if ( !done && (!this.readyState ||
-							this.readyState === "loaded" || this.readyState === "complete") ) {
-						done = true;
-						success();
-						complete();
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-						if ( head && script.parentNode ) {
-							head.removeChild( script );
-						}
-					}
-				};
-			}
-
-			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709 and #4378).
-			head.insertBefore( script, head.firstChild );
-
-			// We handle everything using the script element injection
-			return undefined;
-		}
-
-		var requestDone = false;
-
-		// Create the request object
-		var xhr = s.xhr();
-
-		if ( !xhr ) {
-			return;
-		}
-
-		// Open the socket
-		// Passing null username, generates a login popup on Opera (#2865)
-		if ( s.username ) {
-			xhr.open(type, s.url, s.async, s.username, s.password);
-		} else {
-			xhr.open(type, s.url, s.async);
-		}
-
-		// Need an extra try/catch for cross domain requests in Firefox 3
-		try {
-			// Set the correct header, if data is being sent
-			if ( s.data || origSettings && origSettings.contentType ) {
-				xhr.setRequestHeader("Content-Type", s.contentType);
-			}
-
-			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-			if ( s.ifModified ) {
-				if ( jQuery.lastModified[s.url] ) {
-					xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
-				}
-
-				if ( jQuery.etag[s.url] ) {
-					xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
-				}
-			}
-
-			// Set header so the called script knows that it's an XMLHttpRequest
-			// Only send the header if it's not a remote XHR
-			if ( !remote ) {
-				xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-			}
-
-			// Set the Accepts header for the server, depending on the dataType
-			xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
-				s.accepts[ s.dataType ] + ", */*" :
-				s.accepts._default );
-		} catch(e) {}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && s.beforeSend.call(callbackContext, xhr, s) === false ) {
-			// Handle the global AJAX counter
-			if ( s.global && ! --jQuery.active ) {
-				jQuery.event.trigger( "ajaxStop" );
-			}
-
-			// close opended socket
-			xhr.abort();
-			return false;
-		}
-
-		if ( s.global ) {
-			trigger("ajaxSend", [xhr, s]);
-		}
-
-		// Wait for a response to come back
-		var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
-			// The request was aborted
-			if ( !xhr || xhr.readyState === 0 || isTimeout === "abort" ) {
-				// Opera doesn't call onreadystatechange before this point
-				// so we simulate the call
-				if ( !requestDone ) {
-					complete();
-				}
-
-				requestDone = true;
-				if ( xhr ) {
-					xhr.onreadystatechange = jQuery.noop;
-				}
-
-			// The transfer is complete and the data is available, or the request timed out
-			} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
-				requestDone = true;
-				xhr.onreadystatechange = jQuery.noop;
-
-				status = isTimeout === "timeout" ?
-					"timeout" :
-					!jQuery.httpSuccess( xhr ) ?
-						"error" :
-						s.ifModified && jQuery.httpNotModified( xhr, s.url ) ?
-							"notmodified" :
-							"success";
-
-				var errMsg;
-
-				if ( status === "success" ) {
-					// Watch for, and catch, XML document parse errors
-					try {
-						// process the data (runs the xml through httpData regardless of callback)
-						data = jQuery.httpData( xhr, s.dataType, s );
-					} catch(err) {
-						status = "parsererror";
-						errMsg = err;
-					}
-				}
-
-				// Make sure that the request was successful or notmodified
-				if ( status === "success" || status === "notmodified" ) {
-					// JSONP handles its own success callback
-					if ( !jsonp ) {
-						success();
-					}
-				} else {
-					jQuery.handleError(s, xhr, status, errMsg);
-				}
-
-				// Fire the complete handlers
-				complete();
-
-				if ( isTimeout === "timeout" ) {
-					xhr.abort();
-				}
-
-				// Stop memory leaks
-				if ( s.async ) {
-					xhr = null;
-				}
-			}
-		};
-
-		// Override the abort handler, if we can (IE doesn't allow it, but that's OK)
-		// Opera doesn't fire onreadystatechange at all on abort
-		try {
-			var oldAbort = xhr.abort;
-			xhr.abort = function() {
-				if ( xhr ) {
-					oldAbort.call( xhr );
-				}
-
-				onreadystatechange( "abort" );
-			};
-		} catch(e) { }
-
-		// Timeout checker
-		if ( s.async && s.timeout > 0 ) {
-			setTimeout(function() {
-				// Check to see if the request is still happening
-				if ( xhr && !requestDone ) {
-					onreadystatechange( "timeout" );
-				}
-			}, s.timeout);
-		}
-
-		// Send the data
-		try {
-			xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null );
-		} catch(e) {
-			jQuery.handleError(s, xhr, null, e);
-			// Fire the complete handlers
-			complete();
-		}
-
-		// firefox 1.5 doesn't fire statechange for sync requests
-		if ( !s.async ) {
-			onreadystatechange();
-		}
-
-		function success() {
-			// If a local callback was specified, fire it and pass it the data
-			if ( s.success ) {
-				s.success.call( callbackContext, data, status, xhr );
-			}
-
-			// Fire the global callback
-			if ( s.global ) {
-				trigger( "ajaxSuccess", [xhr, s] );
-			}
-		}
-
-		function complete() {
-			// Process result
-			if ( s.complete ) {
-				s.complete.call( callbackContext, xhr, status);
-			}
-
-			// The request was completed
-			if ( s.global ) {
-				trigger( "ajaxComplete", [xhr, s] );
-			}
-
-			// Handle the global AJAX counter
-			if ( s.global && ! --jQuery.active ) {
-				jQuery.event.trigger( "ajaxStop" );
-			}
-		}
-		
-		function trigger(type, args) {
-			(s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
-		}
-
-		// return XMLHttpRequest to allow aborting the request etc.
-		return xhr;
-	},
-
-	handleError: function( s, xhr, status, e ) {
-		// If a local callback was specified, fire it
-		if ( s.error ) {
-			s.error.call( s.context || s, xhr, status, e );
-		}
-
-		// Fire the global callback
-		if ( s.global ) {
-			(s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] );
-		}
-	},
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Determines if an XMLHttpRequest was successful or not
-	httpSuccess: function( xhr ) {
-		try {
-			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
-			return !xhr.status && location.protocol === "file:" ||
-				// Opera returns 0 when status is 304
-				( xhr.status >= 200 && xhr.status < 300 ) ||
-				xhr.status === 304 || xhr.status === 1223 || xhr.status === 0;
-		} catch(e) {}
-
-		return false;
-	},
-
-	// Determines if an XMLHttpRequest returns NotModified
-	httpNotModified: function( xhr, url ) {
-		var lastModified = xhr.getResponseHeader("Last-Modified"),
-			etag = xhr.getResponseHeader("Etag");
-
-		if ( lastModified ) {
-			jQuery.lastModified[url] = lastModified;
-		}
-
-		if ( etag ) {
-			jQuery.etag[url] = etag;
-		}
-
-		// Opera returns 0 when status is 304
-		return xhr.status === 304 || xhr.status === 0;
-	},
-
-	httpData: function( xhr, type, s ) {
-		var ct = xhr.getResponseHeader("content-type") || "",
-			xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
-			data = xml ? xhr.responseXML : xhr.responseText;
-
-		if ( xml && data.documentElement.nodeName === "parsererror" ) {
-			jQuery.error( "parsererror" );
-		}
-
-		// Allow a pre-filtering function to sanitize the response
-		// s is checked to keep backwards compatibility
-		if ( s && s.dataFilter ) {
-			data = s.dataFilter( data, type );
-		}
-
-		// The filter can actually parse the response
-		if ( typeof data === "string" ) {
-			// Get the JavaScript object, if JSON is used.
-			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
-				data = jQuery.parseJSON( data );
-
-			// If the type is "script", eval it in global context
-			} else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
-				jQuery.globalEval( data );
-			}
-		}
-
-		return data;
-	},
-
-	// Serialize an array of form elements or a set of
-	// key/values into a query string
-	param: function( a, traditional ) {
-		var s = [];
-		
-		// Set traditional to true for jQuery <= 1.3.2 behavior.
-		if ( traditional === undefined ) {
-			traditional = jQuery.ajaxSettings.traditional;
-		}
-		
-		// If an array was passed in, assume that it is an array of form elements.
-		if ( jQuery.isArray(a) || a.jquery ) {
-			// Serialize the form elements
-			jQuery.each( a, function() {
-				add( this.name, this.value );
-			});
-			
-		} else {
-			// If traditional, encode the "old" way (the way 1.3.2 or older
-			// did it), otherwise encode params recursively.
-			for ( var prefix in a ) {
-				buildParams( prefix, a[prefix] );
-			}
-		}
-
-		// Return the resulting serialization
-		return s.join("&").replace(r20, "+");
-
-		function buildParams( prefix, obj ) {
-			if ( jQuery.isArray(obj) ) {
-				// Serialize array item.
-				jQuery.each( obj, function( i, v ) {
-					if ( traditional || /\[\]$/.test( prefix ) ) {
-						// Treat each array item as a scalar.
-						add( prefix, v );
-					} else {
-						// If array item is non-scalar (array or object), encode its
-						// numeric index to resolve deserialization ambiguity issues.
-						// Note that rack (as of 1.0.0) can't currently deserialize
-						// nested arrays properly, and attempting to do so may cause
-						// a server error. Possible fixes are to modify rack's
-						// deserialization algorithm or to provide an option or flag
-						// to force array serialization to be shallow.
-						buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v );
-					}
-				});
-					
-			} else if ( !traditional && obj != null && typeof obj === "object" ) {
-				// Serialize object item.
-				jQuery.each( obj, function( k, v ) {
-					buildParams( prefix + "[" + k + "]", v );
-				});
-					
-			} else {
-				// Serialize scalar item.
-				add( prefix, obj );
-			}
-		}
-
-		function add( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction(value) ? value() : value;
-			s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
-		}
-	}
-});
-var elemdisplay = {},
-	rfxtypes = /toggle|show|hide/,
-	rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/,
-	timerId,
-	fxAttrs = [
-		// height animations
-		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
-		// width animations
-		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
-		// opacity animations
-		[ "opacity" ]
-	];
-
-jQuery.fn.extend({
-	show: function( speed, callback ) {
-		if ( speed || speed === 0) {
-			return this.animate( genFx("show", 3), speed, callback);
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var old = jQuery.data(this[i], "olddisplay");
-
-				this[i].style.display = old || "";
-
-				if ( jQuery.css(this[i], "display") === "none" ) {
-					var nodeName = this[i].nodeName, display;
-
-					if ( elemdisplay[ nodeName ] ) {
-						display = elemdisplay[ nodeName ];
-
-					} else {
-						var elem = jQuery("<" + nodeName + " />").appendTo("body");
-
-						display = elem.css("display");
-
-						if ( display === "none" ) {
-							display = "block";
-						}
-
-						elem.remove();
-
-						elemdisplay[ nodeName ] = display;
-					}
-
-					jQuery.data(this[i], "olddisplay", display);
-				}
-			}
-
-			// Set the display of the elements in a second loop
-			// to avoid the constant reflow
-			for ( var j = 0, k = this.length; j < k; j++ ) {
-				this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
-			}
-
-			return this;
-		}
-	},
-
-	hide: function( speed, callback ) {
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("hide", 3), speed, callback);
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var old = jQuery.data(this[i], "olddisplay");
-				if ( !old && old !== "none" ) {
-					jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
-				}
-			}
-
-			// Set the display of the elements in a second loop
-			// to avoid the constant reflow
-			for ( var j = 0, k = this.length; j < k; j++ ) {
-				this[j].style.display = "none";
-			}
-
-			return this;
-		}
-	},
-
-	// Save the old toggle function
-	_toggle: jQuery.fn.toggle,
-
-	toggle: function( fn, fn2 ) {
-		var bool = typeof fn === "boolean";
-
-		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
-			this._toggle.apply( this, arguments );
-
-		} else if ( fn == null || bool ) {
-			this.each(function() {
-				var state = bool ? fn : jQuery(this).is(":hidden");
-				jQuery(this)[ state ? "show" : "hide" ]();
-			});
-
-		} else {
-			this.animate(genFx("toggle", 3), fn, fn2);
-		}
-
-		return this;
-	},
-
-	fadeTo: function( speed, to, callback ) {
-		return this.filter(":hidden").css("opacity", 0).show().end()
-					.animate({opacity: to}, speed, callback);
-	},
-
-	animate: function( prop, speed, easing, callback ) {
-		var optall = jQuery.speed(speed, easing, callback);
-
-		if ( jQuery.isEmptyObject( prop ) ) {
-			return this.each( optall.complete );
-		}
-
-		return this[ optall.queue === false ? "each" : "queue" ](function() {
-			var opt = jQuery.extend({}, optall), p,
-				hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
-				self = this;
-
-			for ( p in prop ) {
-				var name = p.replace(rdashAlpha, fcamelCase);
-
-				if ( p !== name ) {
-					prop[ name ] = prop[ p ];
-					delete prop[ p ];
-					p = name;
-				}
-
-				if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
-					return opt.complete.call(this);
-				}
-
-				if ( ( p === "height" || p === "width" ) && this.style ) {
-					// Store display property
-					opt.display = jQuery.css(this, "display");
-
-					// Make sure that nothing sneaks out
-					opt.overflow = this.style.overflow;
-				}
-
-				if ( jQuery.isArray( prop[p] ) ) {
-					// Create (if needed) and add to specialEasing
-					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
-					prop[p] = prop[p][0];
-				}
-			}
-
-			if ( opt.overflow != null ) {
-				this.style.overflow = "hidden";
-			}
-
-			opt.curAnim = jQuery.extend({}, prop);
-
-			jQuery.each( prop, function( name, val ) {
-				var e = new jQuery.fx( self, opt, name );
-
-				if ( rfxtypes.test(val) ) {
-					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
-
-				} else {
-					var parts = rfxnum.exec(val),
-						start = e.cur(true) || 0;
-
-					if ( parts ) {
-						var end = parseFloat( parts[2] ),
-							unit = parts[3] || "px";
-
-						// We need to compute starting value
-						if ( unit !== "px" ) {
-							self.style[ name ] = (end || 1) + unit;
-							start = ((end || 1) / e.cur(true)) * start;
-							self.style[ name ] = start + unit;
-						}
-
-						// If a +=/-= token was provided, we're doing a relative animation
-						if ( parts[1] ) {
-							end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
-						}
-
-						e.custom( start, end, unit );
-
-					} else {
-						e.custom( start, val, "" );
-					}
-				}
-			});
-
-			// For JS strict compliance
-			return true;
-		});
-	},
-
-	stop: function( clearQueue, gotoEnd ) {
-		var timers = jQuery.timers;
-
-		if ( clearQueue ) {
-			this.queue([]);
-		}
-
-		this.each(function() {
-			// go in reverse order so anything added to the queue during the loop is ignored
-			for ( var i = timers.length - 1; i >= 0; i-- ) {
-				if ( timers[i].elem === this ) {
-					if (gotoEnd) {
-						// force the next step to be the last
-						timers[i](true);
-					}
-
-					timers.splice(i, 1);
-				}
-			}
-		});
-
-		// start the next in the queue if the last step wasn't forced
-		if ( !gotoEnd ) {
-			this.dequeue();
-		}
-
-		return this;
-	}
-
-});
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show", 1),
-	slideUp: genFx("hide", 1),
-	slideToggle: genFx("toggle", 1),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, callback ) {
-		return this.animate( props, speed, callback );
-	};
-});
-
-jQuery.extend({
-	speed: function( speed, easing, fn ) {
-		var opt = speed && typeof speed === "object" ? speed : {
-			complete: fn || !fn && easing ||
-				jQuery.isFunction( speed ) && speed,
-			duration: speed,
-			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
-		};
-
-		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-			jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
-
-		// Queueing
-		opt.old = opt.complete;
-		opt.complete = function() {
-			if ( opt.queue !== false ) {
-				jQuery(this).dequeue();
-			}
-			if ( jQuery.isFunction( opt.old ) ) {
-				opt.old.call( this );
-			}
-		};
-
-		return opt;
-	},
-
-	easing: {
-		linear: function( p, n, firstNum, diff ) {
-			return firstNum + diff * p;
-		},
-		swing: function( p, n, firstNum, diff ) {
-			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
-		}
-	},
-
-	timers: [],
-
-	fx: function( elem, options, prop ) {
-		this.options = options;
-		this.elem = elem;
-		this.prop = prop;
-
-		if ( !options.orig ) {
-			options.orig = {};
-		}
-	}
-
-});
-
-jQuery.fx.prototype = {
-	// Simple function for setting a style value
-	update: function() {
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
-
-		// Set display property to block for height/width animations
-		if ( ( this.prop === "height" || this.prop === "width" ) && this.elem.style ) {
-			this.elem.style.display = "block";
-		}
-	},
-
-	// Get the current size
-	cur: function( force ) {
-		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
-			return this.elem[ this.prop ];
-		}
-
-		var r = parseFloat(jQuery.css(this.elem, this.prop, force));
-		return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
-	},
-
-	// Start an animation from one number to another
-	custom: function( from, to, unit ) {
-		this.startTime = now();
-		this.start = from;
-		this.end = to;
-		this.unit = unit || this.unit || "px";
-		this.now = this.start;
-		this.pos = this.state = 0;
-
-		var self = this;
-		function t( gotoEnd ) {
-			return self.step(gotoEnd);
-		}
-
-		t.elem = this.elem;
-
-		if ( t() && jQuery.timers.push(t) && !timerId ) {
-			timerId = setInterval(jQuery.fx.tick, 13);
-		}
-	},
-
-	// Simple 'show' function
-	show: function() {
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
-		this.options.show = true;
-
-		// Begin the animation
-		// Make sure that we start at a small width/height to avoid any
-		// flash of content
-		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
-
-		// Start by showing the element
-		jQuery( this.elem ).show();
-	},
-
-	// Simple 'hide' function
-	hide: function() {
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
-		this.options.hide = true;
-
-		// Begin the animation
-		this.custom(this.cur(), 0);
-	},
-
-	// Each step of an animation
-	step: function( gotoEnd ) {
-		var t = now(), done = true;
-
-		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
-			this.now = this.end;
-			this.pos = this.state = 1;
-			this.update();
-
-			this.options.curAnim[ this.prop ] = true;
-
-			for ( var i in this.options.curAnim ) {
-				if ( this.options.curAnim[i] !== true ) {
-					done = false;
-				}
-			}
-
-			if ( done ) {
-				if ( this.options.display != null ) {
-					// Reset the overflow
-					this.elem.style.overflow = this.options.overflow;
-
-					// Reset the display
-					var old = jQuery.data(this.elem, "olddisplay");
-					this.elem.style.display = old ? old : this.options.display;
-
-					if ( jQuery.css(this.elem, "display") === "none" ) {
-						this.elem.style.display = "block";
-					}
-				}
-
-				// Hide the element if the "hide" operation was done
-				if ( this.options.hide ) {
-					jQuery(this.elem).hide();
-				}
-
-				// Reset the properties, if the item has been hidden or shown
-				if ( this.options.hide || this.options.show ) {
-					for ( var p in this.options.curAnim ) {
-						jQuery.style(this.elem, p, this.options.orig[p]);
-					}
-				}
-
-				// Execute the complete function
-				this.options.complete.call( this.elem );
-			}
-
-			return false;
-
-		} else {
-			var n = t - this.startTime;
-			this.state = n / this.options.duration;
-
-			// Perform the easing function, defaults to swing
-			var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
-			var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
-			this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
-			this.now = this.start + ((this.end - this.start) * this.pos);
-
-			// Perform the next step of the animation
-			this.update();
-		}
-
-		return true;
-	}
-};
-
-jQuery.extend( jQuery.fx, {
-	tick: function() {
-		var timers = jQuery.timers;
-
-		for ( var i = 0; i < timers.length; i++ ) {
-			if ( !timers[i]() ) {
-				timers.splice(i--, 1);
-			}
-		}
-
-		if ( !timers.length ) {
-			jQuery.fx.stop();
-		}
-	},
-		
-	stop: function() {
-		clearInterval( timerId );
-		timerId = null;
-	},
-	
-	speeds: {
-		slow: 600,
- 		fast: 200,
- 		// Default speed
- 		_default: 400
-	},
-
-	step: {
-		opacity: function( fx ) {
-			jQuery.style(fx.elem, "opacity", fx.now);
-		},
-
-		_default: function( fx ) {
-			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
-				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
-			} else {
-				fx.elem[ fx.prop ] = fx.now;
-			}
-		}
-	}
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-
-function genFx( type, num ) {
-	var obj = {};
-
-	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
-		obj[ this ] = type;
-	});
-
-	return obj;
-}
-if ( "getBoundingClientRect" in document.documentElement ) {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0];
-
-		if ( options ) { 
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
-
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
-
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
-
-		var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement,
-			clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
-			top  = box.top  + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ) - clientTop,
-			left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
-
-		return { top: top, left: left };
-	};
-
-} else {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0];
-
-		if ( options ) { 
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
-
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
-
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
-
-		jQuery.offset.initialize();
-
-		var offsetParent = elem.offsetParent, prevOffsetParent = elem,
-			doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
-			body = doc.body, defaultView = doc.defaultView,
-			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
-			top = elem.offsetTop, left = elem.offsetLeft;
-
-		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
-			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
-				break;
-			}
-
-			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
-			top  -= elem.scrollTop;
-			left -= elem.scrollLeft;
-
-			if ( elem === offsetParent ) {
-				top  += elem.offsetTop;
-				left += elem.offsetLeft;
-
-				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) {
-					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-				}
-
-				prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
-			}
-
-			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
-				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-			}
-
-			prevComputedStyle = computedStyle;
-		}
-
-		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
-			top  += body.offsetTop;
-			left += body.offsetLeft;
-		}
-
-		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
-			top  += Math.max( docElem.scrollTop, body.scrollTop );
-			left += Math.max( docElem.scrollLeft, body.scrollLeft );
-		}
-
-		return { top: top, left: left };
-	};
-}
-
-jQuery.offset = {
-	initialize: function() {
-		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, "marginTop", true) ) || 0,
-			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-
-		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
-
-		container.innerHTML = html;
-		body.insertBefore( container, body.firstChild );
-		innerDiv = container.firstChild;
-		checkDiv = innerDiv.firstChild;
-		td = innerDiv.nextSibling.firstChild.firstChild;
-
-		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
-		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
-
-		checkDiv.style.position = "fixed", checkDiv.style.top = "20px";
-		// safari subtracts parent border width here which is 5px
-		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
-		checkDiv.style.position = checkDiv.style.top = "";
-
-		innerDiv.style.overflow = "hidden", innerDiv.style.position = "relative";
-		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
-
-		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
-
-		body.removeChild( container );
-		body = container = innerDiv = checkDiv = table = td = null;
-		jQuery.offset.initialize = jQuery.noop;
-	},
-
-	bodyOffset: function( body ) {
-		var top = body.offsetTop, left = body.offsetLeft;
-
-		jQuery.offset.initialize();
-
-		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
-			top  += parseFloat( jQuery.curCSS(body, "marginTop",  true) ) || 0;
-			left += parseFloat( jQuery.curCSS(body, "marginLeft", true) ) || 0;
-		}
-
-		return { top: top, left: left };
-	},
-	
-	setOffset: function( elem, options, i ) {
-		// set position first, in-case top/left are set even on static elem
-		if ( /static/.test( jQuery.curCSS( elem, "position" ) ) ) {
-			elem.style.position = "relative";
-		}
-		var curElem   = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curTop    = parseInt( jQuery.curCSS( elem, "top",  true ), 10 ) || 0,
-			curLeft   = parseInt( jQuery.curCSS( elem, "left", true ), 10 ) || 0;
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		var props = {
-			top:  (options.top  - curOffset.top)  + curTop,
-			left: (options.left - curOffset.left) + curLeft
-		};
-		
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-
-jQuery.fn.extend({
-	position: function() {
-		if ( !this[0] ) {
-			return null;
-		}
-
-		var elem = this[0],
-
-		// Get *real* offsetParent
-		offsetParent = this.offsetParent(),
-
-		// Get correct offsets
-		offset       = this.offset(),
-		parentOffset = /^body|html$/i.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
-
-		// Subtract element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		offset.top  -= parseFloat( jQuery.curCSS(elem, "marginTop",  true) ) || 0;
-		offset.left -= parseFloat( jQuery.curCSS(elem, "marginLeft", true) ) || 0;
-
-		// Add offsetParent borders
-		parentOffset.top  += parseFloat( jQuery.curCSS(offsetParent[0], "borderTopWidth",  true) ) || 0;
-		parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], "borderLeftWidth", true) ) || 0;
-
-		// Subtract the two offsets
-		return {
-			top:  offset.top  - parentOffset.top,
-			left: offset.left - parentOffset.left
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || document.body;
-			while ( offsetParent && (!/^body|html$/i.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent;
-		});
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( ["Left", "Top"], function( i, name ) {
-	var method = "scroll" + name;
-
-	jQuery.fn[ method ] = function(val) {
-		var elem = this[0], win;
-		
-		if ( !elem ) {
-			return null;
-		}
-
-		if ( val !== undefined ) {
-			// Set the scroll offset
-			return this.each(function() {
-				win = getWindow( this );
-
-				if ( win ) {
-					win.scrollTo(
-						!i ? val : jQuery(win).scrollLeft(),
-						 i ? val : jQuery(win).scrollTop()
-					);
-
-				} else {
-					this[ method ] = val;
-				}
-			});
-		} else {
-			win = getWindow( elem );
-
-			// Return the scroll offset
-			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
-				jQuery.support.boxModel && win.document.documentElement[ method ] ||
-					win.document.body[ method ] :
-				elem[ method ];
-		}
-	};
-});
-
-function getWindow( elem ) {
-	return ("scrollTo" in elem && elem.document) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-// Create innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each([ "Height", "Width" ], function( i, name ) {
-
-	var type = name.toLowerCase();
-
-	// innerHeight and innerWidth
-	jQuery.fn["inner" + name] = function() {
-		return this[0] ?
-			jQuery.css( this[0], type, false, "padding" ) :
-			null;
-	};
-
-	// outerHeight and outerWidth
-	jQuery.fn["outer" + name] = function( margin ) {
-		return this[0] ?
-			jQuery.css( this[0], type, false, margin ? "margin" : "border" ) :
-			null;
-	};
-
-	jQuery.fn[ type ] = function( size ) {
-		// Get window width or height
-		var elem = this[0];
-		if ( !elem ) {
-			return size == null ? null : this;
-		}
-		
-		if ( jQuery.isFunction( size ) ) {
-			return this.each(function( i ) {
-				var self = jQuery( this );
-				self[ type ]( size.call( this, i, self[ type ]() ) );
-			});
-		}
-
-		return ("scrollTo" in elem && elem.document) ? // does it walk and quack like a window?
-			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
-			elem.document.body[ "client" + name ] :
-
-			// Get document width or height
-			(elem.nodeType === 9) ? // is it a document
-				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-				Math.max(
-					elem.documentElement["client" + name],
-					elem.body["scroll" + name], elem.documentElement["scroll" + name],
-					elem.body["offset" + name], elem.documentElement["offset" + name]
-				) :
-
-				// Get or set width or height on the element
-				size === undefined ?
-					// Get width or height on the element
-					jQuery.css( elem, type ) :
-
-					// Set the width or height on the element (default to pixels if value is unitless)
-					this.css( type, typeof size === "string" ? size : size + "px" );
-	};
-
-});
-// Expose jQuery to the global object
-window.jQuery = window.$ = jQuery;
-
-})(window);
diff --git a/lms/static/admin/js/jquery.min.js b/lms/static/admin/js/jquery.min.js
deleted file mode 100644
index 7c24308023..0000000000
--- a/lms/static/admin/js/jquery.min.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.2
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Sat Feb 13 22:33:48 2010 -0500
- */
-(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
-e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
-j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
-"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
-true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
-Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
-(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
-a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
-"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
-function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
-c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
-L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
-"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
-a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
-d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
-a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
-!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
-true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
-parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
-false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
-s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
-applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
-else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
-a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
-w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
-cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
-i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
-" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
-this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
-e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
-c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
-a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
-function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
-k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
-C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
-null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
-e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
-f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
-if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
-d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
-"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
-a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
-isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
-{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
-if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
-e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
-"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
-d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
-!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
-toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
-u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
-function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
-if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
-t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
-g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
-for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
-1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
-relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
-l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
-h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
-CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
-g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
-text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
-setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
-h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
-m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
-"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
-h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
-!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
-h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
-q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
-if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
-(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
-function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
-gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
-c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
-{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
-"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
-d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
-a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
-1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
-a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
-c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
-wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
-prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
-this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
-return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
-""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
-this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
-u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
-1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
-return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
-""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
-c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
-c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
-function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
-Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
-"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
-a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
-a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
-"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
-serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
-function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
-global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
-e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
-"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
-false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
-false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
-c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
-d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
-g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
-1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
-"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
-if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
-this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
-"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
-animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
-j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
-this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
-"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
-c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
-this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
-this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
-e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
-c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
-function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
-this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
-k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
-f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
-c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
-d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
-"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
-e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
diff --git a/lms/static/admin/js/prepopulate.js b/lms/static/admin/js/prepopulate.js
deleted file mode 100644
index 24f24f95a8..0000000000
--- a/lms/static/admin/js/prepopulate.js
+++ /dev/null
@@ -1,34 +0,0 @@
-(function($) {
-    $.fn.prepopulate = function(dependencies, maxLength) {
-        /*
-            Depends on urlify.js
-            Populates a selected field with the values of the dependent fields,
-            URLifies and shortens the string. 
-            dependencies - array of dependent fields id's 
-            maxLength - maximum length of the URLify'd string 
-        */
-        return this.each(function() {
-            var field = $(this);
-
-            field.data('_changed', false);
-            field.change(function() {
-                field.data('_changed', true);
-            });
-
-            var populate = function () {
-                // Bail if the fields value has changed
-                if (field.data('_changed') == true) return;
- 
-                var values = [];
-                $.each(dependencies, function(i, field) {
-                  if ($(field).val().length > 0) {
-                      values.push($(field).val());
-                  }
-                })
-                field.val(URLify(values.join(' '), maxLength));
-            };
-
-            $(dependencies.join(',')).keyup(populate).change(populate).focus(populate);
-        });
-    };
-})(django.jQuery);
diff --git a/lms/static/admin/js/prepopulate.min.js b/lms/static/admin/js/prepopulate.min.js
deleted file mode 100644
index ed3919c2f5..0000000000
--- a/lms/static/admin/js/prepopulate.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){a.fn.prepopulate=function(d,e){return this.each(function(){var b=a(this);b.data("_changed",!1);b.change(function(){b.data("_changed",!0)});var c=function(){if(!0!=b.data("_changed")){var c=[];a.each(d,function(b,d){0<a(d).val().length&&c.push(a(d).val())});b.val(URLify(c.join(" "),e))}};a(d.join(",")).keyup(c).change(c).focus(c)})}})(django.jQuery);
diff --git a/lms/static/admin/js/timeparse.js b/lms/static/admin/js/timeparse.js
deleted file mode 100644
index 882f41d56e..0000000000
--- a/lms/static/admin/js/timeparse.js
+++ /dev/null
@@ -1,94 +0,0 @@
-var timeParsePatterns = [
-    // 9
-    {   re: /^\d{1,2}$/i,
-        handler: function(bits) {
-            if (bits[0].length == 1) {
-                return '0' + bits[0] + ':00';
-            } else {
-                return bits[0] + ':00';
-            }
-        }
-    },
-    // 13:00
-    {   re: /^\d{2}[:.]\d{2}$/i,
-        handler: function(bits) {
-            return bits[0].replace('.', ':');
-        }
-    },
-    // 9:00
-    {   re: /^\d[:.]\d{2}$/i,
-        handler: function(bits) {
-            return '0' + bits[0].replace('.', ':');
-        }
-    },
-    // 3 am / 3 a.m. / 3am
-    {   re: /^(\d+)\s*([ap])(?:.?m.?)?$/i,
-        handler: function(bits) {
-            var hour = parseInt(bits[1]);
-            if (hour == 12) {
-                hour = 0;
-            }
-            if (bits[2].toLowerCase() == 'p') {
-                if (hour == 12) {
-                    hour = 0;
-                }
-                return (hour + 12) + ':00';
-            } else {
-                if (hour < 10) {
-                    return '0' + hour + ':00';
-                } else {
-                    return hour + ':00';
-                }
-            }
-        }
-    },
-    // 3.30 am / 3:15 a.m. / 3.00am
-    {   re: /^(\d+)[.:](\d{2})\s*([ap]).?m.?$/i,
-        handler: function(bits) {
-            var hour = parseInt(bits[1]);
-            var mins = parseInt(bits[2]);
-            if (mins < 10) {
-                mins = '0' + mins;
-            }
-            if (hour == 12) {
-                hour = 0;
-            }
-            if (bits[3].toLowerCase() == 'p') {
-                if (hour == 12) {
-                    hour = 0;
-                }
-                return (hour + 12) + ':' + mins;
-            } else {
-                if (hour < 10) {
-                    return '0' + hour + ':' + mins;
-                } else {
-                    return hour + ':' + mins;
-                }
-            }
-        }
-    },
-    // noon
-    {   re: /^no/i,
-        handler: function(bits) {
-            return '12:00';
-        }
-    },
-    // midnight
-    {   re: /^mid/i,
-        handler: function(bits) {
-            return '00:00';
-        }
-    }
-];
-
-function parseTimeString(s) {
-    for (var i = 0; i < timeParsePatterns.length; i++) {
-        var re = timeParsePatterns[i].re;
-        var handler = timeParsePatterns[i].handler;
-        var bits = re.exec(s);
-        if (bits) {
-            return handler(bits);
-        }
-    }
-    return s;
-}
diff --git a/lms/static/candy_res/README.txt b/lms/static/candy_res/README.txt
new file mode 100644
index 0000000000..36cc93890e
--- /dev/null
+++ b/lms/static/candy_res/README.txt
@@ -0,0 +1,7 @@
+This folder referenced in: lms/templates/courseware/courseware.html
+
+Notes from that file:
+
+## It'd be better to have this in a place like lms/css/vendor/candy,
+## but the candy_res/ folder contains images and other junk, and it
+## all needs to stay together for the Candy.js plugin to work.
diff --git a/lms/static/coffee/src/staff_grading/test_grading.html b/lms/static/coffee/src/staff_grading/test_grading.html
index 6d3a6e3637..e3fb1180b3 100644
--- a/lms/static/coffee/src/staff_grading/test_grading.html
+++ b/lms/static/coffee/src/staff_grading/test_grading.html
@@ -2,7 +2,7 @@
 <html> <head>
 <title></title>
 <!-- <script src="http://code.jquery.com/jquery-latest.js"></script> -->
-<script src="../../../admin/js/jquery.min.js"></script> 
+<script src="../../../../../common/static/js/vendor/jquery.min.js"></script> 
 <script type="text/javascript" src="staff_grading.js"></script>
 </head>
 
diff --git a/lms/static/contrib/xbook.html b/lms/static/contrib/xbook.html
deleted file mode 100644
index 3d6c42961a..0000000000
--- a/lms/static/contrib/xbook.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
-Copyright (c) 2012 Jeff Kent, https://jeffkent.net/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--->
-<html>
-<head>
-<title>6.002x Textbook for Kindle</title>
-<script type="text/javascript" src="https://mitxstatic.s3.amazonaws.com/js/jquery-1.6.2.min.js"></script>
-<script type="text/javascript" src="/static/js/jquery.cookie.js"></script>
-<script type="text/javascript">
-var exhibit = Object();
-exhibit.width = 960;
-exhibit.height = 1080;
-exhibit.ratio = exhibit.width / exhibit.height;
-exhibit.current = 1;
-exhibit.first = 1;
-exhibit.last = 1008;
-exhibit.url = "https://mitxstatic.s3.amazonaws.com/book_images/p{0}.png";
-exhibit.format = Array();
-exhibit.format[0] = {width: 550,
-                     height: 975,
-                     left_odd: -117,
-                     left_even: -295,
-                     top: -55,
-                     ratio: 550/975};
-exhibit.format[1] = {width: 775,
-                     height: 975,
-                     left_odd: -117,
-                     left_even: -70,
-                     top: -55,
-                     ratio: 775/975};
-exhibit.format[2] = {width: 960,
-                     height: 1080,
-                     left_odd: 0,
-                     left_even: 0,
-                     top: 0,
-                     ratio: 960/1080};
-
-var format_mode = 0;
-
-function zeropad(num, size){
-  var s = num+"";
-  while (s.length < size)
-    s = "0" + s;
-  return s;
-}
-
-function load(n){
-  var pg = 0;
-  if (exhibit.current <= 1)
-    pg = exhibit.current + n;
-  else if (exhibit.current < exhibit.last)
-    pg = exhibit.current - 1 + n;
-  else
-    pg = exhibit.last - 2 + n;
-
-  var url = exhibit.url.replace("{0}", zeropad(pg, 3));
-  var div = $("#exhibit" + n);
-  var img = $("#exhibit" + n + " img");
-  div.css({width:exhibit.format[format_mode].width + "px",
-           height:exhibit.format[format_mode].height + "px"});
-  img.css({position:"relative",
-           width:exhibit.width + "px",
-           height:exhibit.height + "px",
-           top:exhibit.format[format_mode].top + "px"});
-  if (pg % 2)
-    img.css({left:exhibit.format[format_mode].left_odd + "px"});
-  else
-    img.css({left:exhibit.format[format_mode].left_even + "px"});
-  img.attr("src", url);
-}
-
-function load_all(){
-  if (exhibit.current <= 1) {
-    load(0);
-    load(1);
-    load(2);
-  } else {
-    load(1);
-    load(2);
-    load(0);
-  }
-}
-
-function shift_up(){
-  $("#exhibit0").html("");
-  $("#exhibit1 img").appendTo("#exhibit0");
-  $("#exhibit1").html("");
-  $("#exhibit2 img").appendTo("#exhibit1");
-  $(window).scrollTop($(window).scrollTop() - exhibit.format[format_mode].height - 15);
-  $("#exhibit2").html("<img>");
-  load(2);
-}
-
-function shift_down(){
-  $("#exhibit2").html("");
-  $("#exhibit1 img").appendTo("#exhibit2");
-  $("#exhibit1").html("");
-  $("#exhibit0 img").appendTo("#exhibit1");
-  $(window).scrollTop($(window).scrollTop() + exhibit.format[format_mode].height + 15);
-  $("#exhibit0").html("<img>");
-  load(0);
-}
-
-function update_status(){
-  $("#status").html("&nbsp; " + exhibit.current + "/" + exhibit.last);
-}
-
-function goto_page(pg, offset){
-  offset = typeof offset !== 'undefined' ? offset : 0;
-
-  exhibit.current = pg;
-  load_all();
-  if (exhibit.current <= 1)
-    $(document).scrollTop(offset);
-  else if (exhibit.current < exhibit.last)
-    $(document).scrollTop((exhibit.format[format_mode].height + 15) + offset);
-  else
-    $(document).scrollTop((exhibit.format[format_mode].height + 15) * 2 + offset);
-
-  $.cookie('exhibit.current', exhibit.current, {expires: 7});
-  $.cookie('exhibit.offset', 0, {expires: 7});
-}
-
-function get_offset(){
-  var offset;
-
-  if (exhibit.current <= 1)
-    offset = $(document).scrollTop();
-  else if (exhibit.current < exhibit.last)
-    offset = $(document).scrollTop() - (exhibit.format[format_mode].height + 15);
-  else
-    offset = $(document).scrollTop() - (exhibit.format[format_mode].height + 15) * 2;
-
-  return offset;
-}
-
-$(function(){
-  $("#container").width(exhibit.format[format_mode].width);
-  setTimeout(function(){
-    var current = parseInt($.cookie("exhibit.current"),10);
-    var offset = parseInt($.cookie("exhibit.offset"),10);
-    current = (isNaN(current) || current < 1 || current > exhibit.last) ? 3 : current;
-    offset = isNaN(offset) ? 0 : offset;
-
-    goto_page(current, offset);
-    update_status();
-  },1);
-});
-
-$(window).keydown(function(e){
-  if (e.keyCode == 67) {        /* [c]ontents */
-    goto_page(9);
-  } else if (e.keyCode == 70) { /* [f]ormat */
-    if (format_mode < 2)
-      format_mode += 1;
-    else
-      format_mode = 0;
-    $("#container").width(exhibit.format[format_mode].width);
-    load_all();
-  } else if (e.keyCode == 71) { /* [g]oto */
-    var pg = prompt("Goto page: ");
-    if (pg !== null)
-      if (pg > 0 && pg <= exhibit.last)
-        goto_page(parseInt(pg,10));
-  } else if (e.keyCode == 73) { /* [i]ndex */
-    goto_page(997);
-  }
-});
-
-$(window).scroll(function(){
-  setTimeout(function(){
-    if (exhibit.current <= 1) {
-      if ($(window).scrollTop() + $(window).height()/2 >= (exhibit.format[format_mode].height + 15))
-        exhibit.current += 1;
-    } else if (exhibit.current <= exhibit.last - 1) {
-      if ($(window).scrollTop() + $(window).height()/2 < (exhibit.format[format_mode].height + 15)) {
-        exhibit.current -= 1;
-        if (exhibit.current != 1)
-	  shift_down();
-      } else if ($(window).scrollTop() + $(window).height()/2 >= (exhibit.format[format_mode].height + 15) * 2) {
-        exhibit.current += 1;
-        if (exhibit.current != exhibit.last)
-	  shift_up();
-      }
-    } else if (exhibit.current >= exhibit.last) {
-      if ($(window).scrollTop() + $(window).height()/2 < (exhibit.format[format_mode].height + 15) * 2)
-        exhibit.current -= 1;
-    }
-    $.cookie('exhibit.current', exhibit.current, {expires: 7});
-    $.cookie('exhibit.offset', get_offset(), {expires: 7});
-    update_status();
-  },1);
-});
-</script>
-<style type="text/css">
-body {
-  background-color: #333;
-  margin: 15px 0;
-}
-#status {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  background-color: black;
-  color: white;
-  width: 100%;
-  z-index: 100;
-}
-#help {
-  position: fixed;
-  bottom: 0;
-  right: 0;
-  color: white;
-  z-index:100;
-}
-#container {
-  overflow: hidden;
-  margin: 0 auto;
-}
-#exhibit0, #exhibit1, #exhibit2 {
-  overflow:hidden;
-}
-.spacer {
-  height: 15px;
-}
-</style>
-</head>
-<body>
-<div id="container">
-<div id="exhibit0"><img /></div>
-<div class="spacer"></div>
-<div id="exhibit1"><img /></div>
-<div class="spacer"></div>
-<div id="exhibit2"><img /></div>
-</div>
-<div id="status">&nbsp;</div>
-<div id="help">[g]oto [f]ormat [c]ontents [i]ndex &nbsp;</div>
-<div>&nbsp;<div>
-</body>
-</html>
diff --git a/lms/static/files/edx-identity.zip b/lms/static/files/edx-identity.zip
deleted file mode 100644
index c0394bf06a..0000000000
Binary files a/lms/static/files/edx-identity.zip and /dev/null differ
diff --git a/lms/static/images/BerkeleyX-on-edx-logo.png b/lms/static/images/BerkeleyX-on-edx-logo.png
deleted file mode 100644
index cb765ce2fa..0000000000
Binary files a/lms/static/images/BerkeleyX-on-edx-logo.png and /dev/null differ
diff --git a/lms/static/images/HarvardX-on-edx-logo.png b/lms/static/images/HarvardX-on-edx-logo.png
deleted file mode 100644
index a4d40f52b6..0000000000
Binary files a/lms/static/images/HarvardX-on-edx-logo.png and /dev/null differ
diff --git a/lms/static/images/MITx-on-edx-logo.png b/lms/static/images/MITx-on-edx-logo.png
deleted file mode 100644
index 156a08bcbc..0000000000
Binary files a/lms/static/images/MITx-on-edx-logo.png and /dev/null differ
diff --git a/lms/static/images/admin-actions-sprite.png b/lms/static/images/admin-actions-sprite.png
deleted file mode 100644
index b07a6d6b7b..0000000000
Binary files a/lms/static/images/admin-actions-sprite.png and /dev/null differ
diff --git a/lms/static/images/answer-icon.png b/lms/static/images/answer-icon.png
deleted file mode 100644
index 4779a6f42f..0000000000
Binary files a/lms/static/images/answer-icon.png and /dev/null differ
diff --git a/lms/static/images/askbot/comment-vote-up.png b/lms/static/images/askbot/comment-vote-up.png
deleted file mode 100644
index 05dc84e12e..0000000000
Binary files a/lms/static/images/askbot/comment-vote-up.png and /dev/null differ
diff --git a/lms/static/images/askbot/search-icon.png b/lms/static/images/askbot/search-icon.png
deleted file mode 100644
index b06aa1163d..0000000000
Binary files a/lms/static/images/askbot/search-icon.png and /dev/null differ
diff --git a/lms/static/images/askbot/vote-arrow-down.png b/lms/static/images/askbot/vote-arrow-down.png
deleted file mode 100644
index 501c2abfae..0000000000
Binary files a/lms/static/images/askbot/vote-arrow-down.png and /dev/null differ
diff --git a/lms/static/images/askbot/vote-arrow-up.png b/lms/static/images/askbot/vote-arrow-up.png
deleted file mode 100644
index 22de384120..0000000000
Binary files a/lms/static/images/askbot/vote-arrow-up.png and /dev/null differ
diff --git a/lms/static/images/askbot/wmd-buttons.png b/lms/static/images/askbot/wmd-buttons.png
deleted file mode 100755
index 1092100710..0000000000
Binary files a/lms/static/images/askbot/wmd-buttons.png and /dev/null differ
diff --git a/lms/static/images/bg-banner-example.png b/lms/static/images/bg-banner-example.png
deleted file mode 100644
index a52ffb6ef2..0000000000
Binary files a/lms/static/images/bg-banner-example.png and /dev/null differ
diff --git a/lms/static/images/bg-banner-login.png b/lms/static/images/bg-banner-login.png
deleted file mode 100644
index 85b3ad3c48..0000000000
Binary files a/lms/static/images/bg-banner-login.png and /dev/null differ
diff --git a/lms/static/images/bg-banner-register.png b/lms/static/images/bg-banner-register.png
deleted file mode 100644
index 807be395fa..0000000000
Binary files a/lms/static/images/bg-banner-register.png and /dev/null differ
diff --git a/lms/static/images/brazilstory_blog_arthur.jpg b/lms/static/images/brazilstory_blog_arthur.jpg
deleted file mode 100644
index 58efd75542..0000000000
Binary files a/lms/static/images/brazilstory_blog_arthur.jpg and /dev/null differ
diff --git a/lms/static/images/browse-icon.png b/lms/static/images/browse-icon.png
deleted file mode 100644
index 25df634b4a..0000000000
Binary files a/lms/static/images/browse-icon.png and /dev/null differ
diff --git a/lms/static/images/bullet-triangle.png b/lms/static/images/bullet-triangle.png
deleted file mode 100644
index d9d36f5a74..0000000000
Binary files a/lms/static/images/bullet-triangle.png and /dev/null differ
diff --git a/lms/static/images/courses/circuits.jpeg b/lms/static/images/courses/circuits.jpeg
deleted file mode 100644
index c939c8d604..0000000000
Binary files a/lms/static/images/courses/circuits.jpeg and /dev/null differ
diff --git a/lms/static/images/courses/edx_hp_video_thumbsmall.jpg b/lms/static/images/courses/edx_hp_video_thumbsmall.jpg
deleted file mode 100644
index 644fa8e065..0000000000
Binary files a/lms/static/images/courses/edx_hp_video_thumbsmall.jpg and /dev/null differ
diff --git a/lms/static/images/courses/history.png b/lms/static/images/courses/history.png
deleted file mode 100644
index c9dc8ada49..0000000000
Binary files a/lms/static/images/courses/history.png and /dev/null differ
diff --git a/lms/static/images/courses/math.png b/lms/static/images/courses/math.png
deleted file mode 100644
index 2652b15473..0000000000
Binary files a/lms/static/images/courses/math.png and /dev/null differ
diff --git a/lms/static/images/discussion/loading.gif b/lms/static/images/discussion/loading.gif
deleted file mode 100644
index 85638328a4..0000000000
Binary files a/lms/static/images/discussion/loading.gif and /dev/null differ
diff --git a/lms/static/images/document-download.png b/lms/static/images/document-download.png
deleted file mode 100644
index 767bf8029e..0000000000
Binary files a/lms/static/images/document-download.png and /dev/null differ
diff --git a/lms/static/images/edge-on-edx-logo.png b/lms/static/images/edge-on-edx-logo.png
deleted file mode 100644
index 41bd7127f5..0000000000
Binary files a/lms/static/images/edge-on-edx-logo.png and /dev/null differ
diff --git a/common/static/images/edge-logo-large.png b/lms/static/images/edx-edge-logo-large.png
similarity index 100%
rename from common/static/images/edge-logo-large.png
rename to lms/static/images/edx-edge-logo-large.png
diff --git a/lms/static/images/edx-location.png b/lms/static/images/edx-location.png
deleted file mode 100644
index 20f1ec18bc..0000000000
Binary files a/lms/static/images/edx-location.png and /dev/null differ
diff --git a/lms/static/images/edx-logo-large-color.png b/lms/static/images/edx-logo-large-color.png
deleted file mode 100644
index f2cffea7a7..0000000000
Binary files a/lms/static/images/edx-logo-large-color.png and /dev/null differ
diff --git a/lms/static/images/edx.png b/lms/static/images/edx.png
deleted file mode 100644
index 22ed9b92c3..0000000000
Binary files a/lms/static/images/edx.png and /dev/null differ
diff --git a/lms/static/images/endorse-icon.png b/lms/static/images/endorse-icon.png
deleted file mode 100644
index 4dc5c6e204..0000000000
Binary files a/lms/static/images/endorse-icon.png and /dev/null differ
diff --git a/lms/static/images/follow-dog-ear.png b/lms/static/images/follow-dog-ear.png
deleted file mode 100644
index 50371690ba..0000000000
Binary files a/lms/static/images/follow-dog-ear.png and /dev/null differ
diff --git a/lms/static/images/following-flag.png b/lms/static/images/following-flag.png
deleted file mode 100644
index ac95c4cfea..0000000000
Binary files a/lms/static/images/following-flag.png and /dev/null differ
diff --git a/lms/static/green-pointer.png b/lms/static/images/green-pointer.png
similarity index 100%
rename from lms/static/green-pointer.png
rename to lms/static/images/green-pointer.png
diff --git a/lms/static/images/home_bg.jpg b/lms/static/images/home_bg.jpg
deleted file mode 100644
index 6df3ab2f81..0000000000
Binary files a/lms/static/images/home_bg.jpg and /dev/null differ
diff --git a/lms/static/images/homepage-bg.jpg b/lms/static/images/homepage-bg.jpg
deleted file mode 100644
index 61da5545c1..0000000000
Binary files a/lms/static/images/homepage-bg.jpg and /dev/null differ
diff --git a/lms/static/images/courses/video-thumb.jpg b/lms/static/images/homepage-hero-video-thumb.jpg
similarity index 100%
rename from lms/static/images/courses/video-thumb.jpg
rename to lms/static/images/homepage-hero-video-thumb.jpg
diff --git a/lms/static/images/homepage_interns_placeholder_2025x550.jpg b/lms/static/images/homepage_interns_placeholder_2025x550.jpg
deleted file mode 100644
index d5d9b915da..0000000000
Binary files a/lms/static/images/homepage_interns_placeholder_2025x550.jpg and /dev/null differ
diff --git a/lms/static/images/icon-id.png b/lms/static/images/icon-id.png
deleted file mode 100644
index c740799681..0000000000
Binary files a/lms/static/images/icon-id.png and /dev/null differ
diff --git a/lms/static/images/info-icon-dark.png b/lms/static/images/info-icon-dark.png
deleted file mode 100644
index 4f22a5dac9..0000000000
Binary files a/lms/static/images/info-icon-dark.png and /dev/null differ
diff --git a/lms/static/images/intro-video.jpg b/lms/static/images/intro-video.jpg
deleted file mode 100644
index 45e309e7a4..0000000000
Binary files a/lms/static/images/intro-video.jpg and /dev/null differ
diff --git a/lms/static/images/logo-edx-support.png b/lms/static/images/logo-edx-support.png
deleted file mode 100644
index 054647c99f..0000000000
Binary files a/lms/static/images/logo-edx-support.png and /dev/null differ
diff --git a/lms/static/images/logo.png b/lms/static/images/logo.png
deleted file mode 100644
index 0ba6a4e175..0000000000
Binary files a/lms/static/images/logo.png and /dev/null differ
diff --git a/lms/static/images/logo_bw.png b/lms/static/images/logo_bw.png
deleted file mode 100644
index 236e3fd0c2..0000000000
Binary files a/lms/static/images/logo_bw.png and /dev/null differ
diff --git a/lms/static/images/logo_harvard_v5.png b/lms/static/images/logo_harvard_v5.png
deleted file mode 100644
index 0c8f016798..0000000000
Binary files a/lms/static/images/logo_harvard_v5.png and /dev/null differ
diff --git a/lms/static/images/moderator-delete-icon.png b/lms/static/images/moderator-delete-icon.png
deleted file mode 100644
index 966ff2f9c2..0000000000
Binary files a/lms/static/images/moderator-delete-icon.png and /dev/null differ
diff --git a/lms/static/images/moderator-edit-icon.png b/lms/static/images/moderator-edit-icon.png
deleted file mode 100644
index 7e28eedf42..0000000000
Binary files a/lms/static/images/moderator-edit-icon.png and /dev/null differ
diff --git a/lms/static/images/mongolia_post.jpeg b/lms/static/images/mongolia_post.jpeg
deleted file mode 100644
index 48949d14ee..0000000000
Binary files a/lms/static/images/mongolia_post.jpeg and /dev/null differ
diff --git a/lms/static/images/nested-icon.png b/lms/static/images/nested-icon.png
deleted file mode 100644
index 49dd1a8b69..0000000000
Binary files a/lms/static/images/nested-icon.png and /dev/null differ
diff --git a/lms/static/images/new-post-icons-full.png b/lms/static/images/new-post-icons-full.png
deleted file mode 100644
index 495273a7d3..0000000000
Binary files a/lms/static/images/new-post-icons-full.png and /dev/null differ
diff --git a/lms/static/images/new-post-icons.png b/lms/static/images/new-post-icons.png
deleted file mode 100644
index 9a916c05f2..0000000000
Binary files a/lms/static/images/new-post-icons.png and /dev/null differ
diff --git a/lms/static/images/pause-icon.png b/lms/static/images/pause-icon.png
deleted file mode 100644
index b24946d5cf..0000000000
Binary files a/lms/static/images/pause-icon.png and /dev/null differ
diff --git a/lms/static/images/play-icon.png b/lms/static/images/play-icon.png
deleted file mode 100644
index 4927729492..0000000000
Binary files a/lms/static/images/play-icon.png and /dev/null differ
diff --git a/lms/static/img/problem-editor-icons.png b/lms/static/images/problem-editor-icons.png
similarity index 100%
rename from lms/static/img/problem-editor-icons.png
rename to lms/static/images/problem-editor-icons.png
diff --git a/lms/static/images/profile.jpg b/lms/static/images/profile.jpg
deleted file mode 100644
index 306f80ec25..0000000000
Binary files a/lms/static/images/profile.jpg and /dev/null differ
diff --git a/lms/static/images/resolvedflag.png b/lms/static/images/resolvedflag.png
deleted file mode 100644
index 8e318f786c..0000000000
Binary files a/lms/static/images/resolvedflag.png and /dev/null differ
diff --git a/lms/static/images/schools.png b/lms/static/images/schools.png
deleted file mode 100644
index c41cac6eed..0000000000
Binary files a/lms/static/images/schools.png and /dev/null differ
diff --git a/lms/static/images/sidebar-resolved-icons.png b/lms/static/images/sidebar-resolved-icons.png
deleted file mode 100644
index 4ade554454..0000000000
Binary files a/lms/static/images/sidebar-resolved-icons.png and /dev/null differ
diff --git a/lms/static/images/slider-bars.png b/lms/static/images/slider-bars.png
deleted file mode 100644
index e5b005344c..0000000000
Binary files a/lms/static/images/slider-bars.png and /dev/null differ
diff --git a/lms/static/images/small-grey-arrows.png b/lms/static/images/small-grey-arrows.png
deleted file mode 100644
index d8d7a0e8be..0000000000
Binary files a/lms/static/images/small-grey-arrows.png and /dev/null differ
diff --git a/lms/static/images/small-header-logo.png b/lms/static/images/small-header-logo.png
deleted file mode 100644
index a841b5429d..0000000000
Binary files a/lms/static/images/small-header-logo.png and /dev/null differ
diff --git a/lms/static/images/staff-icons.png b/lms/static/images/staff-icons.png
deleted file mode 100644
index 7efb9a8cd1..0000000000
Binary files a/lms/static/images/staff-icons.png and /dev/null differ
diff --git a/lms/static/images/vcert-steps.png b/lms/static/images/vcert-steps.png
deleted file mode 100644
index d2aa4c032d..0000000000
Binary files a/lms/static/images/vcert-steps.png and /dev/null differ
diff --git a/lms/static/images/video-image.png b/lms/static/images/video-image.png
deleted file mode 100644
index 6963d04540..0000000000
Binary files a/lms/static/images/video-image.png and /dev/null differ
diff --git a/lms/static/images/vote-arrows.png b/lms/static/images/vote-arrows.png
deleted file mode 100644
index 6f84cdb271..0000000000
Binary files a/lms/static/images/vote-arrows.png and /dev/null differ
diff --git a/lms/static/images/vote-plus-icon.png b/lms/static/images/vote-plus-icon.png
deleted file mode 100644
index 1b9f87ad19..0000000000
Binary files a/lms/static/images/vote-plus-icon.png and /dev/null differ
diff --git a/lms/static/js/course_survey.js b/lms/static/js/course_survey.js
new file mode 100644
index 0000000000..a3cf936522
--- /dev/null
+++ b/lms/static/js/course_survey.js
@@ -0,0 +1,93 @@
+$(function() {
+
+    // adding js class for styling with accessibility in mind
+    $('body').addClass('js');
+
+    // form field label styling on focus
+    $("form :input").focus(function() {
+        $("label[for='" + this.id + "']").parent().addClass("is-focused");
+    }).blur(function() {
+        $("label").parent().removeClass("is-focused");
+    });
+
+    $('.status.message.submission-error').addClass("is-hidden");
+
+    toggleSubmitButton(true);
+
+    $('#survey-form').on('submit', function() {
+      /* validate required fields */
+
+        var $inputs = $('#survey-form :input');
+
+        $('.status.message.submission-error .message-copy').empty();
+
+        var cancel_submit = false;
+
+        $inputs.each(function() {
+            /* see if it is a required field and - if so - make sure user presented all information */
+            if (typeof $(this).attr("required") !== typeof undefined) {
+                var val = $(this).val();
+                if (typeof(val) === "string") {
+                    if (val.trim().length === 0) {
+                        var field_label = $(this).parent().find("label");
+                        $(this).parent().addClass('field-error');
+                        $('.status.message.submission-error .message-copy').append("<li class='error-item'>"+field_label.text()+"</li>");
+                        cancel_submit = true;
+                    }
+                } else if (typeof(val) === "object") {
+                    /* for SELECT statements */
+                    if (val === null || val.length === 0 || val[0] === "") {
+                        var field_label = $(this).parent().find("label");
+                        $(this).parent().addClass('field-error');
+                        $('.status.message.submission-error .message-copy').append("<li class='error-item'>"+field_label.text()+"</li>");
+                        cancel_submit = true;
+                    }
+                }
+            }
+        });
+
+        if (cancel_submit) {
+          $('.status.message.submission-error').
+            removeClass("is-hidden").
+            focus();
+          $("html, body").animate({ scrollTop: 0 }, "fast");
+          return false;
+        }
+
+        toggleSubmitButton(false);
+    });
+
+    $('#survey-form').on('ajax:error', function() {
+        toggleSubmitButton(true);
+    });
+
+    $('#survey-form').on('ajax:success', function(event, json, xhr) {
+        var url = json.redirect_url;
+        location.href = url;
+    });
+
+    $('#survey-form').on('ajax:error', function(event, jqXHR, textStatus) {
+        toggleSubmitButton(true);
+        json = $.parseJSON(jqXHR.responseText);
+        $('.status.message.submission-error').addClass('is-shown').focus();
+        $('.status.message.submission-error .message-copy').
+            html(gettext("There has been an error processing your survey.")).
+            stop().
+            css("display", "block");
+    });
+});
+
+function toggleSubmitButton(enable) {
+    var $submitButton = $('form .form-actions #submit');
+
+    if(enable) {
+        $submitButton.
+            removeClass('is-disabled').
+            removeProp('disabled');
+    }
+    else {
+        $submitButton.
+            addClass('is-disabled').
+            prop('disabled', true);
+    }
+}
diff --git a/lms/static/admin/js/urlify.js b/lms/static/js/vendor/urlify.js
similarity index 100%
rename from lms/static/admin/js/urlify.js
rename to lms/static/js/vendor/urlify.js
diff --git a/lms/static/maintenance/css/base.css b/lms/static/maintenance/css/base.css
deleted file mode 100644
index 9f3720eb4c..0000000000
--- a/lms/static/maintenance/css/base.css
+++ /dev/null
@@ -1,34 +0,0 @@
-@font-face {
-  font-family: "Open Sans";
-  font-weight: 300;
-  src: url('../../fonts/OpenSans/OpenSans-Light-webfont.eot?') format('eot'),
-    url('../../fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'),
-    url('../../fonts/OpenSans/OpenSans-Light-webfont.ttf')  format('truetype');
-}
-
-html, body {
-	height: 100%;
-	background: -webkit-radial-gradient(center, #fff, #e6e6e6);
-	background:    -moz-radial-gradient(center, #fff, #e6e6e6);
-	background:     -ms-radial-gradient(center, #fff, #e6e6e6);
-	background:      -o-radial-gradient(center, #fff, #e6e6e6);
-}
-
-body {
-	font-family: 'Open Sans', sans-serif;
-	font-weight: 300;
-}
-
-.legos {
-	width: 693px;
-	height: 327px;
-	margin: 0 auto 50px auto;
-	padding-top: 150px;
-}
-
-h1 {
-	font-size: 22px;
-	line-height: 36px;
-	color: #666;
-	text-align: center;
-}
diff --git a/lms/static/maintenance/css/reset.css b/lms/static/maintenance/css/reset.css
deleted file mode 100644
index 57a3be8506..0000000000
--- a/lms/static/maintenance/css/reset.css
+++ /dev/null
@@ -1,49 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	font-weight: inherit;
-	font-style: inherit;
-	font-size: 100%;
-	font-family: inherit;
-	vertical-align: baseline;
-}
-/* remember to define focus styles! */
-:focus {
-	outline: 0;
-}
-body {
-	line-height: 1;
-	color: black;
-	background: white;
-}
-ol, ul {
-	list-style: none;
-}
-/* tables still need 'cellspacing="0"' in the markup */
-table {
-	border-collapse: separate;
-	border-spacing: 0;
-}
-caption, th, td {
-	text-align: left;
-	font-weight: normal;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: "";
-}
-blockquote, q {
-	quotes: "" "";
-}
\ No newline at end of file
diff --git a/lms/static/maintenance/images/edx-legos.png b/lms/static/maintenance/images/edx-legos.png
deleted file mode 100644
index fefb13ec63..0000000000
Binary files a/lms/static/maintenance/images/edx-legos.png and /dev/null differ
diff --git a/lms/static/maintenance/index.html b/lms/static/maintenance/index.html
deleted file mode 100644
index ae18e77b82..0000000000
--- a/lms/static/maintenance/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<link rel="stylesheet" href="css/reset.css">
-	<link rel="stylesheet" href="css/base.css">
-</head>
-<body>
-
-	<div class="legos">
-		<img src="images/edx-legos.png" />
-	</div>
-
-	<h1>
-		We’re busy building a brand new edX.<br />
-		We’ll be right back!
-	</h1>
-
-</body>
-</html>
diff --git a/lms/static/pixel.jpg b/lms/static/pixel.jpg
deleted file mode 100644
index 8fbe381c7a..0000000000
Binary files a/lms/static/pixel.jpg and /dev/null differ
diff --git a/lms/static/sass/_shame.scss b/lms/static/sass/_shame.scss
index 86ac923028..432e8e0309 100644
--- a/lms/static/sass/_shame.scss
+++ b/lms/static/sass/_shame.scss
@@ -121,7 +121,7 @@
 // ====================
 
 // edx.org marketing site - needed, but bad overrides with importants
-.view-register, .view-login, .view-passwordreset {
+.view-register, .view-login, .view-passwordreset, .view-survey {
 
   .form-actions button[type="submit"] {
     text-transform: none;
diff --git a/lms/static/sass/application-extend1-rtl.scss.mako b/lms/static/sass/application-extend1-rtl.scss.mako
index d27c97d0c4..a7e8fe9a7a 100644
--- a/lms/static/sass/application-extend1-rtl.scss.mako
+++ b/lms/static/sass/application-extend1-rtl.scss.mako
@@ -55,6 +55,7 @@
 @import 'multicourse/error-pages';
 @import 'multicourse/help';
 @import 'multicourse/edge';
+@import 'multicourse/survey-page';
 
 @import 'developer'; // used for any developer-created scss that needs further polish/refactoring
 @import 'shame';     // used for any bad-form/orphaned scss
diff --git a/lms/static/sass/application-extend1.scss.mako b/lms/static/sass/application-extend1.scss.mako
index dd184fb6be..beb628e653 100644
--- a/lms/static/sass/application-extend1.scss.mako
+++ b/lms/static/sass/application-extend1.scss.mako
@@ -55,6 +55,7 @@
 @import 'multicourse/error-pages';
 @import 'multicourse/help';
 @import 'multicourse/edge';
+@import 'multicourse/survey-page';
 
 @import 'developer'; // used for any developer-created scss that needs further polish/refactoring
 @import 'shame';     // used for any bad-form/orphaned scss
diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss
index 0cf0689e46..6b150fc6f4 100644
--- a/lms/static/sass/base/_variables.scss
+++ b/lms/static/sass/base/_variables.scss
@@ -412,7 +412,7 @@ $login-banner-image: url(../images/bg-banner-account.png);
 $register-banner-image: url(../images/bg-banner-account.png);
 $passwordreset-banner-image: url(../images/bg-banner-account.png);
 
-$video-thumb-url: '../images/courses/video-thumb.jpg';
+$video-thumb-url: '../images/homepage-hero-video-thumb.jpg';
 
 // ====================
 
diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
index b1fb86cdb4..cae12beae8 100644
--- a/lms/static/sass/course/courseware/_courseware.scss
+++ b/lms/static/sass/course/courseware/_courseware.scss
@@ -209,6 +209,10 @@ div.course-wrapper {
       margin-top: lh();
       line-height: lh();
       font-family: Consolas, "Lucida Console", Monaco, "Courier New", Courier, monospace;
+
+      // Debugging content is always in English, therefore it's never RTL
+      direction: ltr;
+      text-align: left;
     }
 
     div.ui-tabs {
diff --git a/lms/static/sass/course/discussion/_form-wmd-toolbar.scss b/lms/static/sass/course/discussion/_form-wmd-toolbar.scss
index 7d9b81c1ff..ce8e270dd2 100644
--- a/lms/static/sass/course/discussion/_form-wmd-toolbar.scss
+++ b/lms/static/sass/course/discussion/_form-wmd-toolbar.scss
@@ -52,7 +52,7 @@
   margin-left: 5px;
   margin-right: 5px;
   position: absolute;
-  background-image: url(../images/askbot/wmd-buttons.png);
+  background-image: url(../images/wmd-buttons.png);
   background-repeat: no-repeat;
   background-position: 0px 0px;
   display: inline-block; 
diff --git a/lms/static/sass/course/layout/_courseware_header.scss b/lms/static/sass/course/layout/_courseware_header.scss
index 1539ec8444..113e794c44 100644
--- a/lms/static/sass/course/layout/_courseware_header.scss
+++ b/lms/static/sass/course/layout/_courseware_header.scss
@@ -155,7 +155,7 @@ header.global.slim {
 
   h2 {
     display: block;
-    width: 700px;
+    width: 550px;
     @include float(left);
     font-size: 0.9em;
     font-weight: 600;
diff --git a/lms/static/sass/discussion/utilities/_shame.scss b/lms/static/sass/discussion/utilities/_shame.scss
index 928c9b3cdf..5f3a6a2772 100644
--- a/lms/static/sass/discussion/utilities/_shame.scss
+++ b/lms/static/sass/discussion/utilities/_shame.scss
@@ -18,8 +18,8 @@
   border: 1px solid $gray-l2 !important;
   border-radius: 3px !important;
   height: auto !important;
-  padding-left: ($baseline/4) !important;
-  padding-right: ($baseline/2 + 12px) !important; // Leave room for icon
+  @include padding-left($baseline/4 !important);
+  @include padding-right($baseline/2 + 12px !important); // Leave room for icon
   font-size: 12px !important;
 }
 
diff --git a/lms/static/sass/multicourse/_edge.scss b/lms/static/sass/multicourse/_edge.scss
index e7c9a67624..e591ae74d8 100644
--- a/lms/static/sass/multicourse/_edge.scss
+++ b/lms/static/sass/multicourse/_edge.scss
@@ -175,7 +175,7 @@ $paleYellow: #fffcf1;
     width: 263px;
     height: 72px;
     margin: 150px auto 50px;
-    background: url(../images/edge-logo-large.png) no-repeat;
+    background: url(../images/edx-edge-logo-large.png) no-repeat;
     text-indent: -9999px;
     overflow: hidden;
   }
diff --git a/lms/static/sass/multicourse/_survey-page.scss b/lms/static/sass/multicourse/_survey-page.scss
new file mode 100644
index 0000000000..7ed0894494
--- /dev/null
+++ b/lms/static/sass/multicourse/_survey-page.scss
@@ -0,0 +1,162 @@
+// full-page course survey styles
+
+.view-survey {
+
+  .container {
+    padding: ($baseline*1.5) 0;
+  }
+
+  .content-primary {
+    @include float(left);
+    @include margin-right(flex-gutter());
+    width: flex-grid(9,12);
+  }
+
+  .content-supplementary {
+    @include float(left);
+    width: flex-grid(3,12);
+    margin-top: ($baseline*2);
+  }
+
+  .header-survey {
+
+    .title {
+      @extend %t-title4;
+      @extend %t-weight4;
+      margin-bottom: $baseline;
+      border-bottom: 1px solid $gray-l4;
+      padding-bottom: ($baseline/2);
+    }
+
+    .course-info {
+      @extend %t-title;
+      padding-bottom: ($baseline/4);
+    }
+
+    .course-org,
+    .course-number {
+      @extend %t-title8;
+      display: inline-block;
+      text-transform: uppercase;
+      color: $gray-l1;
+    }
+
+    .course-org {
+      @include margin-right($baseline/4);
+    }
+
+    .course-name {
+      @extend %t-title5;
+      display: block;
+    }
+  }
+
+  // reset nasty LMS default styles
+  form {
+
+    h1, h2 {
+      text-align: inherit;
+      letter-spacing: inherit;
+      text-transform: inherit;
+    }
+  }
+
+  .instructions {
+    margin-bottom: $baseline;
+    font-style: italic;
+    @extend %t-copy-base;
+  }
+
+  .message.submission-error {
+    display: block;
+    margin-bottom: ($baseline);
+    border-top: 3px solid $error-color;
+    @include padding( ($baseline), ($baseline*1.5), ($baseline*1.5), ($baseline*1.5) );
+    background-color: tint($error-color,85%);
+
+    .message-title {
+      @extend %t-title5;
+      @extend %t-weight4;
+      margin-bottom: ($baseline/2);
+      color: $error-color;
+    }
+
+    .message-copy {
+      @extend %ui-no-list;
+      line-height: 1.3;
+
+      .error-item {
+        margin-bottom: ($baseline/3);
+      }
+    }
+
+    &.is-hidden {
+      display: none;
+    }
+  }
+
+  .list-input {
+    @extend %ui-no-list;
+
+    .field {
+      margin-bottom: $baseline;
+
+      &.required label:after {
+        content: "*";
+        @include margin-left($baseline/4);
+      }
+
+      .tip {
+        @extend %t-copy-sub2;
+        display: block;
+        margin-top: ($baseline/4);
+        color: $gray;
+      }
+
+      &.is-focused {
+
+        .tip {
+          color: $base-font-color;
+        }
+      }
+    }
+  }
+
+  .action-primary {
+    @extend %m-btn-primary;
+    @extend %t-copy-base;
+    @include padding-left($baseline*2);
+  }
+
+  .action-cancel {
+    @extend %t-copy-sub1;
+    @include margin-left($baseline);
+  }
+
+  // override basic label styles
+  label {
+    @extend %t-copy-base;
+    @extend %t-weight4;
+    display: block;
+    font-style: normal;
+  }
+
+  // override basic form input styles
+  button, input, select, textarea {
+    @extend %t-copy-sub1;
+  }
+
+  .bit {
+    margin-bottom: $baseline;
+
+    .title {
+      @extend %t-title7;
+      @extend %t-weight4;
+    }
+
+    p {
+      @extend %t-copy-sub1;
+      color: $gray;
+    }
+  }
+}
diff --git a/lms/static/staff/agarwal-mit-news-small.jpg b/lms/static/staff/agarwal-mit-news-small.jpg
deleted file mode 100644
index 900038d394..0000000000
Binary files a/lms/static/staff/agarwal-mit-news-small.jpg and /dev/null differ
diff --git a/lms/static/staff/cjt-small.jpg b/lms/static/staff/cjt-small.jpg
deleted file mode 100644
index 4e8537de0b..0000000000
Binary files a/lms/static/staff/cjt-small.jpg and /dev/null differ
diff --git a/lms/static/staff/gjs-small.jpg b/lms/static/staff/gjs-small.jpg
deleted file mode 100644
index 4863d30b9e..0000000000
Binary files a/lms/static/staff/gjs-small.jpg and /dev/null differ
diff --git a/lms/static/staff/pmitros-small.jpg b/lms/static/staff/pmitros-small.jpg
deleted file mode 100644
index ff63f6f9fd..0000000000
Binary files a/lms/static/staff/pmitros-small.jpg and /dev/null differ
diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html
index 620de57eb8..77063c099c 100644
--- a/lms/templates/courseware/course_about.html
+++ b/lms/templates/courseware/course_about.html
@@ -151,6 +151,17 @@
           <span class="add-to-cart">
             ${_('This course is in your <a href="{cart_link}">cart</a>.').format(cart_link=cart_link)}
           </span>
+        % elif is_course_full:
+          <span class="register disabled">
+            ${_("Course is full")}
+          </span>
+        % elif invitation_only and not can_enroll:
+          <span class="register disabled">${_("Enrollment in this course is by invitation only")}</span>
+        ## Shib courses need the enrollment button to be displayed even when can_enroll is False,
+        ## because AnonymousUsers cause can_enroll for shib courses to be False, but we need them to be able to click
+        ## so that they can register and become a real user that can enroll.
+        % elif not is_shib_course and not can_enroll:
+          <span class="register disabled">${_("Enrollment is Closed")}</span>
         %elif settings.FEATURES.get('ENABLE_PAID_COURSE_REGISTRATION') and registration_price:
           <%
           if user.is_authenticated():
@@ -166,17 +177,6 @@
                       cost=registration_price)}
           </a>
           <div id="register_error"></div>
-        % elif is_course_full:
-          <span class="register disabled">
-            ${_("Course is full")}
-          </span>
-        % elif invitation_only and not can_enroll:
-          <span class="register disabled">${_("Enrollment in this course is by invitation only")}</span>
-        ## Shib courses need the enrollment button to be displayed even when can_enroll is False,
-        ## because AnonymousUsers cause can_enroll for shib courses to be False, but we need them to be able to click
-        ## so that they can register and become a real user that can enroll.
-        % elif not is_shib_course and not can_enroll:
-          <span class="register disabled">${_("Enrollment is Closed")}</span>
         %else:
           <a href="#" class="register">
             ${_("Register for {course.display_number_with_default}").format(course=course) | h}
diff --git a/lms/templates/courseware/mktg_course_about.html b/lms/templates/courseware/mktg_course_about.html
index a4fcc1d58c..3b63e61ebd 100644
--- a/lms/templates/courseware/mktg_course_about.html
+++ b/lms/templates/courseware/mktg_course_about.html
@@ -53,9 +53,7 @@
           %endif
         %elif allow_registration:
         <a class="action action-register register ${'has-option-verified' if len(course_modes) > 1 else ''}"
-            %if user.is_authenticated():
-                href="${reverse('about_course', args=[course.id.to_deprecated_string()])}"
-            %else:
+            %if not user.is_authenticated():
                 href="${reverse('register_user')}?course_id=${course.id | u}&enrollment_action=enroll"
             %endif
         >${_("Enroll in")} <strong>${course.display_number_with_default | h}</strong>
diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html b/lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
index 8b3d18165d..c75501cd0b 100644
--- a/lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
+++ b/lms/templates/instructor/instructor_dashboard_2/instructor_analytics.html
@@ -15,18 +15,6 @@
   </div>
 </script>
 
-%if settings.FEATURES.get('ENABLE_ANALYTICS_ACTIVE_COUNT'):
-  <div class="enrollment-wrapper" style="margin-bottom: 40px;">
-    <h2>${_("Active Students")}</h2>
-    <span class="tip">${_("The count of students who interacted at least once by opening pages, playing videos, posting in discussions, submitting problems, or completing other activities. The date range includes all activities from midnight on the start date (inclusive) though midnight on the end date (exclusive).")}</span>
-    <br/><br/>
-    <span style="color: green;"><b>${ section_data['active_student_count'] }</b></span>
-      for the week of (${ section_data['active_student_count_start'] } - ${ section_data['active_student_count_end'] })
-  </div>
-%endif
-
-<hr>
-
 %if settings.FEATURES['ENABLE_INSTRUCTOR_ANALYTICS']:
   <script type="text/template" id="grade-distributions-widget-template">
     <div class="grade-distributions-widget">
@@ -56,24 +44,28 @@
   <hr>
 %endif
 
-<div class="profile-distribution-widget-container"
-  data-title="${_("Year of Birth")}"
-  data-feature="year_of_birth"
-  data-endpoint="${ section_data['get_distribution_url'] }"
-></div>
+%if settings.FEATURES['DISPLAY_ANALYTICS_DEMOGRAPHICS']:
+    <div class="profile-distribution-widget-container"
+      data-title="${_("Year of Birth")}"
+      data-feature="year_of_birth"
+      data-endpoint="${ section_data['get_distribution_url'] }"
+    ></div>
 
-<hr>
+    <hr>
 
-<div class="profile-distribution-widget-container"
-  data-title="${_("Gender Distribution")}"
-  data-feature="gender"
-  data-endpoint="${ section_data['get_distribution_url'] }"
-></div>
+    <div class="profile-distribution-widget-container"
+      data-title="${_("Gender Distribution")}"
+      data-feature="gender"
+      data-endpoint="${ section_data['get_distribution_url'] }"
+    ></div>
 
-<hr>
+    <hr>
 
-<div class="profile-distribution-widget-container"
-  data-title="${_("Level of Education")}"
-  data-feature="level_of_education"
-  data-endpoint="${ section_data['get_distribution_url'] }"
-></div>
+    <div class="profile-distribution-widget-container"
+      data-title="${_("Level of Education")}"
+      data-feature="level_of_education"
+      data-endpoint="${ section_data['get_distribution_url'] }"
+    ></div>
+%elif section_data['demographic_message']:
+    <p><em>${section_data['demographic_message']}</em></p>
+%endif
diff --git a/lms/templates/shoppingcart/receipt.html b/lms/templates/shoppingcart/receipt.html
index 9c50a4e3db..65edb6d5d9 100644
--- a/lms/templates/shoppingcart/receipt.html
+++ b/lms/templates/shoppingcart/receipt.html
@@ -1,6 +1,7 @@
 <%inherit file="shopping_cart_flow.html" />
 <%! from django.utils.translation import ugettext as _ %>
 <%! from django.core.urlresolvers import reverse %>
+<%! from microsite_configuration import microsite %>
 <%!
 from courseware.courses import course_image_url, get_course_about_section, get_course_by_id
 %>
@@ -30,14 +31,8 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
         % if order_type == 'personal':
            ## in case of multiple courses in single self purchase scenario,
            ## we will show the button View Dashboard
-          % if len(shoppingcart_items) > 1 :
-            <% dashboard_url = reverse('dashboard') %>
-            <a href="${dashboard_url}" class="blue pull-right">${_("View Dashboard")} <i class="icon-caret-right"></i></a>
-          % elif shoppingcart_items and shoppingcart_items[0][1]:
-            <% course = shoppingcart_items[0][1] %>
-            <% course_info_url = reverse('info', kwargs={'course_id': course.id.to_deprecated_string()}) %>
-            <a href="${course_info_url}" class="blue pull-right">${_("View Course")} <i class="icon-caret-right"></i></a>
-          %endif
+          <% dashboard_url = reverse('dashboard') %>
+          <a href="${dashboard_url}" class="blue pull-right">${_("View Dashboard")} <i class="icon-caret-right"></i></a>
           ${_("You have successfully been enrolled for <b>{appended_course_names}</b>. The following receipt has been emailed to"
           " <strong>{appended_recipient_emails}</strong>").format(appended_course_names=appended_course_names, appended_recipient_emails=appended_recipient_emails)}
         % elif order_type == 'business':
@@ -356,6 +351,8 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
         <span class="pull-right">${_("Total")}: <b>$${"{0:0.2f}".format(order.total_cost)} USD</b></span>
       </div>
     </div>
+    ## Allow for a microsite to be able to insert additional text at the bottom of the page
+    <%include file="${microsite.get_template_path('receipt_custom_pane.html')}" />
   </section>
 </div>
 </%block>
diff --git a/lms/templates/shoppingcart/receipt_custom_pane.html b/lms/templates/shoppingcart/receipt_custom_pane.html
new file mode 100644
index 0000000000..08755f0a8e
--- /dev/null
+++ b/lms/templates/shoppingcart/receipt_custom_pane.html
@@ -0,0 +1,2 @@
+## Intentionally left blank. This Mako template can be overriden by a microsite template to insert brand
+## specific HTML into the lower pane of the receipt.html page
diff --git a/lms/templates/shoppingcart/verified_cert_receipt.html b/lms/templates/shoppingcart/verified_cert_receipt.html
index 885694c241..2924d515c2 100644
--- a/lms/templates/shoppingcart/verified_cert_receipt.html
+++ b/lms/templates/shoppingcart/verified_cert_receipt.html
@@ -13,23 +13,21 @@
 % endif
 
 <div class="container">
-  <section class="wrapper cart-list">
+  <section class="wrapper">
 
     <header class="page-header">
       <h2 class="title">
-        <span class="sts-label">${_("You are now registered for: ")}</span>
 
         <span class="wrapper-sts">
-          <span class="sts-course">
-            <span class="sts-course-org">${course_org}</span>
-            <span class="sts-course-number">${course_num}</span>
-            <span class="sts-course-name">${course_name}</span>
-          </span>
+          <span class="sts-label">${_("You are now registered for: ")}</span>
+          <span class="sts-course-org">${course_org}</span>
+          <span class="sts-course-number">${course_num}</span>
+          <span class="sts-course-name">${course_name}</span>
+        </span>
 
-          <span class="sts-track">
-            <span class="sts-track-value">
-              <span class="context">${_("Registered as: ")}</span> ${_("ID Verified")}
-            </span>
+        <span class="sts-track">
+          <span class="sts-track-value">
+            <span class="context">${_("Registered as: ")}</span> ${_("ID Verified")}
           </span>
         </span>
       </h2>
diff --git a/lms/templates/split_test_author_view.html b/lms/templates/split_test_author_view.html
index ece87663c8..ede487e199 100644
--- a/lms/templates/split_test_author_view.html
+++ b/lms/templates/split_test_author_view.html
@@ -1,20 +1,13 @@
 <%! from django.utils.translation import ugettext as _ %>
-<%! from xmodule.split_test_module import ValidationMessageType %>
 
 <%
 split_test = context.get('split_test')
 user_partition = split_test.descriptor.get_selected_partition()
-messages = split_test.descriptor.validation_messages()
 show_link = group_configuration_url is not None
 %>
 
-% if is_root and not is_configured:
-    <div class="no-container-content">
-% else:
-    <div class="wrapper-xblock-message">
-% endif
-
-% if user_partition:
+% if is_configured:
+<div class="wrapper-xblock-message">
     <div class="xblock-message information">
         <p>
             <span class="message-text">
@@ -24,56 +17,8 @@ show_link = group_configuration_url is not None
             </span>
         </p>
     </div>
-% endif
-% if len(messages) > 0:
-    <%
-    general_validation = split_test.descriptor.general_validation_message
-    def get_validation_icon(validation_type):
-        if validation_type == ValidationMessageType.error:
-            return 'icon-exclamation-sign'
-        elif validation_type == ValidationMessageType.warning:
-            return 'icon-warning-sign'
-        return None
-
-    aggregate_validation_class = 'has-errors' if general_validation['type']==ValidationMessageType.error else ' has-warnings'
-    %>
-    <div class="xblock-message validation ${aggregate_validation_class}">
-    % if is_configured:
-        <p class="${general_validation['type']}"><i class="${get_validation_icon(general_validation['type'])}"></i>
-        ${general_validation['message']}
-        </p>
-    % endif
-    % if is_root or not is_configured:
-        <ul class="xblock-message-list">
-        % for message in messages:
-            <%
-            message_type = message.message_type
-            message_type_display_name = ValidationMessageType.display_name(message_type) if message_type else None
-            %>
-                <li class="xblock-message-item ${message_type}">
-                    % if not is_configured:
-                        <i class="${get_validation_icon(message_type)}"></i>
-                    % endif
-                    <span class="message-text">
-                        % if message_type_display_name:
-                            <span class="sr">${message_type_display_name}:</span>
-                        % endif
-                        ${unicode(message)}
-
-                    % if message.action_class:
-                        <a href="#" class="button action-button ${message.action_class}">
-                            <span class="action-button-text">${message.action_label}</span>
-                        </a>
-                    % endif
-                    </span>
-                </li>
-        % endfor
-        </ul>
-    % endif
-    </div>
-% endif
-
 </div>
+% endif
 
 % if is_root:
     <div class="wrapper-groups is-active">
diff --git a/lms/templates/survey/survey.html b/lms/templates/survey/survey.html
new file mode 100644
index 0000000000..4c8bc9a5b5
--- /dev/null
+++ b/lms/templates/survey/survey.html
@@ -0,0 +1,69 @@
+<%! from django.utils.translation import ugettext as _ %>
+
+<%inherit file="../main.html" />
+
+<%namespace name='static' file='../static_content.html'/>
+
+<%! from django.core.urlresolvers import reverse %>
+<%! from django.utils import html %>
+
+<%block name="pagetitle">${_("User Survey")}</%block>
+
+<%block name="bodyclass">view-survey</%block>
+
+<%block name="js_extra">
+  <script type="text/javascript" src="/static/js/course_survey.js"></script>
+</%block>
+
+<section class="container">
+  <section role="main" class="content-primary">
+    <form role="form" id="survey-form" method="post" data-remote="true" action="${postback_url}" novalidate>
+      <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }" />
+      <input type="hidden" name="_redirect_url" value="${redirect_url}" />
+
+      % if course:
+        <div class="header-survey">
+          <h4 class="course-info">
+            <span class="course-org">${course.display_org_with_default}</span><span class="course-number"> ${course.display_number_with_default}</span>
+            <span class="course-name">${course.display_name}</span>
+          </h4>
+          <h3 class="title">${_("Pre-Course Survey")}</h3>
+        </div>
+
+        <p class="instructions">
+          ${_("You can begin your course as soon as you complete the following form. Required fields are marked with an asterisk (*).")}
+        </p>
+      % endif
+
+      <div role="alert" class="status message submission-error" tabindex="-1">
+        <h3 class="message-title">${_("You are missing the following required fields:")} </h3>
+        <ul class="message-copy"> </ul>
+      </div>
+
+      ${survey_form}
+
+      <div class="form-actions">
+        <button name="submit" type="submit" id="submit" class="action action-primary action-update">${_('Submit')}</button>
+        <a class="action action-cancel" href='${dashboard_redirect_url}'>${_("Cancel and Return to Dashboard")}</a>
+      </div>
+    </form>
+  </section>
+
+    <aside class="content-supplementary" role="complementary">
+
+      <div class="bit">
+        <h3 class="title">${_('Why do I need to complete this information?')}</h3>
+        <p>
+          ${_('We use the information you provide to improve our course for both current and future students. The more we know about your specific needs, the better we can make your course experience.')}
+        </p>
+      </div>
+
+      <div class="bit">
+        <h3 class="title">${_('Who can I contact if I have questions?')}</h3>
+        <p>
+          ${_('If you have any questions about this course or this form, you can contact <a href="{mail_to_link}"">{mail_to_link}</a>.').format(mail_to_link=mail_to_link)}
+        </p>
+      </div>
+    </aside>
+
+</section>
diff --git a/lms/templates/verify_student/_verification_header.html b/lms/templates/verify_student/_verification_header.html
index 8a1cdadac2..40dfa7dd1d 100644
--- a/lms/templates/verify_student/_verification_header.html
+++ b/lms/templates/verify_student/_verification_header.html
@@ -3,18 +3,37 @@
 <header class="page-header">
     <h2 class="title">
         <span class="wrapper-sts">
+            <% organization = '<span class="sts-course-org">' + course_org + '</span>' %>
+            <% course_name = '<span class="sts-course-number">' + course_num + '</span> <span class="sts-course-name">' + 'course_name' + '</span>' %>
             % if upgrade:
-                <span class="sts-label">${_("You are upgrading your enrollment for")}</span>
+                <span class="sts-label">
+                    ${_("You are upgrading your enrollment for {organization}'s {course_name}").format(
+                        organization=organization,
+                        course_name=course_name
+                    )}
+                </span>
             % elif reverify:
-                <span class="sts-label">${_("You are re-verifying for")}</span>
+                <span class="sts-label">
+                    ${_("You are re-verifying for {organization}'s {course_name}").format(
+                        organization=organization,
+                        course_name=course_name
+                    )}
+                </span>
             % elif modes_dict and "professional" in modes_dict:
-                <span class="sts-label">${_("You are registering for")}</span>
+                <span class="sts-label">
+                    ${_("You are enrolling in {organization}'s {course_name}").format(
+                        organization=organization,
+                        course_name=course_name
+                    )}
+                </span>
             % else:
-                <span class="sts-label">${_("Congrats! You are now enrolled in the audit track")}</span>
+                <span class="sts-label">
+                    ${_("Congrats! You are now enrolled in {organization}'s {course_name}").format(
+                        organization=organization,
+                        course_name=course_name
+                    )}
+                </span>
             % endif
-                <span class="sts-course-org">${course_org}'s</span>
-                <span class="sts-course-number">${course_num}</span>
-                <span class="sts-course-name">${course_name}</span>
         </span>
 
         % if modes_dict and "professional" in modes_dict:
@@ -27,11 +46,20 @@
             <span class="sts-track">
                 <span class="sts-track-value">
                     % if upgrade:
-                        <span class="context">${_("Upgrading to:")}</span> ${_("Verified")}
+                        ${_("{span_start}Upgrading to:{span_end} Verified").format(
+                            span_start='<span class="context">',
+                            span_end='</span>'
+                        )}
                     % elif reverify:
-                        <span class="context">${_("Re-verifying for:")}</span> ${_("Verified")}
+                        ${_("{span_start}Re-verifying for:{span_end} Verified").format(
+                            span_start='<span class="context">',
+                            span_end='</span>'
+                        )}
                     % else:
-                        <span class="context">${_("Registering as: ")}</span> ${_("Verified")}
+                        ${_("{span_start}Enrolling as:{span_end} Verified").format(
+                            span_start='<span class="context">',
+                            span_end='</span>'
+                        )}
                     % endif
                 </span>
             </span>
diff --git a/lms/templates/wiki/create.html b/lms/templates/wiki/create.html
index 806f5c7840..f975491fc9 100644
--- a/lms/templates/wiki/create.html
+++ b/lms/templates/wiki/create.html
@@ -7,7 +7,7 @@
 {% block wiki_contents %}
 
   {% addtoblock "js" %}
-  <script type="text/javascript" src="{{ STATIC_URL }}admin/js/urlify.js "></script>
+  <script type="text/javascript" src="{{ STATIC_URL }}js/vendor/urlify.js "></script>
   <script type="text/javascript">
   //<![CDATA[
   (function($) {
diff --git a/lms/tests.py b/lms/tests.py
index 846e888675..447523b707 100644
--- a/lms/tests.py
+++ b/lms/tests.py
@@ -4,7 +4,6 @@ import mimetypes
 from mock import patch
 
 from django.test import TestCase
-from django.test.utils import override_settings
 from django.core.urlresolvers import reverse
 
 from edxmako import add_lookup, LOOKUP
diff --git a/lms/urls.py b/lms/urls.py
index caafbb9d0d..69bc7beaaf 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -28,7 +28,7 @@ urlpatterns = ('',  # nopep8
     url(r'^reject_name_change$', 'student.views.reject_name_change'),
     url(r'^pending_name_changes$', 'student.views.pending_name_changes'),
     url(r'^event$', 'track.views.user_track'),
-    url(r'^segmentio/event$', 'track.views.segmentio.track_segmentio_event'),
+    url(r'^segmentio/event$', 'track.views.segmentio.segmentio_event'),
     url(r'^t/(?P<template>[^/]*)$', 'static_template_view.views.index'),   # TODO: Is this used anymore? What is STATIC_GRAB?
 
     url(r'^accounts/login$', 'student.views.accounts_login', name="accounts_login"),
@@ -81,6 +81,8 @@ urlpatterns = ('',  # nopep8
 if settings.FEATURES["ENABLE_MOBILE_REST_API"]:
     urlpatterns += (
         url(r'^api/mobile/v0.5/', include('mobile_api.urls')),
+        # Video Abstraction Layer used to allow video teams to manage video assets
+        # independently of courseware. https://github.com/edx/edx-val
         url(r'^api/val/v0/', include('edxval.urls')),
     )
 
@@ -123,7 +125,7 @@ favicon_path = microsite.get_value('favicon_path', settings.FAVICON_PATH)
 urlpatterns += ((
     r'^favicon\.ico$',
     'django.views.generic.simple.redirect_to',
-    {'url':  settings.STATIC_URL + favicon_path}
+    {'url': settings.STATIC_URL + favicon_path}
 ),)
 
 # Semi-static views only used by edX, not by themes
@@ -154,7 +156,7 @@ if not settings.FEATURES["USE_CUSTOM_THEME"]:
 
         # Press releases
         url(r'^press/([_a-zA-Z0-9-]+)$', 'static_template_view.views.render_press_release', name='press_release'),
-)
+    )
 
 # Only enable URLs for those marketing links actually enabled in the
 # settings. Disable URLs by marking them as None.
@@ -262,6 +264,10 @@ if settings.COURSEWARE_ENABLED:
         url(r'^courses/{}/syllabus$'.format(settings.COURSE_ID_PATTERN),
             'courseware.views.syllabus', name="syllabus"),   # TODO arjun remove when custom tabs in place, see courseware/courses.py
 
+        #Survey associated with a course
+        url(r'^courses/{}/survey$'.format(settings.COURSE_ID_PATTERN),
+            'courseware.views.course_survey', name="course_survey"),
+
         url(r'^courses/{}/book/(?P<book_index>\d+)/$'.format(settings.COURSE_ID_PATTERN),
             'staticbook.views.index', name="book"),
         url(r'^courses/{}/book/(?P<book_index>\d+)/(?P<page>\d+)$'.format(settings.COURSE_ID_PATTERN),
@@ -453,6 +459,10 @@ urlpatterns += (
     url(r'^shoppingcart/', include('shoppingcart.urls')),
 )
 
+# Survey Djangoapp
+urlpatterns += (
+    url(r'^survey/', include('survey.urls')),
+)
 
 if settings.FEATURES.get('AUTH_USE_OPENID_PROVIDER'):
     urlpatterns += (
@@ -531,6 +541,7 @@ if settings.FEATURES.get('AUTOMATIC_AUTH_FOR_TESTING'):
 if settings.FEATURES.get('ENABLE_THIRD_PARTY_AUTH'):
     urlpatterns += (
         url(r'', include('third_party_auth.urls')),
+        url(r'^login_oauth_token/(?P<backend>[^/]+)/$', 'student.views.login_oauth_token'),
     )
 
 
diff --git a/lms/wsgi.py b/lms/wsgi.py
index 1f7a0e37c7..f47a3851c2 100644
--- a/lms/wsgi.py
+++ b/lms/wsgi.py
@@ -25,4 +25,3 @@ modulestore()
 # as well as any WSGI server configured to use this file.
 from django.core.wsgi import get_wsgi_application
 application = get_wsgi_application()
-
diff --git a/pavelib/paver_tests/test_paver_get_quality_reports.py b/pavelib/paver_tests/test_paver_get_quality_reports.py
new file mode 100644
index 0000000000..75352bed0c
--- /dev/null
+++ b/pavelib/paver_tests/test_paver_get_quality_reports.py
@@ -0,0 +1,48 @@
+import os
+import tempfile
+import unittest
+from mock import patch, Mock
+from ddt import ddt, file_data
+
+import pavelib.quality
+import paver.easy
+from paver.easy import BuildFailure
+
+
+
+class TestGetReportFiles(unittest.TestCase):
+    """
+    Ensure only the report files we want are returned as part of run_quality.
+    """
+
+    @patch('os.walk')
+    def test_get_pylint_reports(self, my_mock):
+
+        my_mock.return_value = iter([
+            ('/foo', ('',), ('pylint.report',)),
+            ('/bar', ('/baz',), ('pylint.report',))
+        ])
+        reports = pavelib.quality.get_violations_reports("pylint")
+        self.assertEqual(len(reports), 2)
+
+    @patch('os.walk')
+    def test_get_pep8_reports(self, my_mock):
+        my_mock.return_value = iter([
+            ('/foo', ('',), ('pep8.report',)),
+            ('/bar', ('/baz',), ('pep8.report',))
+        ])
+        reports = pavelib.quality.get_violations_reports("pep8")
+        self.assertEqual(len(reports), 2)
+
+    @patch('os.walk')
+    def test_get_pep8_reports_noisy(self, my_mock):
+        """ Several conditions: different report types, different files, multiple files """
+        my_mock.return_value = iter([
+            ('/foo', ('',), ('pep8.report',)),
+            ('/fooz', ('/ball',), ('pylint.report',)),
+            ('/fooz', ('/ball',), ('non.report',)),
+            ('/fooz', ('/ball',), ('lms.xml',)),
+            ('/bar', ('/baz',), ('pep8.report',))
+        ])
+        reports = pavelib.quality.get_violations_reports("pep8")
+        self.assertEqual(len(reports), 2)
diff --git a/pavelib/quality.py b/pavelib/quality.py
index 42f5f14860..887b0997a8 100644
--- a/pavelib/quality.py
+++ b/pavelib/quality.py
@@ -146,12 +146,7 @@ def run_quality(options):
     # If pep8 reports exist, use those
     # Otherwise, `diff-quality` will call pep8 itself
 
-    pep8_files = []
-    for subdir, _dirs, files in os.walk(os.path.join(Env.REPORT_DIR)):
-        for f in files:
-            if f == "pep8.report":
-                pep8_files.append(os.path.join(subdir, f))
-
+    pep8_files = get_violations_reports("pep8")
     pep8_reports = u' '.join(pep8_files)
 
     try:
@@ -173,12 +168,7 @@ def run_quality(options):
     # If pylint reports exist, use those
     # Otherwise, `diff-quality` will call pylint itself
 
-    pylint_files = []
-    for subdir, _dirs, files in os.walk(os.path.join(Env.REPORT_DIR)):
-        for f in files:
-            if f == "pylint.report":
-                pylint_files.append(os.path.join(subdir, f))
-
+    pylint_files = get_violations_reports("pylint")
     pylint_reports = u' '.join(pylint_files)
 
     pythonpath_prefix = (
@@ -217,3 +207,15 @@ def is_percentage_failure(error_message):
         return False
     else:
         return True
+
+
+def get_violations_reports(violations_type):
+    """
+    Finds violations reports files by naming convention (e.g., all "pep8.report" files)
+    """
+    violations_files = []
+    for subdir, _dirs, files in os.walk(os.path.join(Env.REPORT_DIR)):
+        for f in files:
+            if f == "{violations_type}.report".format(violations_type=violations_type):
+                violations_files.append(os.path.join(subdir, f))
+    return violations_files
diff --git a/pavelib/utils/test/suites/nose_suite.py b/pavelib/utils/test/suites/nose_suite.py
index bdb83c92a6..4e0e0992d8 100644
--- a/pavelib/utils/test/suites/nose_suite.py
+++ b/pavelib/utils/test/suites/nose_suite.py
@@ -48,9 +48,12 @@ class NoseTestSuite(TestSuite):
             # will run the importable coverage rather than the
             # coverage that OS path finds.
 
+            if not cmd0.endswith('.py'):
+                cmd0 = "`which {}`".format(cmd0)
+
             cmd = (
                 "python -m coverage run --rcfile={root}/.coveragerc "
-                "`which {cmd0}` {cmd_rest}".format(
+                "{cmd0} {cmd_rest}".format(
                     root=self.root,
                     cmd0=cmd0,
                     cmd_rest=cmd_rest,
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index d58d506cbb..ebe6ac6e24 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -44,6 +44,7 @@ git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b
 GitPython==0.3.2.RC1
 glob2==0.3
 gunicorn==0.17.4
+httpretty==0.8.3
 lazy==1.1
 lxml==3.3.6
 mako==0.9.1
@@ -76,6 +77,7 @@ scipy==0.14.0
 Shapely==1.2.16
 singledispatch==3.4.0.2
 sorl-thumbnail==11.12
+sortedcontainers==0.9.2
 South==0.7.6
 stevedore==0.14.1
 sure==1.2.3
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index db2516943b..45fcf555f9 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -11,6 +11,7 @@
 -e git+https://github.com/edx/django-pipeline.git@88ec8a011e481918fdc9d2682d4017c835acd8be#egg=django-pipeline
 -e git+https://github.com/edx/django-wiki.git@cd0b2b31997afccde519fe5b3365e61a9edb143f#egg=django-wiki
 -e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-2#egg=django-oauth2-provider
+-e git+https://github.com/edx/MongoDBProxy.git@efe14679c9263ab491916ed960f5930127e05faf#egg=mongodb_proxy
 -e git+https://github.com/gabrielfalcao/lettuce.git@cccc3978ad2df82a78b6f9648fe2e9baddd22f88#egg=lettuce
 -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
 -e git+https://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk
@@ -20,18 +21,17 @@
 -e git+https://github.com/pmitros/django-pyfs.git@d175715e0fe3367ec0f1ee429c242d603f6e8b10#egg=djpyfs
 
 # Our libraries:
--e git+https://github.com/edx/XBlock.git@246811773c67a84fdb17614a8e9f7ec7b1890574#egg=XBlock
+-e git+https://github.com/edx/XBlock.git@2029af2a4b524310847decfb34ef39da8a30dc4e#egg=XBlock
 -e git+https://github.com/edx/codejail.git@66dd5a45e5072666ff9a70c768576e9ffd1daa4b#egg=codejail
 -e git+https://github.com/edx/diff-cover.git@v0.7.1#egg=diff_cover
 -e git+https://github.com/edx/js-test-tool.git@v0.1.5#egg=js_test_tool
 -e git+https://github.com/edx/event-tracking.git@0.1.0#egg=event-tracking
--e git+https://github.com/edx/edx-analytics-data-api-client.git@0.1.0#egg=edx-analytics-data-api-client
 -e git+https://github.com/edx/bok-choy.git@4a259e3548a19e41cc39433caf68ea58d10a27ba#egg=bok_choy
 -e git+https://github.com/edx-solutions/django-splash.git@7579d052afcf474ece1239153cffe1c89935bc4f#egg=django-splash
 -e git+https://github.com/edx/acid-block.git@df1a7f0cae46567c251d507b8c72168aed8ec042#egg=acid-xblock
--e git+https://github.com/edx/edx-ora2.git@release-2014-09-18T16.00#egg=edx-ora2
+-e git+https://github.com/edx/edx-ora2.git@release-2014-10-27T19.33#egg=edx-ora2
 -e git+https://github.com/edx/opaque-keys.git@0.1.2#egg=opaque-keys
 -e git+https://github.com/edx/ease.git@97de68448e5495385ba043d3091f570a699d5b5f#egg=ease
 -e git+https://github.com/edx/i18n-tools.git@56f048af9b6868613c14aeae760548834c495011#egg=i18n-tools
--e git+https://github.com/edx/edx-oauth2-provider.git@0.2.2#egg=oauth2-provider
+-e git+https://github.com/edx/edx-oauth2-provider.git@0.3.1#egg=oauth2-provider
 -e git+https://github.com/edx/edx-val.git@a3c54afe30375f7a5755ba6f6412a91de23c3b86#egg=edx-val
diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
index e61c034847..894d6bbc79 100755
--- a/scripts/all-tests.sh
+++ b/scripts/all-tests.sh
@@ -56,8 +56,8 @@ set -e
 ###############################################################################
 
 # Violations thresholds for failing the build
-PYLINT_THRESHOLD=4800
-PEP8_THRESHOLD=675
+PYLINT_THRESHOLD=4725
+PEP8_THRESHOLD=400
 
 source $HOME/jenkins_env
 
diff --git a/scripts/run_unit_tests.sh b/scripts/run_unit_tests.sh
new file mode 100755
index 0000000000..dce6b3d4c9
--- /dev/null
+++ b/scripts/run_unit_tests.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+EXIT=0
+
+store_exit_code() {
+    code=$?
+    if [ ${code} -ne 0 ]
+    then
+        EXIT=${code}
+    fi
+}
+
+
+echo 'Configuring jscover...'
+mkdir -p jscover-dist && wget http://files.edx.org/testeng/JSCover-1.0.2.zip -P jscover-dist && unzip jscover-dist/JSCover-1.0.2.zip -d jscover-dist/ && cp jscover-dist/target/dist/JSCover-all.jar jscover-dist && export JSCOVER_JAR=$PWD/jscover-dist/JSCover-all.jar
+store_exit_code
+echo 'jscover configured'
+
+paver test
+store_exit_code
+
+echo 'Collecting Coverage...'
+paver coverage
+store_exit_code
+echo 'Coverage Collection Completed'
+
+
+current_path=`pwd`
+reports_path=${current_path}/reports
+dest_path=${HOME}/results/${TDDIUM_SESSION_ID}/session/
+unit_combined_rpt=${reports_path}/diff_coverage_combined.html
+
+echo 'Copying '${unit_combined_rpt}' to '${dest_path}
+cp -f ${unit_combined_rpt} ${dest_path}
+store_exit_code
+echo 'Copied '${unit_combined_rpt}
+
+echo 'Merging unit coverage reports...'
+python ./scripts/cov_merge.py unit && python ./scripts/metrics/publish.py
+store_exit_code
+echo 'Unit coverage reports merged'
+
+exit ${EXIT}
+
diff --git a/scripts/run_ut.sh b/scripts/run_ut.sh
deleted file mode 100755
index fddacc9f65..0000000000
--- a/scripts/run_ut.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-mkdir -p jscover-dist && wget http://files.edx.org/testeng/JSCover-1.0.2.zip -P jscover-dist && unzip jscover-dist/JSCover-1.0.2.zip -d jscover-dist/ && cp jscover-dist/target/dist/JSCover-all.jar jscover-dist && export JSCOVER_JAR=$PWD/jscover-dist/JSCover-all.jar && paver test
-
-echo '******************************************************'
-
-echo 'Collecting Coverage...'
-
-paver coverage
-
-echo 'Coverage Collection Completed'
-
-
-current_path=`pwd`
-reports_path=$current_path/reports
-dest_path=$HOME/results/$TDDIUM_SESSION_ID/session/
-unit_combined_rpt=$reports_path/diff_coverage_combined.html
-
-echo 'Copying '$unit_combined_rpt' to '$dest_path
-
-cp -f $unit_combined_rpt $dest_path
-
-echo '******************************************************'
diff --git a/tddium.yml b/tddium.yml
index dfb77a8a84..1ca5e5f2e4 100644
--- a/tddium.yml
+++ b/tddium.yml
@@ -36,7 +36,7 @@ tddium:
       - "reports/diff_quality/diff_quality_pylint.html"
     - :type: junit
       :mode: basic
-      :command: bash ./scripts/run_ut.sh && python ./scripts/cov_merge.py unit && python ./scripts/metrics/publish.py
+      :command: bash ./scripts/run_unit_tests.sh
       :invocation: single
       :output: exit-status
       :report_files: