diff --git a/.gitignore b/.gitignore
index 2fd1ca0181..493df5a7fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,5 @@ lms/lib/comment_client/python
 nosetests.xml
 cover_html/
 .idea/
+.redcar/
 chromedriver.log
\ No newline at end of file
diff --git a/.redcar/lucene/segments.gen b/.redcar/lucene/segments.gen
new file mode 100644
index 0000000000..568652b956
Binary files /dev/null and b/.redcar/lucene/segments.gen differ
diff --git a/.redcar/lucene_last_updated b/.redcar/lucene_last_updated
new file mode 100644
index 0000000000..3692c8e076
--- /dev/null
+++ b/.redcar/lucene_last_updated
@@ -0,0 +1 @@
+1360614836
diff --git a/.redcar/redcar.lock b/.redcar/redcar.lock
new file mode 100644
index 0000000000..0677ede437
--- /dev/null
+++ b/.redcar/redcar.lock
@@ -0,0 +1 @@
+10664: Locked by 10664 at Mon Feb 11 14:22:22 -0500 2013
diff --git a/.redcar/storage/cursor_saver.yaml b/.redcar/storage/cursor_saver.yaml
new file mode 100644
index 0000000000..ba9b833044
--- /dev/null
+++ b/.redcar/storage/cursor_saver.yaml
@@ -0,0 +1,4 @@
+--- 
+cursor_positions: []
+
+files_to_retain: 0
diff --git a/.redcar/tags.REMOVED.git-id b/.redcar/tags.REMOVED.git-id
new file mode 100644
index 0000000000..f8318e5f1f
--- /dev/null
+++ b/.redcar/tags.REMOVED.git-id
@@ -0,0 +1 @@
+ce76efcea5f0a5b2238364f81d54f1d393853a1a
\ No newline at end of file
diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index b79d86b52f..66e6551019 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -5,7 +5,7 @@ from django.test.utils import override_settings
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from path import path
-from tempfile import mkdtemp
+from tempdir import mkdtemp_clean
 import json
 from fs.osfs import OSFS
 import copy
@@ -194,7 +194,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         import_from_xml(ms, 'common/test/data/', ['full'])
         location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
 
-        root_dir = path(mkdtemp())
+        root_dir = path(mkdtemp_clean())
 
         print 'Exporting to tempdir = {0}'.format(root_dir)
 
@@ -264,6 +264,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         self.assertContains(resp, '/c4x/edX/full/asset/handouts_schematic_tutorial.pdf')
 
 
+
 class ContentStoreTest(ModuleStoreTestCase):
     """
     Tests for the CMS ContentStore application.
@@ -421,6 +422,64 @@ class ContentStoreTest(ModuleStoreTestCase):
         self.assertIn('markdown', problem.metadata, "markdown is missing from metadata")
         self.assertNotIn('markdown', problem.editable_metadata_fields, "Markdown slipped into the editable metadata fields")
 
+    def test_import_metadata_with_attempts_empty_string(self):
+        import_from_xml(modulestore(), 'common/test/data/', ['simple'])
+        ms = modulestore('direct')
+        did_load_item = False
+        try:       
+            ms.get_item(Location(['i4x', 'edX', 'simple', 'problem', 'ps01-simple', None]))
+            did_load_item = True
+        except ItemNotFoundError:
+            pass
+
+        # make sure we found the item (e.g. it didn't error while loading)
+        self.assertTrue(did_load_item)   
+
+    def test_metadata_inheritance(self):
+        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+
+        ms = modulestore('direct')
+        course = ms.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))
+
+        verticals = ms.get_items(['i4x', 'edX', 'full', 'vertical', None, None])
+
+        # let's assert on the metadata_inheritance on an existing vertical
+        for vertical in verticals:
+            self.assertIn('xqa_key', vertical.metadata)
+            self.assertEqual(course.metadata['xqa_key'], vertical.metadata['xqa_key'])
+
+        self.assertGreater(len(verticals), 0)
+
+        new_component_location = Location('i4x', 'edX', 'full', 'html', 'new_component')
+        source_template_location = Location('i4x', 'edx', 'templates', 'html', 'Blank_HTML_Page')
+        
+        # crate a new module and add it as a child to a vertical
+        ms.clone_item(source_template_location, new_component_location)
+        parent = verticals[0]
+        ms.update_children(parent.location, parent.definition.get('children', []) + [new_component_location.url()])
+
+        # flush the cache
+        ms.get_cached_metadata_inheritance_tree(new_component_location, -1)
+        new_module = ms.get_item(new_component_location)
+
+        # check for grace period definition which should be defined at the course level
+        self.assertIn('graceperiod', new_module.metadata)
+
+        self.assertEqual(course.metadata['graceperiod'], new_module.metadata['graceperiod'])
+
+        #
+        # now let's define an override at the leaf node level
+        #
+        new_module.metadata['graceperiod'] = '1 day'
+        ms.update_metadata(new_module.location, new_module.metadata)
+
+        # flush the cache and refetch
+        ms.get_cached_metadata_inheritance_tree(new_component_location, -1)
+        new_module = ms.get_item(new_component_location)
+
+        self.assertIn('graceperiod', new_module.metadata)
+        self.assertEqual('1 day', new_module.metadata['graceperiod'])
+
 
 class TemplateTestCase(ModuleStoreTestCase):
 
diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py
index 166982e35f..c4a46459e2 100644
--- a/cms/djangoapps/contentstore/tests/tests.py
+++ b/cms/djangoapps/contentstore/tests/tests.py
@@ -4,7 +4,6 @@ from django.test.client import Client
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from path import path
-from tempfile import mkdtemp
 import json
 from fs.osfs import OSFS
 import copy
diff --git a/cms/djangoapps/contentstore/tests/utils.py b/cms/djangoapps/contentstore/tests/utils.py
index be028b2836..b6b8cd5023 100644
--- a/cms/djangoapps/contentstore/tests/utils.py
+++ b/cms/djangoapps/contentstore/tests/utils.py
@@ -1,6 +1,6 @@
 import json
 import copy
-from time import time
+from uuid import uuid4
 from django.test import TestCase
 from django.conf import settings
 
@@ -20,13 +20,12 @@ class ModuleStoreTestCase(TestCase):
     def _pre_setup(self):
         super(ModuleStoreTestCase, self)._pre_setup()
 
-        # Use the current seconds since epoch to differentiate
+        # Use a uuid to differentiate
         # the mongo collections on jenkins.
-        sec_since_epoch = '%s' % int(time() * 100)
         self.orig_MODULESTORE = copy.deepcopy(settings.MODULESTORE)
         self.test_MODULESTORE = self.orig_MODULESTORE
-        self.test_MODULESTORE['default']['OPTIONS']['collection'] = 'modulestore_%s' % sec_since_epoch
-        self.test_MODULESTORE['direct']['OPTIONS']['collection'] = 'modulestore_%s' % sec_since_epoch
+        self.test_MODULESTORE['default']['OPTIONS']['collection'] = 'modulestore_%s' % uuid4().hex
+        self.test_MODULESTORE['direct']['OPTIONS']['collection'] = 'modulestore_%s' % uuid4().hex
         settings.MODULESTORE = self.test_MODULESTORE
 
         # Flush and initialize the module store
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 281dd97f20..50f237c374 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -20,7 +20,6 @@ Longer TODO:
 """
 
 import sys
-import tempfile
 import os.path
 import os
 import lms.envs.common
@@ -59,7 +58,8 @@ sys.path.append(COMMON_ROOT / 'lib')
 
 ############################# WEB CONFIGURATION #############################
 # This is where we stick our compiled template files.
-MAKO_MODULE_DIR = tempfile.mkdtemp('mako')
+from tempdir import mkdtemp_clean
+MAKO_MODULE_DIR = mkdtemp_clean('mako')
 MAKO_TEMPLATES = {}
 MAKO_TEMPLATES['main'] = [
     PROJECT_ROOT / 'templates',
diff --git a/cms/static/js/models/settings/course_details.js b/cms/static/js/models/settings/course_details.js
index 168cb960be..97d71f6c79 100644
--- a/cms/static/js/models/settings/course_details.js
+++ b/cms/static/js/models/settings/course_details.js
@@ -68,10 +68,10 @@ CMS.Models.Settings.CourseDetails = Backbone.Model.extend({
     save_videosource: function(newsource) {
         // newsource either is <video youtube="speed:key, *"/> or just the "speed:key, *" string
         // returns the videosource for the preview which iss the key whose speed is closest to 1
-        if (_.isEmpty(newsource) && !_.isEmpty(this.get('intro_video'))) this.set({'intro_video': null}); 
+        if (_.isEmpty(newsource) && !_.isEmpty(this.get('intro_video'))) this.save({'intro_video': null}); 
         // TODO remove all whitespace w/in string
         else {
-            if (this.get('intro_video') !== newsource) this.set('intro_video', newsource);
+            if (this.get('intro_video') !== newsource) this.save('intro_video', newsource);
         }
 
         return this.videosourceSample();
diff --git a/cms/static/sass/_courseware.scss b/cms/static/sass/_courseware.scss
index f2bd25c601..45ea111b6f 100644
--- a/cms/static/sass/_courseware.scss
+++ b/cms/static/sass/_courseware.scss
@@ -498,6 +498,7 @@ input.courseware-unit-search-input {
     }
 
     &.new-section {
+
         header {
             height: auto;
             @include clearfix();
@@ -506,6 +507,15 @@ input.courseware-unit-search-input {
         .expand-collapse-icon {
             visibility: hidden;
         }
+
+        .item-details {
+          padding: 25px 0 0 0;
+
+          .section-name {
+            float: none;
+            width: 100%;
+          }
+        }
     }
 }
 
diff --git a/common/djangoapps/course_groups/cohorts.py b/common/djangoapps/course_groups/cohorts.py
index 155f82e0c7..f0234ec71a 100644
--- a/common/djangoapps/course_groups/cohorts.py
+++ b/common/djangoapps/course_groups/cohorts.py
@@ -6,6 +6,7 @@ forums, and to the cohort admin views.
 from django.contrib.auth.models import User
 from django.http import Http404
 import logging
+import random
 
 from courseware import courses
 from student.models import get_user_by_username_or_email
@@ -64,7 +65,23 @@ def is_commentable_cohorted(course_id, commentable_id):
                                                                ans))
     return ans
 
+    
+def get_cohorted_commentables(course_id):
+    """
+    Given a course_id return a list of strings representing cohorted commentables
+    """
 
+    course = courses.get_course_by_id(course_id)
+    
+    if not course.is_cohorted:
+        # this is the easy case :)
+        ans = []
+    else: 
+        ans = course.cohorted_discussions
+
+    return ans
+    
+    
 def get_cohort(user, course_id):
     """
     Given a django User and a course_id, return the user's cohort in that
@@ -96,9 +113,30 @@ def get_cohort(user, course_id):
                                             group_type=CourseUserGroup.COHORT,
                                             users__id=user.id)
     except CourseUserGroup.DoesNotExist:
-        # TODO: add auto-cohorting logic here once we know what that will be.
+        # Didn't find the group.  We'll go on to create one if needed.
+        pass
+
+    if not course.auto_cohort:
         return None
 
+    choices = course.auto_cohort_groups
+    if len(choices) == 0:
+        # Nowhere to put user
+        log.warning("Course %s is auto-cohorted, but there are no"
+                    " auto_cohort_groups specified",
+                    course_id)
+        return None
+
+    # Put user in a random group, creating it if needed
+    group_name = random.choice(choices)
+    group, created = CourseUserGroup.objects.get_or_create(
+        course_id=course_id,
+        group_type=CourseUserGroup.COHORT,
+        name=group_name)
+    
+    user.course_groups.add(group)
+    return group
+
 
 def get_course_cohorts(course_id):
     """
diff --git a/common/djangoapps/course_groups/tests/tests.py b/common/djangoapps/course_groups/tests/tests.py
index b3ad928b39..efed39d536 100644
--- a/common/djangoapps/course_groups/tests/tests.py
+++ b/common/djangoapps/course_groups/tests/tests.py
@@ -47,7 +47,10 @@ class TestCohorts(django.test.TestCase):
 
     @staticmethod
     def config_course_cohorts(course, discussions,
-                              cohorted, cohorted_discussions=None):
+                              cohorted,
+                              cohorted_discussions=None,
+                              auto_cohort=None,
+                              auto_cohort_groups=None):
         """
         Given a course with no discussion set up, add the discussions and set
         the cohort config appropriately.
@@ -59,6 +62,9 @@ class TestCohorts(django.test.TestCase):
             cohorted: bool.
             cohorted_discussions: optional list of topic names.  If specified,
                 converts them to use the same ids as topic names.
+            auto_cohort: optional bool.
+            auto_cohort_groups: optional list of strings
+                      (names of groups to put students into).
 
         Returns:
             Nothing -- modifies course in place.
@@ -76,6 +82,12 @@ class TestCohorts(django.test.TestCase):
         if cohorted_discussions is not None:
             d["cohorted_discussions"] = [to_id(name)
                                          for name in cohorted_discussions]
+
+        if auto_cohort is not None:
+            d["auto_cohort"] = auto_cohort
+        if auto_cohort_groups is not None:
+            d["auto_cohort_groups"] = auto_cohort_groups
+
         course.metadata["cohort_config"] = d
 
 
@@ -89,12 +101,9 @@ class TestCohorts(django.test.TestCase):
 
 
     def test_get_cohort(self):
-        # Need to fix this, but after we're testing on staging.  (Looks like
-        # problem is that when get_cohort internally tries to look up the
-        # course.id, it fails, even though we loaded it through the modulestore.
-
-        # Proper fix: give all tests a standard modulestore that uses the test
-        # dir.
+        """
+        Make sure get_cohort() does the right thing when the course is cohorted
+        """
         course = modulestore().get_course("edX/toy/2012_Fall")
         self.assertEqual(course.id, "edX/toy/2012_Fall")
         self.assertFalse(course.is_cohorted)
@@ -122,6 +131,54 @@ class TestCohorts(django.test.TestCase):
         self.assertEquals(get_cohort(other_user, course.id), None,
                           "other_user shouldn't have a cohort")
 
+    def test_auto_cohorting(self):
+        """
+        Make sure get_cohort() does the right thing when the course is auto_cohorted
+        """
+        course = modulestore().get_course("edX/toy/2012_Fall")
+        self.assertEqual(course.id, "edX/toy/2012_Fall")
+        self.assertFalse(course.is_cohorted)
+
+        user1 = User.objects.create(username="test", email="a@b.com")
+        user2 = User.objects.create(username="test2", email="a2@b.com")
+        user3 = User.objects.create(username="test3", email="a3@b.com")
+
+        cohort = CourseUserGroup.objects.create(name="TestCohort",
+                                                course_id=course.id,
+                               group_type=CourseUserGroup.COHORT)
+
+        # user1 manually added to a cohort
+        cohort.users.add(user1)
+
+        # Make the course auto cohorted...
+        self.config_course_cohorts(course, [], cohorted=True,
+                                   auto_cohort=True,
+                                   auto_cohort_groups=["AutoGroup"])
+
+        self.assertEquals(get_cohort(user1, course.id).id, cohort.id,
+                          "user1 should stay put")
+
+        self.assertEquals(get_cohort(user2, course.id).name, "AutoGroup",
+                          "user2 should be auto-cohorted")
+
+        # Now make the group list empty
+        self.config_course_cohorts(course, [], cohorted=True,
+                                   auto_cohort=True,
+                                   auto_cohort_groups=[])
+
+        self.assertEquals(get_cohort(user3, course.id), None,
+                          "No groups->no auto-cohorting")
+        
+        # Now make it different
+        self.config_course_cohorts(course, [], cohorted=True,
+                                   auto_cohort=True,
+                                   auto_cohort_groups=["OtherGroup"])
+
+        self.assertEquals(get_cohort(user3, course.id).name, "OtherGroup",
+                          "New list->new group")
+        self.assertEquals(get_cohort(user2, course.id).name, "AutoGroup",
+                          "user2 should still be in originally placed cohort")
+
 
     def test_get_course_cohorts(self):
         course1_id = 'a/b/c'
diff --git a/common/djangoapps/mitxmako/makoloader.py b/common/djangoapps/mitxmako/makoloader.py
index 29184299b6..d623e8bcff 100644
--- a/common/djangoapps/mitxmako/makoloader.py
+++ b/common/djangoapps/mitxmako/makoloader.py
@@ -9,6 +9,7 @@ from django.template.loaders.app_directories import Loader as AppDirectoriesLoad
 from mitxmako.template import Template
 import mitxmako.middleware
 
+import tempdir
 
 log = logging.getLogger(__name__)
 
@@ -30,7 +31,7 @@ class MakoLoader(object):
 
         if module_directory is None:
             log.warning("For more caching of mako templates, set the MAKO_MODULE_DIR in settings!")
-            module_directory = tempfile.mkdtemp()
+            module_directory = tempdir.mkdtemp_clean()
 
         self.module_directory = module_directory
 
diff --git a/common/djangoapps/mitxmako/middleware.py b/common/djangoapps/mitxmako/middleware.py
index 64cb2e5415..3f66f8cc48 100644
--- a/common/djangoapps/mitxmako/middleware.py
+++ b/common/djangoapps/mitxmako/middleware.py
@@ -13,7 +13,7 @@
 #   limitations under the License.
 
 from mako.lookup import TemplateLookup
-import tempfile
+import tempdir
 from django.template import RequestContext
 from django.conf import settings
 
@@ -29,7 +29,7 @@ class MakoMiddleware(object):
         module_directory = getattr(settings, 'MAKO_MODULE_DIR', None)
 
         if module_directory is None:
-            module_directory = tempfile.mkdtemp()
+            module_directory = tempdir.mkdtemp_clean()
 
         for location in template_locations:
             lookup[location] = TemplateLookup(directories=template_locations[location],
diff --git a/common/djangoapps/student/management/commands/tests/test_pearson.py b/common/djangoapps/student/management/commands/tests/test_pearson.py
index 12969405de..65d628fba0 100644
--- a/common/djangoapps/student/management/commands/tests/test_pearson.py
+++ b/common/djangoapps/student/management/commands/tests/test_pearson.py
@@ -7,6 +7,7 @@ import logging
 import os
 from tempfile import mkdtemp
 import cStringIO
+import shutil
 import sys
 
 from django.test import TestCase
@@ -143,23 +144,18 @@ class PearsonTestCase(TestCase):
     '''
     Base class for tests running Pearson-related commands
     '''
-    import_dir = mkdtemp(prefix="import")
-    export_dir = mkdtemp(prefix="export")
 
     def assertErrorContains(self, error_message, expected):
         self.assertTrue(error_message.find(expected) >= 0, 'error message "{}" did not contain "{}"'.format(error_message, expected))
 
+    def setUp(self):
+        self.import_dir = mkdtemp(prefix="import")
+        self.addCleanup(shutil.rmtree, self.import_dir)
+        self.export_dir = mkdtemp(prefix="export")
+        self.addCleanup(shutil.rmtree, self.export_dir)
+
     def tearDown(self):
-        def delete_temp_dir(dirname):
-            if os.path.exists(dirname):
-                for filename in os.listdir(dirname):
-                    os.remove(os.path.join(dirname, filename))
-                os.rmdir(dirname)
-
-        # clean up after any test data was dumped to temp directory
-        delete_temp_dir(self.import_dir)
-        delete_temp_dir(self.export_dir)
-
+        pass
         # and clean up the database:
 #        TestCenterUser.objects.all().delete()
 #        TestCenterRegistration.objects.all().delete()
diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
index eb91208923..239ff2b9a4 100644
--- a/common/lib/capa/capa/verifiers/draganddrop.py
+++ b/common/lib/capa/capa/verifiers/draganddrop.py
@@ -111,7 +111,7 @@ class DragAndDrop(object):
         Returns: bool.
         '''
         for draggable in self.excess_draggables:
-            if not self.excess_draggables[draggable]:
+            if self.excess_draggables[draggable]:
                 return False  # user answer has more draggables than correct answer
 
         # Number of draggables in user_groups may be differ that in
@@ -304,8 +304,13 @@ class DragAndDrop(object):
 
         user_answer = json.loads(user_answer)
 
-        # check if we have draggables that are not in correct answer:
-        self.excess_draggables = {}
+        # This dictionary will hold a key for each draggable the user placed on
+        # the image.  The value is True if that draggable is not mentioned in any
+        # correct_answer entries.  If the draggable is mentioned in at least one
+        # correct_answer entry, the value is False.
+        # default to consider every user answer excess until proven otherwise.
+        self.excess_draggables = dict((users_draggable.keys()[0],True) 
+            for users_draggable in user_answer['draggables'])
 
         # create identical data structures from user answer and correct answer
         for i in xrange(0, len(correct_answer)):
@@ -322,11 +327,8 @@ class DragAndDrop(object):
                     self.user_groups[groupname].append(draggable_name)
                     self.user_positions[groupname]['user'].append(
                                             draggable_dict[draggable_name])
-                    self.excess_draggables[draggable_name] = True
-                else:
-                    self.excess_draggables[draggable_name] = \
-                    self.excess_draggables.get(draggable_name, False)
-
+                    # proved that this is not excess
+                    self.excess_draggables[draggable_name] = False
 
 def grade(user_input, correct_answer):
     """ Creates DragAndDrop instance from user_input and correct_answer and
diff --git a/common/lib/capa/capa/verifiers/tests_draganddrop.py b/common/lib/capa/capa/verifiers/tests_draganddrop.py
index 9b1b15ce0c..bcd024fa89 100644
--- a/common/lib/capa/capa/verifiers/tests_draganddrop.py
+++ b/common/lib/capa/capa/verifiers/tests_draganddrop.py
@@ -46,6 +46,18 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
         correct_answer = {'1':              't1', 'name_with_icon': 't2'}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
+    def test_expect_no_actions_wrong(self):
+        user_input = '{"draggables": [{"1": "t1"}, \
+         {"name_with_icon": "t2"}]}'
+        correct_answer = []
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
+    def test_expect_no_actions_right(self):
+        user_input = '{"draggables": []}'
+        correct_answer = []
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+
     def test_targets_false(self):
         user_input = '{"draggables": [{"1": "t1"}, \
         {"name_with_icon": "t2"}]}'
diff --git a/common/lib/tempdir.py b/common/lib/tempdir.py
new file mode 100644
index 0000000000..0acd92ba33
--- /dev/null
+++ b/common/lib/tempdir.py
@@ -0,0 +1,17 @@
+"""Make temporary directories nicely."""
+
+import atexit
+import os.path
+import shutil
+import tempfile
+
+def mkdtemp_clean(suffix="", prefix="tmp", dir=None):
+    """Just like mkdtemp, but the directory will be deleted when the process ends."""
+    the_dir = tempfile.mkdtemp(suffix=suffix, prefix=prefix, dir=dir)
+    atexit.register(cleanup_tempdir, the_dir)
+    return the_dir
+
+def cleanup_tempdir(the_dir):
+    """Called on process exit to remove a temp directory."""
+    if os.path.exists(the_dir):
+        shutil.rmtree(the_dir)
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 4635cc6871..a115a54376 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -429,6 +429,11 @@ class CapaModule(XModule):
         # used by conditional module
         return self.attempts > 0
 
+    def is_correct(self):
+        """True if full points"""
+        d = self.get_score()
+        return d['score'] == d['total']
+
     def answer_available(self):
         '''
         Is the user allowed to see an answer?
@@ -449,6 +454,9 @@ class CapaModule(XModule):
             return self.lcp.done
         elif self.show_answer == 'closed':
             return self.closed()
+        elif self.show_answer == 'finished':
+            return self.closed() or self.is_correct()
+
         elif self.show_answer == 'past_due':
             return self.is_past_due()
         elif self.show_answer == 'always':
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index f7b9b6a026..ee69d925d0 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -108,11 +108,13 @@ class CombinedOpenEndedModule(XModule):
             instance_state = {}
 
         self.version = self.metadata.get('version', DEFAULT_VERSION)
+        version_error_string = "Version of combined open ended module {0} is not correct.  Going with version {1}"
         if not isinstance(self.version, basestring):
             try:
                 self.version = str(self.version)
             except:
-                log.error("Version {0} is not correct.  Going with version {1}".format(self.version, DEFAULT_VERSION))
+                #This is a dev_facing_error
+                log.info(version_error_string.format(self.version, DEFAULT_VERSION))
                 self.version = DEFAULT_VERSION
 
         versions = [i[0] for i in VERSION_TUPLES]
@@ -122,7 +124,8 @@ class CombinedOpenEndedModule(XModule):
         try:
             version_index = versions.index(self.version)
         except:
-            log.error("Version {0} is not correct.  Going with version {1}".format(self.version, DEFAULT_VERSION))
+            #This is a dev_facing_error
+            log.error(version_error_string.format(self.version, DEFAULT_VERSION))
             self.version = DEFAULT_VERSION
             version_index = versions.index(self.version)
 
@@ -205,4 +208,4 @@ class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
         for child in ['task']:
             add_child(child)
 
-        return elt
\ No newline at end of file
+        return elt
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 2c69c449ba..2ed780fcae 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -352,6 +352,13 @@ class CourseDescriptor(SequenceDescriptor):
         """
         return self.metadata.get('tabs')
 
+    @property
+    def pdf_textbooks(self):
+        """
+        Return the pdf_textbooks config, as a python object, or None if not specified.
+        """
+        return self.metadata.get('pdf_textbooks')
+
     @tabs.setter
     def tabs(self, value):
         self.metadata['tabs'] = value
@@ -371,6 +378,28 @@ class CourseDescriptor(SequenceDescriptor):
 
         return bool(config.get("cohorted"))
 
+    @property
+    def auto_cohort(self):
+        """
+        Return whether the course is auto-cohorted.
+        """
+        if not self.is_cohorted:
+            return False
+
+        return bool(self.metadata.get("cohort_config", {}).get(
+            "auto_cohort", False))
+
+    @property
+    def auto_cohort_groups(self):
+        """
+        Return the list of groups to put students into.  Returns [] if not
+        specified. Returns specified list even if is_cohorted and/or auto_cohort are
+        false.
+        """
+        return self.metadata.get("cohort_config", {}).get(
+            "auto_cohort_groups", [])
+
+    
     @property
     def top_level_discussion_topic_ids(self):
         """
@@ -707,7 +736,7 @@ class CourseDescriptor(SequenceDescriptor):
     def get_test_center_exam(self, exam_series_code):
         exams = [exam for exam in self.test_center_exams if exam.exam_series_code == exam_series_code]
         return exams[0] if len(exams) == 1 else None
-        
+
     @property
     def title(self):
         return self.display_name
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index fd0391450b..c749d65b45 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -1,6 +1,61 @@
 class @Rubric
   constructor: () ->
 
+  @initialize: (location) ->
+    $('.rubric').data("location", location) 
+    $('input[class="score-selection"]').change @tracking_callback
+    # set up the hotkeys
+    $(window).unbind('keydown', @keypress_callback)
+    $(window).keydown @keypress_callback
+    # display the 'current' carat
+    @categories = $('.rubric-category')
+    @category = $(@categories.first())
+    @category.prepend('> ')
+    @category_index = 0
+    
+    
+  @keypress_callback: (event) =>
+    # don't try to do this when user is typing in a text input
+    if $(event.target).is('input, textarea')
+      return
+    # for when we select via top row
+    if event.which >= 48 and event.which <= 57
+      selected = event.which - 48
+    # for when we select via numpad
+    else if event.which >= 96 and event.which <= 105
+      selected = event.which - 96
+    # we don't want to do anything since we haven't pressed a number
+    else
+      return
+
+    # if we actually have a current category (not past the end)
+    if(@category_index <= @categories.length)
+      # find the valid selections for this category
+      inputs = $("input[name='score-selection-#{@category_index}']")
+      max_score = inputs.length - 1
+
+      if selected > max_score or selected < 0
+        return
+      inputs.filter("input[value=#{selected}]").click()
+
+      # move to the next category
+      old_category_text = @category.html().substring(5)
+      @category.html(old_category_text)
+      @category_index++
+      @category = $(@categories[@category_index])
+      @category.prepend('> ')
+    
+  @tracking_callback: (event) ->
+    target_selection = $(event.target).val()
+    # chop off the beginning of the name so that we can get the number of the category
+    category = $(event.target).data("category")
+    location = $('.rubric').data('location')
+    # probably want the original problem location as well
+
+    data = {location: location, selection: target_selection, category: category}
+    Logger.log 'rubric_select', data
+
+
   # finds the scores for each rubric category
   @get_score_list: () =>
     # find the number of categories:
@@ -34,6 +89,7 @@ class @CombinedOpenEnded
   constructor: (element) ->
     @element=element
     @reinitialize(element)
+    $(window).keydown @keydown_handler
 
   reinitialize: (element) ->
     @wrapper=$(element).find('section.xmodule_CombinedOpenEndedModule')
@@ -45,6 +101,9 @@ class @CombinedOpenEnded
     @task_count = @el.data('task-count')
     @task_number = @el.data('task-number')
     @accept_file_upload = @el.data('accept-file-upload')
+    @location = @el.data('location')
+    # set up handlers for click tracking
+    Rubric.initialize(@location)
 
     @allow_reset = @el.data('allow_reset')
     @reset_button = @$('.reset-button')
@@ -89,6 +148,8 @@ class @CombinedOpenEnded
     @can_upload_files = false
     @open_ended_child= @$('.open-ended-child')
 
+    @out_of_sync_message = 'The problem state got out of sync.  Try reloading the page.'
+
     if @task_number>1
       @prompt_hide()
     else if @task_number==1 and @child_state!='initial'
@@ -116,6 +177,9 @@ class @CombinedOpenEnded
         @submit_evaluation_button = $('.submit-evaluation-button')
         @submit_evaluation_button.click @message_post
         Collapsible.setCollapsibles(@results_container)
+        # make sure we still have click tracking
+        $('.evaluation-response a').click @log_feedback_click
+        $('input[name="evaluation-score"]').change @log_feedback_selection
 
   show_results: (event) =>
     status_item = $(event.target).parent()
@@ -153,7 +217,6 @@ class @CombinedOpenEnded
         @legend_container= $('.legend-container')
 
   message_post: (event)=>
-    Logger.log 'message_post', @answers
     external_grader_message=$(event.target).parent().parent().parent()
     evaluation_scoring = $(event.target).parent()
 
@@ -182,6 +245,7 @@ class @CombinedOpenEnded
         $('section.evaluation').slideToggle()
         @message_wrapper.html(response.message_html)
 
+
     $.ajaxWithPrefix("#{@ajax_url}/save_post_assessment", settings)
 
 
@@ -283,6 +347,7 @@ class @CombinedOpenEnded
           if response.success
             @rubric_wrapper.html(response.rubric_html)
             @rubric_wrapper.show()
+            Rubric.initialize(@location)
             @answer_area.html(response.student_response)
             @child_state = 'assessing'
             @find_assessment_elements()
@@ -293,7 +358,12 @@ class @CombinedOpenEnded
       $.ajaxWithPrefix("#{@ajax_url}/save_answer",settings)
 
     else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+      @errors_area.html(@out_of_sync_message)
+
+  keydown_handler: (e) =>
+    # only do anything when the key pressed is the 'enter' key
+    if e.which == 13 && @child_state == 'assessing' && Rubric.check_complete()
+      @save_assessment(e)
 
   save_assessment: (event) =>
     event.preventDefault()
@@ -315,7 +385,7 @@ class @CombinedOpenEnded
         else
           @errors_area.html(response.error)
     else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+      @errors_area.html(@out_of_sync_message)
 
   save_hint:  (event) =>
     event.preventDefault()
@@ -330,7 +400,7 @@ class @CombinedOpenEnded
         else
           @errors_area.html(response.error)
     else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+      @errors_area.html(@out_of_sync_message)
 
   skip_post_assessment: =>
     if @child_state == 'post_assessment'
@@ -342,7 +412,7 @@ class @CombinedOpenEnded
         else
           @errors_area.html(response.error)
     else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+      @errors_area.html(@out_of_sync_message)
 
   reset: (event) =>
     event.preventDefault()
@@ -362,7 +432,7 @@ class @CombinedOpenEnded
         else
           @errors_area.html(response.error)
     else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+      @errors_area.html(@out_of_sync_message)
 
   next_problem: =>
     if @child_state == 'done'
@@ -385,7 +455,7 @@ class @CombinedOpenEnded
         else
           @errors_area.html(response.error)
     else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+      @errors_area.html(@out_of_sync_message)
 
   gentle_alert: (msg) =>
     if @el.find('.open-ended-alert').length
@@ -404,7 +474,7 @@ class @CombinedOpenEnded
     $.postWithPrefix "#{@ajax_url}/check_for_score", (response) =>
       if response.state == "done" or response.state=="post_assessment"
         delete window.queuePollerID
-        location.reload()
+        @reload()
       else
         window.queuePollerID = window.setTimeout(@poll, 10000)
 
@@ -438,7 +508,9 @@ class @CombinedOpenEnded
     @prompt_container.toggleClass('open')
     if @question_header.text() == "(Hide)"
       new_text = "(Show)"
+      Logger.log 'oe_hide_question', {location: @location}
     else
+      Logger.log 'oe_show_question', {location: @location}
       new_text = "(Hide)"
     @question_header.text(new_text)
 
@@ -454,4 +526,16 @@ class @CombinedOpenEnded
       @prompt_container.toggleClass('open')
       @question_header.text("(Show)")
 
+  log_feedback_click: (event) ->
+    link_text = $(event.target).html()
+    if link_text == 'See full feedback'
+      Logger.log 'oe_show_full_feedback', {}
+    else if link_text == 'Respond to Feedback'
+      Logger.log 'oe_show_respond_to_feedback', {}
+    else
+      generated_event_type = link_text.toLowerCase().replace(" ","_")
+      Logger.log "oe_" + generated_event_type, {}
 
+  log_feedback_selection: (event) ->
+    target_selection = $(event.target).val()
+    Logger.log 'oe_feedback_response_selected', {value: target_selection}
diff --git a/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee b/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
index 5770238649..4bdb4bdf05 100644
--- a/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
+++ b/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
@@ -175,6 +175,7 @@ class @PeerGradingProblem
     @prompt_container = $('.prompt-container')
     @rubric_container = $('.rubric-container')
     @flag_student_container = $('.flag-student-container')
+    @answer_unknown_container = $('.answer-unknown-container')
     @calibration_panel = $('.calibration-panel')
     @grading_panel = $('.grading-panel')
     @content_panel = $('.content-panel')
@@ -208,6 +209,10 @@ class @PeerGradingProblem
     @interstitial_page_button = $('.interstitial-page-button')
     @calibration_interstitial_page_button = $('.calibration-interstitial-page-button')
     @flag_student_checkbox = $('.flag-checkbox')
+    @answer_unknown_checkbox = $('.answer-unknown-checkbox')
+
+    $(window).keydown @keydown_handler
+
     @collapse_question()
 
     Collapsible.setCollapsibles(@content_panel)
@@ -249,9 +254,6 @@ class @PeerGradingProblem
   fetch_submission_essay: () =>
     @backend.post('get_next_submission', {location: @location}, @render_submission)
 
-  gentle_alert: (msg) =>
-    @grading_message.fadeIn()
-    @grading_message.html("<p>" + msg + "</p>")
 
   construct_data: () ->
     data =
@@ -262,6 +264,7 @@ class @PeerGradingProblem
       submission_key: @submission_key_input.val()
       feedback: @feedback_area.val()
       submission_flagged: @flag_student_checkbox.is(':checked')
+      answer_unknown: @answer_unknown_checkbox.is(':checked')
     return data
 
 
@@ -334,6 +337,14 @@ class @PeerGradingProblem
       @show_submit_button()
       @grade = Rubric.get_total_score()
 
+  keydown_handler: (event) =>
+    if event.which == 13 && @submit_button.is(':visible')
+      if @calibration
+        @submit_calibration_essay()
+      else
+        @submit_grade()
+
+
 
 
   ##########
@@ -360,6 +371,8 @@ class @PeerGradingProblem
       @calibration_panel.find('.grading-text').hide()
       @grading_panel.find('.grading-text').hide()
       @flag_student_container.hide()
+      @answer_unknown_container.hide()
+
       @feedback_area.val("")
 
       @submit_button.unbind('click')
@@ -388,6 +401,7 @@ class @PeerGradingProblem
       @calibration_panel.find('.grading-text').show()
       @grading_panel.find('.grading-text').show()
       @flag_student_container.show()
+      @answer_unknown_container.show()
       @feedback_area.val("")
 
       @submit_button.unbind('click')
@@ -420,6 +434,7 @@ class @PeerGradingProblem
     @submit_button.hide()
     @action_button.hide()
     @calibration_feedback_panel.hide()
+    Rubric.initialize(@location)
 
 
   render_calibration_feedback: (response) =>
@@ -466,11 +481,17 @@ class @PeerGradingProblem
     # And now hook up an event handler again
     $("input[class='score-selection']").change @graded_callback
 
+  gentle_alert: (msg) =>
+    @grading_message.fadeIn()
+    @grading_message.html("<p>" + msg + "</p>")
+
   collapse_question: () =>
     @prompt_container.slideToggle()
     @prompt_container.toggleClass('open')
     if @question_header.text() == "(Hide)"
+      Logger.log 'peer_grading_hide_question', {location: @location}
       new_text = "(Show)"
     else
+      Logger.log 'peer_grading_show_question', {location: @location}
       new_text = "(Hide)"
     @question_header.text(new_text)
diff --git a/common/lib/xmodule/xmodule/mako_module.py b/common/lib/xmodule/xmodule/mako_module.py
index dab5d5e85b..da96bfa212 100644
--- a/common/lib/xmodule/xmodule/mako_module.py
+++ b/common/lib/xmodule/xmodule/mako_module.py
@@ -44,5 +44,6 @@ class MakoModuleDescriptor(XModuleDescriptor):
     # cdodge: encapsulate a means to expose "editable" metadata fields (i.e. not internal system metadata)
     @property
     def editable_metadata_fields(self):
-        subset = [name for name in self.metadata.keys() if name not in self.system_metadata_fields]
+        subset = [name for name in self.metadata.keys() if name not in self.system_metadata_fields and 
+            name not in self._inherited_metadata]
         return subset
diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py
index a9df6c3504..0ba7e36540 100644
--- a/common/lib/xmodule/xmodule/modulestore/__init__.py
+++ b/common/lib/xmodule/xmodule/modulestore/__init__.py
@@ -23,6 +23,15 @@ URL_RE = re.compile("""
     (@(?P<revision>[^/]+))?
     """, re.VERBOSE)
 
+MISSING_SLASH_URL_RE = re.compile("""
+    (?P<tag>[^:]+):/
+    (?P<org>[^/]+)/
+    (?P<course>[^/]+)/
+    (?P<category>[^/]+)/
+    (?P<name>[^@]+)
+    (@(?P<revision>[^/]+))?
+    """, re.VERBOSE)
+
 # TODO (cpennington): We should decide whether we want to expand the
 # list of valid characters in a location
 INVALID_CHARS = re.compile(r"[^\w.-]")
@@ -164,12 +173,16 @@ class Location(_LocationBase):
         if isinstance(location, basestring):
             match = URL_RE.match(location)
             if match is None:
-                log.debug('location is instance of %s but no URL match' % basestring)
-                raise InvalidLocationError(location)
-            else:
-                groups = match.groupdict()
-                check_dict(groups)
-                return _LocationBase.__new__(_cls, **groups)
+                # cdodge:
+                # check for a dropped slash near the i4x:// element of the location string. This can happen with some
+                # redirects (e.g. edx.org -> www.edx.org which I think happens in Nginx)
+                match = MISSING_SLASH_URL_RE.match(location)
+                if match is None:
+                    log.debug('location is instance of %s but no URL match' % basestring)
+                    raise InvalidLocationError(location)    
+            groups = match.groupdict()
+            check_dict(groups)
+            return _LocationBase.__new__(_cls, **groups)
         elif isinstance(location, (list, tuple)):
             if len(location) not in (5, 6):
                 log.debug('location has wrong length')
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo.py b/common/lib/xmodule/xmodule/modulestore/mongo.py
index f4db62ac31..012efb0c27 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo.py
@@ -1,11 +1,13 @@
 import pymongo
 import sys
 import logging
+import copy
 
 from bson.son import SON
 from fs.osfs import OSFS
 from itertools import repeat
 from path import path
+from datetime import datetime, timedelta
 
 from importlib import import_module
 from xmodule.errortracker import null_error_tracker, exc_info_to_str
@@ -27,9 +29,11 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
     """
     A system that has a cache of module json that it will use to load modules
     from, with a backup of calling to the underlying modulestore for more data
+    TODO (cdodge) when the 'split module store' work has been completed we can remove all
+    references to metadata_inheritance_tree
     """
     def __init__(self, modulestore, module_data, default_class, resources_fs,
-                 error_tracker, render_template):
+                 error_tracker, render_template, metadata_inheritance_tree = None):
         """
         modulestore: the module store that can be used to retrieve additional modules
 
@@ -54,6 +58,7 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
         # cdodge: other Systems have a course_id attribute defined. To keep things consistent, let's
         # define an attribute here as well, even though it's None
         self.course_id = None
+        self.metadata_inheritance_tree = metadata_inheritance_tree
 
     def load_item(self, location):
         location = Location(location)
@@ -61,11 +66,13 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
         if json_data is None:
             return self.modulestore.get_item(location)
         else:
-            # TODO (vshnayder): metadata inheritance is somewhat broken because mongo, doesn't
-            # always load an entire course.  We're punting on this until after launch, and then
-            # will build a proper course policy framework.
+            # load the module and apply the inherited metadata
             try:
-                return XModuleDescriptor.load_from_json(json_data, self, self.default_class)
+                module = XModuleDescriptor.load_from_json(json_data, self, self.default_class)
+                if self.metadata_inheritance_tree is not None:
+                    metadata_to_inherit = self.metadata_inheritance_tree.get('parent_metadata', {}).get(location.url(),{})
+                    module.inherit_metadata(metadata_to_inherit)
+                return module
             except:
                 return ErrorDescriptor.from_json(
                     json_data,
@@ -142,6 +149,82 @@ class MongoModuleStore(ModuleStoreBase):
         self.fs_root = path(fs_root)
         self.error_tracker = error_tracker
         self.render_template = render_template
+        self.metadata_inheritance_cache = {}
+
+    def get_metadata_inheritance_tree(self, location):
+        '''
+        TODO (cdodge) This method can be deleted when the 'split module store' work has been completed
+        '''
+        
+        # get all collections in the course, this query should not return any leaf nodes
+        query = { '_id.org' : location.org,
+                '_id.course' : location.course,
+                '_id.revision' : None,
+                'definition.children':{'$ne': []}
+                }
+        # we just want the Location, children, and metadata
+        record_filter = {'_id':1,'definition.children':1,'metadata':1}
+
+        # call out to the DB
+        resultset = self.collection.find(query, record_filter)
+
+        results_by_url = {}
+        root = None
+
+        # now go through the results and order them by the location url
+        for result in resultset:
+            location = Location(result['_id'])
+            results_by_url[location.url()] = result
+            if location.category == 'course':
+                root = location.url()
+
+        # now traverse the tree and compute down the inherited metadata
+        metadata_to_inherit = {}
+        def _compute_inherited_metadata(url):
+            my_metadata = results_by_url[url]['metadata']
+            for key in my_metadata.keys():
+                if key not in XModuleDescriptor.inheritable_metadata:
+                    del my_metadata[key]
+            results_by_url[url]['metadata'] = my_metadata
+
+            # go through all the children and recurse, but only if we have
+            # in the result set. Remember results will not contain leaf nodes
+            for child in results_by_url[url].get('definition',{}).get('children',[]):
+                if child in results_by_url:
+                    new_child_metadata = copy.deepcopy(my_metadata)
+                    new_child_metadata.update(results_by_url[child]['metadata'])
+                    results_by_url[child]['metadata'] = new_child_metadata
+                    metadata_to_inherit[child] = new_child_metadata
+                    _compute_inherited_metadata(child)
+                else:
+                    # this is likely a leaf node, so let's record what metadata we need to inherit
+                    metadata_to_inherit[child] = my_metadata
+        
+        if root is not None:
+            _compute_inherited_metadata(root)
+
+        cache = {'parent_metadata': metadata_to_inherit, 
+            'timestamp' : datetime.now()}
+
+        return cache
+
+    def get_cached_metadata_inheritance_tree(self, location, max_age_allowed):
+        '''
+        TODO (cdodge) This method can be deleted when the 'split module store' work has been completed
+        '''
+        cache_name = '{0}/{1}'.format(location.org, location.course)
+        cache = self.metadata_inheritance_cache.get(cache_name,{'parent_metadata': {}, 
+            'timestamp': datetime.now() - timedelta(hours=1)})
+        age = (datetime.now() - cache['timestamp'])
+
+        if age.seconds >= max_age_allowed:
+            logging.debug('loading entire inheritance tree for {0}'.format(cache_name))
+            cache = self.get_metadata_inheritance_tree(location)
+            self.metadata_inheritance_cache[cache_name] = cache
+
+        return cache
+
+
 
     def _clean_item_data(self, item):
         """
@@ -196,6 +279,8 @@ class MongoModuleStore(ModuleStoreBase):
 
         resource_fs = OSFS(root)
 
+        # TODO (cdodge): When the 'split module store' work has been completed, we should remove
+        # the 'metadata_inheritance_tree' parameter
         system = CachingDescriptorSystem(
             self,
             data_cache,
@@ -203,6 +288,7 @@ class MongoModuleStore(ModuleStoreBase):
             resource_fs,
             self.error_tracker,
             self.render_template,
+            metadata_inheritance_tree = self.get_cached_metadata_inheritance_tree(Location(item['location']), 60)
         )
         return system.load_item(item['location'])
 
@@ -261,11 +347,11 @@ class MongoModuleStore(ModuleStoreBase):
             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.
-
         """
         location = Location.ensure_fully_specified(location)
         item = self._find_one(location)
-        return self._load_items([item], depth)[0]
+        module = self._load_items([item], depth)[0]
+        return module
 
     def get_instance(self, course_id, location, depth=0):
         """
@@ -285,7 +371,8 @@ class MongoModuleStore(ModuleStoreBase):
             sort=[('revision', pymongo.ASCENDING)],
         )
 
-        return self._load_items(list(items), depth)
+        modules = self._load_items(list(items), depth)
+        return modules
 
     def clone_item(self, source, location):
         """
@@ -313,7 +400,7 @@ class MongoModuleStore(ModuleStoreBase):
             raise DuplicateItemError(location)
 
 
-    def get_course_for_item(self, location):
+    def get_course_for_item(self, location, depth=0):
         '''
         VS[compat]
         cdodge: for a given Xmodule, return the course that it belongs to
@@ -327,7 +414,7 @@ class MongoModuleStore(ModuleStoreBase):
         # know the 'name' parameter in this context, so we have
         # to assume there's only one item in this query even though we are not specifying a name
         course_search_location = ['i4x', location.org, location.course, 'course', None]
-        courses = self.get_items(course_search_location)
+        courses = self.get_items(course_search_location, depth=depth)
 
         # make sure we found exactly one match on this above course search
         found_cnt = len(courses)
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 49851f7452..171441c562 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
@@ -2,8 +2,7 @@ import json
 import logging
 from lxml import etree
 from lxml.html import rewrite_links
-
-
+from xmodule.timeinfo import TimeInfo
 from xmodule.capa_module import only_one, ComplexEncoder
 from xmodule.editing_module import EditingDescriptor
 from xmodule.html_checker import check_html
@@ -14,16 +13,13 @@ from xmodule.xml_module import XmlDescriptor
 import self_assessment_module
 import open_ended_module
 from combined_open_ended_rubric import CombinedOpenEndedRubric, GRADER_TYPE_IMAGE_DICT, HUMAN_GRADER_TYPE, LEGEND_LIST
-import dateutil
-import dateutil.parser
-from xmodule.timeparse import parse_timedelta
 
 log = logging.getLogger("mitx.courseware")
 
 # Set the default number of max attempts.  Should be 1 for production
 # Set higher for debugging/testing
 # attempts specified in xml definition overrides this.
-MAX_ATTEMPTS = 10000
+MAX_ATTEMPTS = 1
 
 # Set maximum available number of points.
 # Overriden by max_score specified in xml.
@@ -48,6 +44,10 @@ HUMAN_TASK_TYPE = {
     'openended' : "edX Assessment",
     }
 
+#Default value that controls whether or not to skip basic spelling checks in the controller
+#Metadata overrides this
+SKIP_BASIC_CHECKS = False
+
 class CombinedOpenEndedV1Module():
     """
     This is a module that encapsulates all open ended grading (self assessment, peer assessment, etc).
@@ -146,28 +146,17 @@ class CombinedOpenEndedV1Module():
         self.max_attempts = int(self.metadata.get('attempts', MAX_ATTEMPTS))
         self.is_scored = self.metadata.get('is_graded', IS_SCORED) in TRUE_DICT
         self.accept_file_upload = self.metadata.get('accept_file_upload', ACCEPT_FILE_UPLOAD) in TRUE_DICT
+        self.skip_basic_checks = self.metadata.get('skip_spelling_checks', SKIP_BASIC_CHECKS)
 
         display_due_date_string = self.metadata.get('due', None)
-        if display_due_date_string is not None:
-            try:
-                self.display_due_date = dateutil.parser.parse(display_due_date_string)
-            except ValueError:
-                log.error("Could not parse due date {0} for location {1}".format(display_due_date_string, location))
-                raise
-        else:
-            self.display_due_date = None
-
+    
         grace_period_string = self.metadata.get('graceperiod', None)
-        if grace_period_string is not None and self.display_due_date:
-            try:
-                self.grace_period = parse_timedelta(grace_period_string)
-                self.close_date = self.display_due_date + self.grace_period
-            except:
-                log.error("Error parsing the grace period {0} for location {1}".format(grace_period_string, location))
-                raise
-        else:
-            self.grace_period = None
-            self.close_date = self.display_due_date
+        try:
+            self.timeinfo = TimeInfo(display_due_date_string, grace_period_string)  
+        except:
+            log.error("Error parsing due date information in location {0}".format(location))
+            raise
+        self.display_due_date = self.timeinfo.display_due_date
 
         # Used for progress / grading.  Currently get credit just for
         # completion (doesn't matter if you self-assessed correct/incorrect).
@@ -185,8 +174,9 @@ class CombinedOpenEndedV1Module():
             'rubric': definition['rubric'],
             'display_name': self.display_name,
             'accept_file_upload': self.accept_file_upload,
-            'close_date' : self.close_date,
+            'close_date' : self.timeinfo.close_date,
             's3_interface' : self.system.s3_interface,
+            'skip_basic_checks' : self.skip_basic_checks,
             }
 
         self.task_xml = definition['task_xml']
@@ -340,6 +330,7 @@ class CombinedOpenEndedV1Module():
             'status': self.get_status(False),
             'display_name': self.display_name,
             'accept_file_upload': self.accept_file_upload,
+            'location': self.location,
             'legend_list' : LEGEND_LIST,
             }
 
@@ -656,7 +647,10 @@ class CombinedOpenEndedV1Module():
         if self.attempts > self.max_attempts:
             return {
                 'success': False,
-                'error': 'Too many attempts.'
+                #This is a student_facing_error
+                'error': ('You have attempted this question {0} times.  '
+                          'You are only allowed to attempt it {1} times.').format(
+                    self.attempts, self.max_attempts)
             }
         self.state = self.INITIAL
         self.allow_reset = False
@@ -795,7 +789,8 @@ class CombinedOpenEndedV1Descriptor(XmlDescriptor, EditingDescriptor):
         expected_children = ['task', 'rubric', 'prompt']
         for child in expected_children:
             if len(xml_object.xpath(child)) == 0:
-                raise ValueError("Combined Open Ended definition must include at least one '{0}' tag".format(child))
+                #This is a staff_facing_error
+                raise ValueError("Combined Open Ended definition must include at least one '{0}' tag. Contact the learning sciences group for assistance.".format(child))
 
         def parse_task(k):
             """Assumes that xml_object has child k"""
@@ -820,4 +815,4 @@ class CombinedOpenEndedV1Descriptor(XmlDescriptor, EditingDescriptor):
         for child in ['task']:
             add_child(child)
 
-        return elt
\ No newline at end of file
+        return elt
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
index 7c00c5f029..f756b2b853 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
@@ -4,7 +4,6 @@ from lxml import etree
 log = logging.getLogger(__name__)
 
 GRADER_TYPE_IMAGE_DICT = {
-    '8B' : '/static/images/random_grading_icon.png',
     'SA' : '/static/images/self_assessment_icon.png',
     'PE' : '/static/images/peer_grading_icon.png',
     'ML' : '/static/images/ml_grading_icon.png',
@@ -13,7 +12,6 @@ GRADER_TYPE_IMAGE_DICT = {
     }
 
 HUMAN_GRADER_TYPE = {
-    '8B' : 'Magic-8-Ball-Assessment',
     'SA' : 'Self-Assessment',
     'PE' : 'Peer-Assessment',
     'IN' : 'Instructor-Assessment',
@@ -71,8 +69,9 @@ class CombinedOpenEndedRubric(object):
                     })
             success = True
         except:
-            error_message = "[render_rubric] Could not parse the rubric with xml: {0}".format(rubric_xml)
-            log.error(error_message)
+            #This is a staff_facing_error
+            error_message = "[render_rubric] Could not parse the rubric with xml: {0}. Contact the learning sciences group for assistance.".format(rubric_xml)
+            log.exception(error_message)
             raise RubricParsingError(error_message)
         return {'success' : success, 'html' : html, 'rubric_scores' : rubric_scores}
 
@@ -81,7 +80,8 @@ class CombinedOpenEndedRubric(object):
         success = rubric_dict['success']
         rubric_feedback = rubric_dict['html']
         if not success:
-            error_message = "Could not parse rubric : {0} for location {1}".format(rubric_string, location.url())
+            #This is a staff_facing_error
+            error_message = "Could not parse rubric : {0} for location {1}. Contact the learning sciences group for assistance.".format(rubric_string, location.url())
             log.error(error_message)
             raise RubricParsingError(error_message)
 
@@ -90,13 +90,15 @@ class CombinedOpenEndedRubric(object):
         for category in rubric_categories:
             total = total + len(category['options']) - 1
             if len(category['options']) > (max_score_allowed + 1):
-                error_message = "Number of score points in rubric {0} higher than the max allowed, which is {1}".format(
+                #This is a staff_facing_error
+                error_message = "Number of score points in rubric {0} higher than the max allowed, which is {1}. Contact the learning sciences group for assistance.".format(
                     len(category['options']), max_score_allowed)
                 log.error(error_message)
                 raise RubricParsingError(error_message)
 
         if total != max_score:
-            error_msg = "The max score {0} for problem {1} does not match the total number of points in the rubric {2}".format(
+            #This is a staff_facing_error
+            error_msg = "The max score {0} for problem {1} does not match the total number of points in the rubric {2}. Contact the learning sciences group for assistance.".format(
                     max_score, location, total)
             log.error(error_msg)
             raise RubricParsingError(error_msg)
@@ -118,7 +120,8 @@ class CombinedOpenEndedRubric(object):
         categories = []
         for category in element:
             if category.tag != 'category':
-                raise RubricParsingError("[extract_categories] Expected a <category> tag: got {0} instead".format(category.tag))
+                #This is a staff_facing_error
+                raise RubricParsingError("[extract_categories] Expected a <category> tag: got {0} instead. Contact the learning sciences group for assistance.".format(category.tag))
             else:
                 categories.append(self.extract_category(category))
         return categories
@@ -144,12 +147,14 @@ class CombinedOpenEndedRubric(object):
             self.has_score = True
         # if we are missing the score tag and we are expecting one
         elif self.has_score:
-            raise RubricParsingError("[extract_category] Category {0} is missing a score".format(descriptionxml.text))
+            #This is a staff_facing_error
+            raise RubricParsingError("[extract_category] Category {0} is missing a score. Contact the learning sciences group for assistance.".format(descriptionxml.text))
 
 
         # parse description
         if descriptionxml.tag != 'description':
-            raise RubricParsingError("[extract_category]: expected description tag, got {0} instead".format(descriptionxml.tag))
+            #This is a staff_facing_error
+            raise RubricParsingError("[extract_category]: expected description tag, got {0} instead. Contact the learning sciences group for assistance.".format(descriptionxml.tag))
 
         description = descriptionxml.text
 
@@ -159,7 +164,8 @@ class CombinedOpenEndedRubric(object):
         # parse options
         for option in optionsxml:
             if option.tag != 'option':
-                raise RubricParsingError("[extract_category]: expected option tag, got {0} instead".format(option.tag))
+                #This is a staff_facing_error
+                raise RubricParsingError("[extract_category]: expected option tag, got {0} instead. Contact the learning sciences group for assistance.".format(option.tag))
             else:
                 pointstr = option.get("points")
                 if pointstr:
@@ -168,7 +174,8 @@ class CombinedOpenEndedRubric(object):
                     try:
                         points = int(pointstr)
                     except ValueError:
-                        raise RubricParsingError("[extract_category]: expected points to have int, got {0} instead".format(pointstr))
+                        #This is a staff_facing_error
+                        raise RubricParsingError("[extract_category]: expected points to have int, got {0} instead. Contact the learning sciences group for assistance.".format(pointstr))
                 elif autonumbering:
                     # use the generated one if we're in the right mode
                     points = cur_points
@@ -200,7 +207,6 @@ class CombinedOpenEndedRubric(object):
                         for grader_type in tuple[3]:
                             rubric_categories[i]['options'][j]['grader_types'].append(grader_type)
 
-        log.debug(rubric_categories)
         html = self.system.render_template('open_ended_combined_rubric.html',
             {'categories': rubric_categories,
              'has_score': True,
@@ -219,13 +225,15 @@ class CombinedOpenEndedRubric(object):
         Validates a set of options. This can and should be extended to filter out other bad edge cases
         '''
         if len(options) == 0:
-            raise RubricParsingError("[extract_category]: no options associated with this category")
+            #This is a staff_facing_error
+            raise RubricParsingError("[extract_category]: no options associated with this category. Contact the learning sciences group for assistance.")
         if len(options) == 1:
             return
         prev = options[0]['points']
         for option in options[1:]:
             if prev == option['points']:
-                raise RubricParsingError("[extract_category]: found duplicate point values between two different options")
+                #This is a staff_facing_error
+                raise RubricParsingError("[extract_category]: found duplicate point values between two different options. Contact the learning sciences group for assistance.")
             else:
                 prev = option['points']
 
@@ -241,11 +249,14 @@ class CombinedOpenEndedRubric(object):
         """
         success = False
         if len(scores)==0:
-            log.error("Score length is 0.")
+            #This is a dev_facing_error
+            log.error("Score length is 0 when trying to reformat rubric scores for rendering.")
             return success, ""
 
         if len(scores) != len(score_types) or len(feedback_types) != len(scores):
-            log.error("Length mismatches.")
+            #This is a dev_facing_error
+            log.error("Length mismatches when trying to reformat rubric scores for rendering.  "
+                      "Scores: {0}, Score Types: {1} Feedback Types: {2}".format(scores, score_types, feedback_types))
             return success, ""
 
         score_lists = []
diff --git a/lms/djangoapps/open_ended_grading/controller_query_service.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
similarity index 81%
rename from lms/djangoapps/open_ended_grading/controller_query_service.py
rename to common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
index 1b124fc116..1dd5c57ad4 100644
--- a/lms/djangoapps/open_ended_grading/controller_query_service.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
@@ -1,8 +1,5 @@
 import logging
-from xmodule.open_ended_grading_classes.grading_service_module import GradingService
-
-from xmodule.x_module import ModuleSystem
-from mitxmako.shortcuts import render_to_string
+from grading_service_module import GradingService
 
 log = logging.getLogger(__name__)
 
@@ -11,8 +8,8 @@ class ControllerQueryService(GradingService):
     """
     Interface to staff grading backend.
     """
-    def __init__(self, config):
-        config['system'] = ModuleSystem(None, None, None, render_to_string, None)
+    def __init__(self, config, system):
+        config['system'] = system
         super(ControllerQueryService, self).__init__(config)
         self.url = config['url'] + config['grading_controller']
         self.login_url = self.url + '/login/'
@@ -77,3 +74,16 @@ class ControllerQueryService(GradingService):
 
         response = self.post(self.take_action_on_flags_url, params)
         return response
+
+def convert_seconds_to_human_readable(seconds):
+    if seconds < 60:
+        human_string = "{0} seconds".format(seconds)
+    elif seconds < 60 * 60:
+        human_string = "{0} minutes".format(round(seconds/60,1))
+    elif seconds < (24*60*60):
+        human_string = "{0} hours".format(round(seconds/(60*60),1))
+    else:
+        human_string = "{0} days".format(round(seconds/(60*60*24),1))
+
+    eta_string = "{0}".format(human_string)
+    return eta_string
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
index 6bd7a6fd0e..8a4caa1291 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
@@ -51,6 +51,8 @@ class GradingService(object):
             r = self._try_with_login(op)
         except (RequestException, ConnectionError, HTTPError) as err:
             # reraise as promised GradingServiceError, but preserve stacktrace.
+            #This is a dev_facing_error
+            log.error("Problem posting data to the grading controller.  URL: {0}, data: {1}".format(url, data))
             raise GradingServiceError, str(err), sys.exc_info()[2]
 
         return r.text
@@ -67,6 +69,8 @@ class GradingService(object):
             r = self._try_with_login(op)
         except (RequestException, ConnectionError, HTTPError) as err:
             # reraise as promised GradingServiceError, but preserve stacktrace.
+            #This is a dev_facing_error
+            log.error("Problem getting data from the grading controller.  URL: {0}, params: {1}".format(url, params))
             raise GradingServiceError, str(err), sys.exc_info()[2]
 
         return r.text
@@ -119,11 +123,13 @@ class GradingService(object):
             return response_json
         # if we can't parse the rubric into HTML,
         except etree.XMLSyntaxError, RubricParsingError:
+            #This is a dev_facing_error
             log.exception("Cannot parse rubric string. Raw string: {0}"
             .format(rubric))
             return {'success': False,
                     'error': 'Error displaying submission'}
         except ValueError:
+            #This is a dev_facing_error
             log.exception("Error parsing response: {0}".format(response))
             return {'success': False,
                     'error': "Error displaying submission"}
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py
index 88921c1429..edae69854f 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py
@@ -251,8 +251,9 @@ def upload_to_s3(file_to_upload, keyname, s3_interface):
 
         return True, public_url
     except:
-        error_message = "Could not connect to S3."
-        log.exception(error_message)
+        #This is a dev_facing_error
+        error_message = "Could not connect to S3 to upload peer grading image.  Trying to utilize bucket: {0}".format(bucketname.lower())
+        log.error(error_message)
         return False, error_message
 
 
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
index 54db1b6557..974d23965f 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
@@ -59,12 +59,14 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         self.submission_id = None
         self.grader_id = None
 
+        error_message = "No {0} found in problem xml for open ended problem. Contact the learning sciences group for assistance."
         if oeparam is None:
-            raise ValueError("No oeparam found in problem xml.")
+            #This is a staff_facing_error
+            raise ValueError(error_message.format('oeparam'))
         if self.prompt is None:
-            raise ValueError("No prompt found in problem xml.")
+            raise ValueError(error_message.format('prompt'))
         if self.rubric is None:
-            raise ValueError("No rubric found in problem xml.")
+            raise ValueError(error_message.format('rubric'))
 
         self._parse(oeparam, self.prompt, self.rubric, system)
 
@@ -73,6 +75,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             self.send_to_grader(self.latest_answer(), system)
             self.created = False
 
+
     def _parse(self, oeparam, prompt, rubric, system):
         '''
         Parse OpenEndedResponse XML:
@@ -98,19 +101,21 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             # __init__ adds it (easiest way to get problem location into
             # response types)
         except TypeError, ValueError:
-            log.exception("Grader payload %r is not a json object!", grader_payload)
+            #This is a dev_facing_error
+            log.exception("Grader payload from external open ended grading server is not a json object! Object: {0}".format(grader_payload))
 
         self.initial_display = find_with_default(oeparam, 'initial_display', '')
         self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
 
         parsed_grader_payload.update({
-            'location': system.location.url(),
+            'location': self.location_string,
             'course_id': system.course_id,
             'prompt': prompt_string,
             'rubric': rubric_string,
             'initial_display': self.initial_display,
             'answer': self.answer,
-            'problem_id': self.display_name
+            'problem_id': self.display_name,
+            'skip_basic_checks': self.skip_basic_checks,
         })
         updated_grader_payload = json.dumps(parsed_grader_payload)
 
@@ -133,24 +138,27 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         """
 
         event_info = dict()
-        event_info['problem_id'] = system.location.url()
+        event_info['problem_id'] = self.location_string
         event_info['student_id'] = system.anonymous_student_id
         event_info['survey_responses'] = get
 
         survey_responses = event_info['survey_responses']
         for tag in ['feedback', 'submission_id', 'grader_id', 'score']:
             if tag not in survey_responses:
-                return {'success': False, 'msg': "Could not find needed tag {0}".format(tag)}
+                #This is a student_facing_error
+                return {'success': False, 'msg': "Could not find needed tag {0} in the survey responses.  Please try submitting again.".format(tag)}
         try:
             submission_id = int(survey_responses['submission_id'])
             grader_id = int(survey_responses['grader_id'])
             feedback = str(survey_responses['feedback'].encode('ascii', 'ignore'))
             score = int(survey_responses['score'])
         except:
+            #This is a dev_facing_error
             error_message = ("Could not parse submission id, grader id, "
                              "or feedback from message_post ajax call.  Here is the message data: {0}".format(
                 survey_responses))
             log.exception(error_message)
+            #This is a student_facing_error
             return {'success': False, 'msg': "There was an error saving your feedback.  Please contact course staff."}
 
         qinterface = system.xqueue['interface']
@@ -187,6 +195,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         self.state = self.DONE
 
+        #This is a student_facing_message
         return {'success': success, 'msg': "Successfully submitted your feedback."}
 
     def send_to_grader(self, submission, system):
@@ -336,18 +345,22 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         for tag in ['success', 'feedback', 'submission_id', 'grader_id']:
             if tag not in response_items:
-                return format_feedback('errors', 'Error getting feedback')
+                #This is a student_facing_error
+                return format_feedback('errors', 'Error getting feedback from grader.')
 
         feedback_items = response_items['feedback']
         try:
             feedback = json.loads(feedback_items)
         except (TypeError, ValueError):
-            log.exception("feedback_items have invalid json %r", feedback_items)
-            return format_feedback('errors', 'Could not parse feedback')
+            #This is a dev_facing_error
+            log.exception("feedback_items from external open ended grader have invalid json {0}".format(feedback_items))
+            #This is a student_facing_error
+            return format_feedback('errors', 'Error getting feedback from grader.')
 
         if response_items['success']:
             if len(feedback) == 0:
-                return format_feedback('errors', 'No feedback available')
+                #This is a student_facing_error
+                return format_feedback('errors', 'No feedback available from grader.')
 
             for tag in do_not_render:
                 if tag in feedback:
@@ -356,6 +369,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             feedback_lst = sorted(feedback.items(), key=get_priority)
             feedback_list_part1 = u"\n".join(format_feedback(k, v) for k, v in feedback_lst)
         else:
+            #This is a student_facing_error
             feedback_list_part1 = format_feedback('errors', response_items['feedback'])
 
         feedback_list_part2 = (u"\n".join([format_feedback_hidden(feedback_type, value)
@@ -431,14 +445,16 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         try:
             score_result = json.loads(score_msg)
         except (TypeError, ValueError):
-            error_message = ("External grader message should be a JSON-serialized dict."
+            #This is a dev_facing_error
+            error_message = ("External open ended grader message should be a JSON-serialized dict."
                              " Received score_msg = {0}".format(score_msg))
             log.error(error_message)
             fail['feedback'] = error_message
             return fail
 
         if not isinstance(score_result, dict):
-            error_message = ("External grader message should be a JSON-serialized dict."
+            #This is a dev_facing_error
+            error_message = ("External open ended grader message should be a JSON-serialized dict."
                              " Received score_result = {0}".format(score_result))
             log.error(error_message)
             fail['feedback'] = error_message
@@ -446,7 +462,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         for tag in ['score', 'feedback', 'grader_type', 'success', 'grader_id', 'submission_id']:
             if tag not in score_result:
-                error_message = ("External grader message is missing required tag: {0}"
+                #This is a dev_facing_error
+                error_message = ("External open ended grader message is missing required tag: {0}"
                                  .format(tag))
                 log.error(error_message)
                 fail['feedback'] = error_message
@@ -563,7 +580,10 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         }
 
         if dispatch not in handlers:
-            return 'Error'
+            #This is a dev_facing_error
+            log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
+            #This is a dev_facing_error
+            return json.dumps({'error': 'Error handling action.  Please try again.', 'success' : False})
 
         before = self.get_progress()
         d = handlers[dispatch](get, system)
@@ -604,15 +624,21 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         success, get = self.append_image_to_student_answer(get)
         error_message = ""
         if success:
-            get['student_answer'] = OpenEndedModule.sanitize_html(get['student_answer'])
-            self.new_history_entry(get['student_answer'])
-            self.send_to_grader(get['student_answer'], system)
-            self.change_state(self.ASSESSING)
+            success, allowed_to_submit, error_message = self.check_if_student_can_submit()
+            if allowed_to_submit:
+                get['student_answer'] = OpenEndedModule.sanitize_html(get['student_answer'])
+                self.new_history_entry(get['student_answer'])
+                self.send_to_grader(get['student_answer'], system)
+                self.change_state(self.ASSESSING)
+            else:
+                #Error message already defined
+                success = False
         else:
+            #This is a student_facing_error
             error_message = "There was a problem saving the image in your submission.  Please try a different image, or try pasting a link to an image into the answer box."
 
         return {
-            'success': True,
+            'success': success,
             'error': error_message,
             'student_response': get['student_answer']
         }
@@ -637,17 +663,21 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         Output: Rendered HTML
         """
         #set context variables and render template
+        eta_string = None
         if self.state != self.INITIAL:
             latest = self.latest_answer()
             previous_answer = latest if latest is not None else self.initial_display
             post_assessment = self.latest_post_assessment(system)
             score = self.latest_score()
             correct = 'correct' if self.is_submission_correct(score) else 'incorrect'
+            if self.state == self.ASSESSING:
+                eta_string = self.get_eta()
         else:
             post_assessment = ""
             correct = ""
             previous_answer = self.initial_display
 
+
         context = {
             'prompt': self.prompt,
             'previous_answer': previous_answer,
@@ -660,6 +690,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'child_type': 'openended',
             'correct': correct,
             'accept_file_upload': self.accept_file_upload,
+            'eta_message' : eta_string,
         }
         html = system.render_template('open_ended.html', context)
         return html
@@ -689,7 +720,8 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
         """
         for child in ['openendedparam']:
             if len(xml_object.xpath(child)) != 1:
-                raise ValueError("Open Ended definition must include exactly one '{0}' tag".format(child))
+                #This is a staff_facing_error
+                raise ValueError("Open Ended definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(child))
 
         def parse(k):
             """Assumes that xml_object has child k"""
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 ba8a74cc31..50f9534717 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
@@ -22,6 +22,8 @@ from xmodule.stringify import stringify_children
 from xmodule.xml_module import XmlDescriptor
 from xmodule.modulestore import Location
 from capa.util import *
+from peer_grading_service import PeerGradingService
+import controller_query_service
 
 from datetime import datetime
 
@@ -99,10 +101,21 @@ class OpenEndedChild(object):
         self.accept_file_upload = static_data['accept_file_upload']
         self.close_date = static_data['close_date']
         self.s3_interface = static_data['s3_interface']
+        self.skip_basic_checks = static_data['skip_basic_checks']
 
         # Used for progress / grading.  Currently get credit just for
         # completion (doesn't matter if you self-assessed correct/incorrect).
         self._max_score = static_data['max_score']
+        self.peer_gs = PeerGradingService(system.open_ended_grading_interface, system)
+        self.controller_qs = controller_query_service.ControllerQueryService(system.open_ended_grading_interface,system)
+
+        self.system = system
+        
+        self.location_string = location
+        try:
+            self.location_string = self.location_string.url()
+        except:
+            pass
 
         self.setup_response(system, location, definition, descriptor)
 
@@ -126,12 +139,14 @@ class OpenEndedChild(object):
         if self.closed():
             return True, {
                 'success': False,
-                'error': 'This problem is now closed.'
+                #This is a student_facing_error
+                'error': 'The problem close date has passed, and this problem is now closed.'
             }
         elif self.attempts > self.max_attempts:
             return True, {
                 'success': False,
-                'error': 'Too many attempts.'
+                #This is a student_facing_error
+                'error': 'You have attempted this problem {0} times.  You are allowed {1} attempts.'.format(self.attempts, self.max_attempts)
             }
         else:
             return False, {}
@@ -250,7 +265,8 @@ class OpenEndedChild(object):
             try:
                 return Progress(self.get_score()['score'], self._max_score)
             except Exception as err:
-                log.exception("Got bad progress")
+                #This is a dev_facing_error
+                log.exception("Got bad progress from open ended child module. Max Score: {1}".format(self._max_score))
                 return None
         return None
 
@@ -258,10 +274,12 @@ class OpenEndedChild(object):
         """
         return dict out-of-sync error message, and also log.
         """
-        log.warning("Assessment module state out sync. state: %r, get: %r. %s",
+        #This is a dev_facing_error
+        log.warning("Open ended child state out sync. state: %r, get: %r. %s",
             self.state, get, msg)
+        #This is a student_facing_error
         return {'success': False,
-                'error': 'The problem state got out-of-sync'}
+                'error': 'The problem state got out-of-sync.  Please try reloading the page.'}
 
     def get_html(self):
         """
@@ -339,6 +357,10 @@ class OpenEndedChild(object):
             if get_data['can_upload_files'] in ['true', '1']:
                 has_file_to_upload = True
                 file = get_data['student_file'][0]
+                if self.system.track_fuction:
+                    self.system.track_function('open_ended_image_upload', {'filename': file.name})
+                else:
+                    log.info("No tracking function found when uploading image.")
                 uploaded_to_s3, image_ok, s3_public_url = self.upload_image_to_s3(file)
                 if uploaded_to_s3:
                     image_tag = self.generate_image_tag_from_url(s3_public_url, file.name)
@@ -407,3 +429,55 @@ class OpenEndedChild(object):
                     success = True
 
         return success, string
+
+    def check_if_student_can_submit(self):
+        location = self.location_string
+
+        student_id = self.system.anonymous_student_id
+        success = False
+        allowed_to_submit = True
+        response = {}
+        #This is a student_facing_error
+        error_string = ("You need to peer grade {0} more in order to make another submission.  "
+        "You have graded {1}, and {2} are required.  You have made {3} successful peer grading submissions.")
+        try:
+            response = self.peer_gs.get_data_for_location(self.location_string, student_id)
+            count_graded = response['count_graded']
+            count_required = response['count_required']
+            student_sub_count = response['student_sub_count']
+            success = True
+        except:
+            #This is a dev_facing_error
+            log.error("Could not contact external open ended graders for location {0} and student {1}".format(self.location_string,student_id))
+            #This is a student_facing_error
+            error_message = "Could not contact the graders.  Please notify course staff."
+            return success, allowed_to_submit, error_message
+        if count_graded>=count_required:
+            return success, allowed_to_submit, ""
+        else:
+            allowed_to_submit = False
+            #This is a student_facing_error
+            error_message = error_string.format(count_required-count_graded, count_graded, count_required, student_sub_count)
+            return success, allowed_to_submit, error_message
+
+    def get_eta(self):
+        response = self.controller_qs.check_for_eta(self.location_string)
+        try:
+            response = json.loads(response)
+        except:
+            pass
+
+        success = response['success']
+        if isinstance(success, basestring):
+            success = (success.lower()=="true")
+
+        if success:
+            eta = controller_query_service.convert_seconds_to_human_readable(response['eta'])
+            eta_string = "Please check back for your response in at most {0}.".format(eta)
+        else:
+            eta_string = ""
+
+        return eta_string
+
+
+
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
index 5b639be4f4..42c54f0463 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
@@ -30,8 +30,8 @@ class PeerGradingService(GradingService):
         self.system = system
 
     def get_data_for_location(self, problem_location, student_id):
-        response = self.get(self.get_data_for_location_url,
-            {'location': problem_location, 'student_id': student_id})
+        params = {'location': problem_location, 'student_id': student_id}
+        response = self.get(self.get_data_for_location_url, params)
         return self.try_to_decode(response)
 
     def get_next_submission(self, problem_location, grader_id):
@@ -106,7 +106,7 @@ class MockPeerGradingService(object):
                            'max_score': 4})
 
     def save_grade(self, location, grader_id, submission_id,
-                   score, feedback, submission_key):
+                   score, feedback, submission_key, rubric_scores, submission_flagged):
         return json.dumps({'success': True})
 
     def is_student_calibrated(self, problem_location, grader_id):
@@ -122,7 +122,8 @@ class MockPeerGradingService(object):
                            'max_score': 4})
 
     def save_calibration_essay(self, problem_location, grader_id,
-                               calibration_essay_id, submission_key, score, feedback):
+                               calibration_essay_id, submission_key, score, 
+                               feedback, rubric_scores):
         return {'success': True, 'actual_score': 2}
 
     def get_problem_list(self, course_id, grader_id):
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
index c608eeea06..7ecb3c4d5e 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
@@ -90,7 +90,10 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         }
 
         if dispatch not in handlers:
-            return 'Error'
+            #This is a dev_facing_error
+            log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
+            #This is a dev_facing_error
+            return json.dumps({'error': 'Error handling action.  Please try again.', 'success' : False})
 
         before = self.get_progress()
         d = handlers[dispatch](get, system)
@@ -123,7 +126,8 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         elif self.state in (self.POST_ASSESSMENT, self.DONE):
             context['read_only'] = True
         else:
-            raise ValueError("Illegal state '%r'" % self.state)
+            #This is a dev_facing_error
+            raise ValueError("Self assessment module is in an illegal state '{0}'".format(self.state))
 
         return system.render_template('self_assessment_rubric.html', context)
 
@@ -148,7 +152,8 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         elif self.state == self.DONE:
             context['read_only'] = True
         else:
-            raise ValueError("Illegal state '%r'" % self.state)
+            #This is a dev_facing_error
+            raise ValueError("Self Assessment module is in an illegal state '{0}'".format(self.state))
 
         return system.render_template('self_assessment_hint.html', context)
 
@@ -177,10 +182,16 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         # add new history element with answer and empty score and hint.
         success, get = self.append_image_to_student_answer(get)
         if success:
-            get['student_answer'] = SelfAssessmentModule.sanitize_html(get['student_answer'])
-            self.new_history_entry(get['student_answer'])
-            self.change_state(self.ASSESSING)
+            success, allowed_to_submit, error_message = self.check_if_student_can_submit()
+            if allowed_to_submit:
+                get['student_answer'] = SelfAssessmentModule.sanitize_html(get['student_answer'])
+                self.new_history_entry(get['student_answer'])
+                self.change_state(self.ASSESSING)
+            else:
+                #Error message already defined
+                success = False
         else:
+            #This is a student_facing_error
             error_message = "There was a problem saving the image in your submission.  Please try a different image, or try pasting a link to an image into the answer box."
 
         return {
@@ -214,7 +225,10 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
             for i in xrange(0,len(score_list)):
                 score_list[i] = int(score_list[i])
         except ValueError:
-            return {'success': False, 'error': "Non-integer score value, or no score list"}
+            #This is a dev_facing_error
+            log.error("Non-integer score value passed to save_assessment ,or no score list present.")
+            #This is a student_facing_error
+            return {'success': False, 'error': "Error saving your score.  Please notify course staff."}
 
         #Record score as assessment and rubric scores as post assessment
         self.record_latest_score(score)
@@ -256,6 +270,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         try:
             rubric_scores = json.loads(latest_post_assessment)
         except:
+            #This is a dev_facing_error
             log.error("Cannot parse rubric scores in self assessment module from {0}".format(latest_post_assessment))
             rubric_scores = []
         return [rubric_scores]
@@ -287,7 +302,8 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
         expected_children = []
         for child in expected_children:
             if len(xml_object.xpath(child)) != 1:
-                raise ValueError("Self assessment definition must include exactly one '{0}' tag".format(child))
+                #This is a staff_facing_error
+                raise ValueError("Self assessment definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(child))
 
         def parse(k):
             """Assumes that xml_object has child k"""
diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py
index 457c8ee72a..e262db5615 100644
--- a/common/lib/xmodule/xmodule/peer_grading_module.py
+++ b/common/lib/xmodule/xmodule/peer_grading_module.py
@@ -3,6 +3,7 @@ import logging
 
 from lxml import etree
 
+from datetime import datetime
 from pkg_resources import resource_string
 from .capa_module import  ComplexEncoder
 from .editing_module import EditingDescriptor
@@ -10,6 +11,8 @@ from .stringify import stringify_children
 from .x_module import XModule
 from .xml_module import XmlDescriptor
 from xmodule.modulestore import Location
+from xmodule.modulestore.django import modulestore
+from timeinfo import TimeInfo
 
 from xmodule.open_ended_grading_classes.peer_grading_service import PeerGradingService, GradingServiceError
 
@@ -21,6 +24,8 @@ TRUE_DICT = [True, "True", "true", "TRUE"]
 MAX_SCORE = 1
 IS_GRADED = True
 
+EXTERNAL_GRADER_NO_CONTACT_ERROR = "Failed to contact external graders.  Please notify course staff."
+
 
 class PeerGradingModule(XModule):
     _VERSION = 1
@@ -50,6 +55,7 @@ class PeerGradingModule(XModule):
         self.system = system
         self.peer_gs = PeerGradingService(self.system.open_ended_grading_interface, self.system)
 
+
         self.use_for_single_location = self.metadata.get('use_for_single_location', USE_FOR_SINGLE_LOCATION)
         if isinstance(self.use_for_single_location, basestring):
             self.use_for_single_location = (self.use_for_single_location in TRUE_DICT)
@@ -58,10 +64,28 @@ class PeerGradingModule(XModule):
         if isinstance(self.is_graded, basestring):
             self.is_graded = (self.is_graded in TRUE_DICT)
 
+        display_due_date_string = self.metadata.get('due', None)
+        grace_period_string = self.metadata.get('graceperiod', None)
+
+        try:
+            self.timeinfo = TimeInfo(display_due_date_string, grace_period_string)  
+        except:
+            log.error("Error parsing due date information in location {0}".format(location))
+            raise
+
+        self.display_due_date = self.timeinfo.display_due_date
+
         self.link_to_location = self.metadata.get('link_to_location', USE_FOR_SINGLE_LOCATION)
         if self.use_for_single_location == True:
-            #This will raise an exception if the location is invalid
-            link_to_location_object = Location(self.link_to_location)
+            try:
+                self.linked_problem = modulestore().get_instance(self.system.course_id, self.link_to_location)
+            except:
+                log.error("Linked location {0} for peer grading module {1} does not exist".format(
+                    self.link_to_location, self.location))
+                raise
+            due_date = self.linked_problem.metadata.get('peer_grading_due', None)
+            if due_date:
+                self.metadata['due'] = due_date
 
         self.ajax_url = self.system.ajax_url
         if not self.ajax_url.endswith("/"):
@@ -73,6 +97,15 @@ class PeerGradingModule(XModule):
             #This could result in an exception, but not wrapping in a try catch block so it moves up the stack
             self.max_grade = int(self.max_grade)
 
+    def closed(self):
+        return self._closed(self.timeinfo)
+
+    def _closed(self, timeinfo):
+        if timeinfo.close_date is not None and datetime.utcnow() > timeinfo.close_date:
+            return True
+        return False
+
+
     def _err_response(self, msg):
         """
         Return a HttpResponse with a json dump with success=False, and the given error message.
@@ -92,6 +125,8 @@ class PeerGradingModule(XModule):
          Needs to be implemented by inheritors.  Renders the HTML that students see.
         @return:
         """
+        if self.closed():
+            return self.peer_grading_closed()
         if not self.use_for_single_location:
             return self.peer_grading()
         else:
@@ -112,7 +147,10 @@ class PeerGradingModule(XModule):
             }
 
         if dispatch not in handlers:
-            return 'Error'
+            #This is a dev_facing_error
+            log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
+            #This is a dev_facing_error
+            return json.dumps({'error': 'Error handling action.  Please try again.', 'success' : False})
 
         d = handlers[dispatch](get)
 
@@ -130,6 +168,7 @@ class PeerGradingModule(XModule):
             count_required = response['count_required']
             success = True
         except GradingServiceError:
+            #This is a dev_facing_error
             log.exception("Error getting location data from controller for location {0}, student {1}"
             .format(location, student_id))
 
@@ -155,6 +194,7 @@ class PeerGradingModule(XModule):
             count_graded = response['count_graded']
             count_required = response['count_required']
             if count_required > 0 and count_graded >= count_required:
+                #Ensures that once a student receives a final score for peer grading, that it does not change.
                 self.student_data_for_location = response
 
         score_dict = {
@@ -204,10 +244,12 @@ class PeerGradingModule(XModule):
             response = self.peer_gs.get_next_submission(location, grader_id)
             return response
         except GradingServiceError:
+            #This is a dev_facing_error
             log.exception("Error getting next submission.  server url: {0}  location: {1}, grader_id: {2}"
             .format(self.peer_gs.url, location, grader_id))
+            #This is a student_facing_error
             return {'success': False,
-                               'error': 'Could not connect to grading service'}
+                               'error': EXTERNAL_GRADER_NO_CONTACT_ERROR}
 
     def save_grade(self, get):
         """
@@ -244,14 +286,16 @@ class PeerGradingModule(XModule):
                 score, feedback, submission_key, rubric_scores, submission_flagged)
             return response
         except GradingServiceError:
-            log.exception("""Error saving grade.  server url: {0}, location: {1}, submission_id:{2},
+            #This is a dev_facing_error
+            log.exception("""Error saving grade to open ended grading service.  server url: {0}, location: {1}, submission_id:{2},
                             submission_key: {3}, score: {4}"""
             .format(self.peer_gs.url,
                 location, submission_id, submission_key, score)
             )
+            #This is a student_facing_error
             return {
                 'success': False,
-                'error': 'Could not connect to grading service'
+                'error': EXTERNAL_GRADER_NO_CONTACT_ERROR
             }
 
     def is_student_calibrated(self, get):
@@ -284,11 +328,13 @@ class PeerGradingModule(XModule):
             response = self.peer_gs.is_student_calibrated(location, grader_id)
             return response
         except GradingServiceError:
-            log.exception("Error from grading service.  server url: {0}, grader_id: {0}, location: {1}"
+            #This is a dev_facing_error
+            log.exception("Error from open ended grading service.  server url: {0}, grader_id: {0}, location: {1}"
             .format(self.peer_gs.url, grader_id, location))
+            #This is a student_facing_error
             return {
                 'success': False,
-                'error': 'Could not connect to grading service'
+                'error': EXTERNAL_GRADER_NO_CONTACT_ERROR
             }
 
     def show_calibration_essay(self, get):
@@ -327,16 +373,20 @@ class PeerGradingModule(XModule):
             response = self.peer_gs.show_calibration_essay(location, grader_id)
             return response
         except GradingServiceError:
-            log.exception("Error from grading service.  server url: {0}, location: {0}"
+            #This is a dev_facing_error
+            log.exception("Error from open ended grading service.  server url: {0}, location: {0}"
             .format(self.peer_gs.url, location))
+            #This is a student_facing_error
             return {'success': False,
-                               'error': 'Could not connect to grading service'}
+                               'error': EXTERNAL_GRADER_NO_CONTACT_ERROR}
         # if we can't parse the rubric into HTML,
         except etree.XMLSyntaxError:
+            #This is a dev_facing_error
             log.exception("Cannot parse rubric string. Raw string: {0}"
             .format(rubric))
+            #This is a student_facing_error
             return {'success': False,
-                               'error': 'Error displaying submission'}
+                               'error': 'Error displaying submission.  Please notify course staff.'}
 
 
     def save_calibration_essay(self, get):
@@ -375,8 +425,20 @@ class PeerGradingModule(XModule):
                 submission_key, score, feedback, rubric_scores)
             return response
         except GradingServiceError:
+            #This is a dev_facing_error
             log.exception("Error saving calibration grade, location: {0}, submission_id: {1}, submission_key: {2}, grader_id: {3}".format(location, submission_id, submission_key, grader_id))
-            return self._err_response('Could not connect to grading service')
+            #This is a student_facing_error
+            return self._err_response('There was an error saving your score.  Please notify course staff.')
+
+    def peer_grading_closed(self):
+        '''
+        Show the Peer grading closed template
+        '''
+        html = self.system.render_template('peer_grading/peer_grading_closed.html', {
+            'use_for_single_location': self.use_for_single_location
+            })
+        return html
+
 
     def peer_grading(self, get=None):
         '''
@@ -397,13 +459,49 @@ class PeerGradingModule(XModule):
             problem_list = problem_list_dict['problem_list']
 
         except GradingServiceError:
-            error_text = "Error occured while contacting the grading service"
+            #This is a student_facing_error
+            error_text = EXTERNAL_GRADER_NO_CONTACT_ERROR
             success = False
         # catch error if if the json loads fails
         except ValueError:
-            error_text = "Could not get problem list"
+            #This is a student_facing_error
+            error_text = "Could not get list of problems to peer grade.  Please notify course staff."
             success = False
 
+
+        def _find_corresponding_module_for_location(location):
+            '''
+            find the peer grading module that links to the given location
+            '''
+            try:
+                return modulestore().get_instance(self.system.course_id, location)
+            except:
+                # the linked problem doesn't exist
+                log.error("Problem {0} does not exist in this course".format(location))
+                raise
+
+
+        for problem in problem_list:
+            problem_location = problem['location']
+            descriptor = _find_corresponding_module_for_location(problem_location)
+            if descriptor:
+                problem['due'] = descriptor.metadata.get('peer_grading_due', None)
+                grace_period_string = descriptor.metadata.get('graceperiod', None)
+                try:
+                    problem_timeinfo = TimeInfo(problem['due'], grace_period_string)
+                except:
+                    log.error("Malformed due date or grace period string for location {0}".format(problem_location))
+                    raise
+                if self._closed(problem_timeinfo):
+                    problem['closed'] = True
+                else:
+                    problem['closed'] = False
+            else: 
+                # if we can't find the due date, assume that it doesn't have one
+                problem['due'] = None
+                problem['closed'] = False
+
+
         ajax_url = self.ajax_url
         html = self.system.render_template('peer_grading/peer_grading.html', {
             'course_id': self.system.course_id,
@@ -425,6 +523,8 @@ class PeerGradingModule(XModule):
         if get == None or get.get('location') == None:
             if not self.use_for_single_location:
                 #This is an error case, because it must be set to use a single location to be called without get parameters
+                #This is a dev_facing_error
+                log.error("Peer grading problem in peer_grading_module called with no get parameters, but use_for_single_location is False.")
                 return {'html': "", 'success': False}
             problem_location = self.link_to_location
 
@@ -489,7 +589,8 @@ class PeerGradingDescriptor(XmlDescriptor, EditingDescriptor):
         expected_children = []
         for child in expected_children:
             if len(xml_object.xpath(child)) == 0:
-                raise ValueError("Peer grading definition must include at least one '{0}' tag".format(child))
+                #This is a staff_facing_error
+                raise ValueError("Peer grading definition must include at least one '{0}' tag.  Contact the learning sciences group for assistance.".format(child))
 
         def parse_task(k):
             """Assumes that xml_object has child k"""
diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py
index 04e7ee19b1..9474717cb2 100644
--- a/common/lib/xmodule/xmodule/tests/__init__.py
+++ b/common/lib/xmodule/xmodule/tests/__init__.py
@@ -19,6 +19,15 @@ import xmodule
 from xmodule.x_module import ModuleSystem
 from mock import Mock
 
+open_ended_grading_interface = {
+        'url': 'http://sandbox-grader-001.m.edx.org/peer_grading',
+        'username': 'incorrect_user',
+        'password': 'incorrect_pass',
+        'staff_grading' : 'staff_grading',
+        'peer_grading' : 'peer_grading',
+        'grading_controller' : 'grading_controller'
+    }
+
 test_system = ModuleSystem(
     ajax_url='courses/course_id/modx/a_location',
     track_function=Mock(),
@@ -31,7 +40,8 @@ test_system = ModuleSystem(
     debug=True,
     xqueue={'interface': None, 'callback_url': '/', 'default_queuename': 'testqueue', 'waittime': 10},
     node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"),
-    anonymous_student_id='student'
+    anonymous_student_id='student',
+    open_ended_grading_interface= open_ended_grading_interface
 )
 
 
diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index a22fcdb5f6..e84267c1e7 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -42,6 +42,7 @@ class CapaFactory(object):
                force_save_button=None,
                attempts=None,
                problem_state=None,
+               correct=False
                ):
         """
         All parameters are optional, and are added to the created problem if specified.
@@ -58,6 +59,7 @@ class CapaFactory(object):
                 module.
 
             attempts: also added to instance state.  Will be converted to an int.
+            correct: if True, the problem will be initialized to be answered correctly.
         """
         definition = {'data': CapaFactory.sample_problem_xml, }
         location = Location(["i4x", "edX", "capa_test", "problem",
@@ -81,10 +83,19 @@ class CapaFactory(object):
         instance_state_dict = {}
         if problem_state is not None:
             instance_state_dict = problem_state
+
         if attempts is not None:
             # converting to int here because I keep putting "0" and "1" in the tests
             # since everything else is a string.
             instance_state_dict['attempts'] = int(attempts)
+
+        if correct:
+            # TODO: make this actually set an answer of 3.14, and mark it correct
+            #instance_state_dict['student_answers'] = {}
+            #instance_state_dict['correct_map'] = {}
+            pass
+
+
         if len(instance_state_dict) > 0:
             instance_state = json.dumps(instance_state_dict)
         else:
@@ -94,13 +105,16 @@ class CapaFactory(object):
                             definition, descriptor,
                                       instance_state, None, metadata=metadata)
 
+        if correct:
+            # TODO: probably better to actually set the internal state properly, but...
+            module.get_score = lambda: {'score': 1, 'total': 1}
+
         return module
 
 
 
 class CapaModuleTest(unittest.TestCase):
 
-
     def setUp(self):
         now = datetime.datetime.now()
         day_delta = datetime.timedelta(days=1)
@@ -120,6 +134,18 @@ class CapaModuleTest(unittest.TestCase):
         self.assertNotEqual(module.url_name, other_module.url_name,
                             "Factory should be creating unique names for each problem")
 
+
+    def test_correct(self):
+        """
+        Check that the factory creates correct and incorrect problems properly.
+        """
+        module = CapaFactory.create()
+        self.assertEqual(module.get_score()['score'], 0)
+
+        other_module = CapaFactory.create(correct=True)
+        self.assertEqual(other_module.get_score()['score'], 1)
+
+
     def test_showanswer_default(self):
         """
         Make sure the show answer logic does the right thing.
@@ -178,7 +204,7 @@ class CapaModuleTest(unittest.TestCase):
         for everyone--e.g. after due date + grace period.
         """
 
-        # can see after attempts used up, even with due date in the future
+        # can't see after attempts used up, even with due date in the future
         used_all_attempts = CapaFactory.create(showanswer='past_due',
                                                max_attempts="1",
                                                attempts="1",
@@ -209,3 +235,50 @@ class CapaModuleTest(unittest.TestCase):
                                             due=self.yesterday_str,
                                             graceperiod=self.two_day_delta_str)
         self.assertFalse(still_in_grace.answer_available())
+
+    def test_showanswer_finished(self):
+        """
+        With showanswer="finished" should show answer after the problem is closed,
+        or after the answer is correct.
+        """
+
+        # can see after attempts used up, even with due date in the future
+        used_all_attempts = CapaFactory.create(showanswer='finished',
+                                               max_attempts="1",
+                                               attempts="1",
+                                               due=self.tomorrow_str)
+        self.assertTrue(used_all_attempts.answer_available())
+
+
+        # can see after due date
+        past_due_date = CapaFactory.create(showanswer='finished',
+                                               max_attempts="1",
+                                               attempts="0",
+                                               due=self.yesterday_str)
+        self.assertTrue(past_due_date.answer_available())
+
+
+        # can't see because attempts left and wrong
+        attempts_left_open = CapaFactory.create(showanswer='finished',
+                                               max_attempts="1",
+                                               attempts="0",
+                                               due=self.tomorrow_str)
+        self.assertFalse(attempts_left_open.answer_available())
+
+        # _can_ see because attempts left and right
+        correct_ans = CapaFactory.create(showanswer='finished',
+                                               max_attempts="1",
+                                               attempts="0",
+                                               due=self.tomorrow_str,
+                                               correct=True)
+        self.assertTrue(correct_ans.answer_available())
+
+
+        # Can see even though grace period hasn't expired, because have no more
+        # attempts.
+        still_in_grace = CapaFactory.create(showanswer='finished',
+                                            max_attempts="1",
+                                            attempts="1",
+                                            due=self.yesterday_str,
+                                            graceperiod=self.two_day_delta_str)
+        self.assertTrue(still_in_grace.answer_available())
diff --git a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
index ef6344eb57..5f6496f823 100644
--- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
+++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
@@ -48,6 +48,7 @@ class OpenEndedChildTest(unittest.TestCase):
             'close_date': None,
             's3_interface' : "",
             'open_ended_grading_interface' : {},
+            'skip_basic_checks' : False,
             }
     definition = Mock()
     descriptor = Mock()
@@ -167,6 +168,7 @@ class OpenEndedModuleTest(unittest.TestCase):
             'close_date': None,
             's3_interface' : test_util_open_ended.S3_INTERFACE,
             'open_ended_grading_interface' : test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
+            'skip_basic_checks' : False,
             }
 
     oeparam = etree.XML('''
@@ -301,6 +303,7 @@ class CombinedOpenEndedModuleTest(unittest.TestCase):
             'close_date' : "",
             's3_interface' : test_util_open_ended.S3_INTERFACE,
             'open_ended_grading_interface' : test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
+            'skip_basic_checks' : False,
             }
 
     oeparam = etree.XML('''
diff --git a/common/lib/xmodule/xmodule/tests/test_export.py b/common/lib/xmodule/xmodule/tests/test_export.py
index da1b04bd94..e9fb89e9f6 100644
--- a/common/lib/xmodule/xmodule/tests/test_export.py
+++ b/common/lib/xmodule/xmodule/tests/test_export.py
@@ -4,7 +4,7 @@ from fs.osfs import OSFS
 from nose.tools import assert_equals, assert_true
 from path import path
 from tempfile import mkdtemp
-from shutil import copytree
+import shutil
 
 from xmodule.modulestore.xml import XMLModuleStore
 
@@ -46,11 +46,11 @@ class RoundTripTestCase(unittest.TestCase):
         Thus we make sure that export and import work properly.
     '''
     def check_export_roundtrip(self, data_dir, course_dir):
-        root_dir = path(mkdtemp())
+        root_dir = path(self.temp_dir)
         print "Copying test course to temp dir {0}".format(root_dir)
 
         data_dir = path(data_dir)
-        copytree(data_dir / course_dir, root_dir / course_dir)
+        shutil.copytree(data_dir / course_dir, root_dir / course_dir)
 
         print "Starting import"
         initial_import = XMLModuleStore(root_dir, course_dirs=[course_dir])
@@ -108,6 +108,8 @@ class RoundTripTestCase(unittest.TestCase):
 
     def setUp(self):
         self.maxDiff = None
+        self.temp_dir = mkdtemp()
+        self.addCleanup(shutil.rmtree, self.temp_dir)
 
     def test_toy_roundtrip(self):
         self.check_export_roundtrip(DATA_DIR, "toy")
diff --git a/common/lib/xmodule/xmodule/tests/test_self_assessment.py b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
index fe55c88e82..b9c3076b7c 100644
--- a/common/lib/xmodule/xmodule/tests/test_self_assessment.py
+++ b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
@@ -1,11 +1,10 @@
 import json
-from mock import Mock
+from mock import Mock, MagicMock
 import unittest
 
 from xmodule.open_ended_grading_classes.self_assessment_module import SelfAssessmentModule
 from xmodule.modulestore import Location
 from lxml import etree
-from nose.plugins.skip import SkipTest
 
 from . import test_system
 
@@ -51,6 +50,7 @@ class SelfAssessmentTest(unittest.TestCase):
                 'close_date': None,
                 's3_interface' : test_util_open_ended.S3_INTERFACE,
                 'open_ended_grading_interface' : test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
+                'skip_basic_checks' : False,
                 }
 
         self.module = SelfAssessmentModule(test_system, self.location,
@@ -63,13 +63,29 @@ class SelfAssessmentTest(unittest.TestCase):
         self.assertTrue("This is sample prompt text" in html)
 
     def test_self_assessment_flow(self):
-        raise SkipTest()
+        responses = {'assessment': '0', 'score_list[]': ['0', '0']}
+        def get_fake_item(name):
+            return responses[name]
+
+        def get_data_for_location(self,location,student):
+            return {
+            'count_graded' : 0,
+            'count_required' : 0,
+            'student_sub_count': 0,
+            }
+
+        mock_query_dict = MagicMock()
+        mock_query_dict.__getitem__.side_effect = get_fake_item
+        mock_query_dict.getlist = get_fake_item
+
+        self.module.peer_gs.get_data_for_location = get_data_for_location
+
         self.assertEqual(self.module.get_score()['score'], 0)
 
         self.module.save_answer({'student_answer': "I am an answer"}, test_system)
         self.assertEqual(self.module.state, self.module.ASSESSING)
 
-        self.module.save_assessment({'assessment': '0'}, test_system)
+        self.module.save_assessment(mock_query_dict, test_system)
         self.assertEqual(self.module.state, self.module.DONE)
 
 
@@ -79,5 +95,6 @@ class SelfAssessmentTest(unittest.TestCase):
 
         # if we now assess as right, skip the REQUEST_HINT state
         self.module.save_answer({'student_answer': 'answer 4'}, test_system)
-        self.module.save_assessment({'assessment': '1'}, test_system)
+        responses['assessment'] = '1'
+        self.module.save_assessment(mock_query_dict, test_system)
         self.assertEqual(self.module.state, self.module.DONE)
diff --git a/common/lib/xmodule/xmodule/timeinfo.py b/common/lib/xmodule/xmodule/timeinfo.py
new file mode 100644
index 0000000000..6c6a72e700
--- /dev/null
+++ b/common/lib/xmodule/xmodule/timeinfo.py
@@ -0,0 +1,39 @@
+import dateutil
+import dateutil.parser
+import datetime
+from timeparse import parse_timedelta
+
+import logging
+log = logging.getLogger(__name__)
+
+class TimeInfo(object):
+    """
+    This is a simple object that calculates and stores datetime information for an XModule
+    based on the due date string and the grace period string
+
+    So far it parses out three different pieces of time information:
+        self.display_due_date - the 'official' due date that gets displayed to students
+        self.grace_period - the length of the grace period
+        self.close_date - the real due date
+
+    """
+    def __init__(self, display_due_date_string, grace_period_string):
+        if display_due_date_string is not None:
+            try:
+                self.display_due_date = dateutil.parser.parse(display_due_date_string)
+            except ValueError:
+                log.error("Could not parse due date {0}".format(display_due_date_string))
+                raise
+        else:
+            self.display_due_date = None
+
+        if grace_period_string is not None and self.display_due_date:
+            try:
+                self.grace_period = parse_timedelta(grace_period_string)
+                self.close_date = self.display_due_date + self.grace_period
+            except:
+                log.error("Error parsing the grace period {0}".format(grace_period_string))
+                raise
+        else:
+            self.grace_period = None
+            self.close_date = self.display_due_date
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index b5e9b10ea6..dccc96a7ca 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -411,7 +411,6 @@ class ResourceTemplates(object):
 
         return templates
 
-
 class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
     """
     An XModuleDescriptor is a specification for an element of a course. This
@@ -585,11 +584,11 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
     def inherit_metadata(self, metadata):
         """
         Updates this module with metadata inherited from a containing module.
-        Only metadata specified in self.inheritable_metadata will
+        Only metadata specified in inheritable_metadata will
         be inherited
         """
         # Set all inheritable metadata from kwargs that are
-        # in self.inheritable_metadata and aren't already set in metadata
+        # in inheritable_metadata and aren't already set in metadata
         for attr in self.inheritable_metadata:
             if attr not in self.metadata and attr in metadata:
                 self._inherited_metadata.add(attr)
diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py
index 64c3aabbcc..773531c528 100644
--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -128,8 +128,7 @@ class XmlDescriptor(XModuleDescriptor):
         'graded': bool_map,
         'hide_progress_tab': bool_map,
         'allow_anonymous': bool_map,
-        'allow_anonymous_to_peers': bool_map,
-        'weight': int_map
+        'allow_anonymous_to_peers': bool_map
     }
 
 
diff --git a/common/static/coffee/src/discussion/discussion.coffee b/common/static/coffee/src/discussion/discussion.coffee
index 068cde3de4..9cee068b74 100644
--- a/common/static/coffee/src/discussion/discussion.coffee
+++ b/common/static/coffee/src/discussion/discussion.coffee
@@ -39,6 +39,8 @@ if Backbone?
           url = DiscussionUtil.urlFor 'threads'
         when 'followed'
           url = DiscussionUtil.urlFor 'followed_threads', options.user_id
+      if options['group_id']
+        data['group_id'] = options['group_id']
       data['sort_key'] = sort_options.sort_key || 'date'
       data['sort_order'] = sort_options.sort_order || 'desc'
       DiscussionUtil.safeAjax
diff --git a/common/static/coffee/src/discussion/discussion_module_view.coffee b/common/static/coffee/src/discussion/discussion_module_view.coffee
index 554f292c71..d5f0b2cab3 100644
--- a/common/static/coffee/src/discussion/discussion_module_view.coffee
+++ b/common/static/coffee/src/discussion/discussion_module_view.coffee
@@ -70,10 +70,21 @@ if Backbone?
       DiscussionUtil.loadRoles(response.roles)
       allow_anonymous = response.allow_anonymous
       allow_anonymous_to_peers = response.allow_anonymous_to_peers
+      cohorts = response.cohorts
       # $elem.html("Hide Discussion")
       @discussion = new Discussion()
       @discussion.reset(response.discussion_data, {silent: false})
-      $discussion = $(Mustache.render $("script#_inline_discussion").html(), {'threads':response.discussion_data, 'discussionId': discussionId, 'allow_anonymous_to_peers': allow_anonymous_to_peers, 'allow_anonymous': allow_anonymous})
+
+      #use same discussion template but different thread templated
+      #determined in the coffeescript based on whether or not there's a
+      #group id
+      
+      if response.is_cohorted
+        source = "script#_inline_discussion_cohorted"
+      else
+        source = "script#_inline_discussion"
+      
+      $discussion = $(Mustache.render $(source).html(), {'threads':response.discussion_data, 'discussionId': discussionId, 'allow_anonymous_to_peers': allow_anonymous_to_peers, 'allow_anonymous': allow_anonymous, 'cohorts':cohorts})
       if @$('section.discussion').length
         @$('section.discussion').replaceWith($discussion)
       else
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
index c5f66c87ec..8364963218 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
@@ -9,6 +9,7 @@ if Backbone?
       "click .browse-topic-drop-search-input": "ignoreClick"
       "click .post-list .list-item a": "threadSelected"
       "click .post-list .more-pages a": "loadMorePages"
+      "change .cohort-options": "chooseCohort"
       'keyup .browse-topic-drop-search-input': DiscussionFilter.filterDrop
 
     initialize: ->
@@ -128,10 +129,20 @@ if Backbone?
       switch @mode
         when 'search'
           options.search_text = @current_search
+          if @group_id
+            options.group_id = @group_id          
         when 'followed'
           options.user_id = window.user.id
+          options.group_id = "all"
         when 'commentables'
           options.commentable_ids = @discussionIds
+          if @group_id
+            options.group_id = @group_id
+        when 'all'
+          if @group_id
+            options.group_id = @group_id
+        
+    
       @collection.retrieveAnotherPage(@mode, options, {sort_key: @sortBy})
 
     renderThread: (thread) =>
@@ -263,13 +274,25 @@ if Backbone?
         if discussionId == "#all"
           @discussionIds = ""
           @$(".post-search-field").val("")
+          @$('.cohort').show()                    
           @retrieveAllThreads()
         else if discussionId == "#following"
           @retrieveFollowed(event)
+          @$('.cohort').hide()
         else
           discussionIds = _.map item.find(".board-name[data-discussion_id]"), (board) -> $(board).data("discussion_id").id
-          @retrieveDiscussions(discussionIds)
-
+          
+          if $(event.target).attr('cohorted') == "True"
+            @retrieveDiscussions(discussionIds, "function(){$('.cohort').show();}")
+          else
+            @retrieveDiscussions(discussionIds, "function(){$('.cohort').hide();}")
+    
+    chooseCohort: (event) ->
+      @group_id = @$('.cohort-options :selected').val()
+      @collection.current_page = 0
+      @collection.reset()
+      @loadMorePages(event)
+      
     retrieveDiscussion: (discussion_id, callback=null) ->
       url = DiscussionUtil.urlFor("retrieve_discussion", discussion_id)
       DiscussionUtil.safeAjax
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee b/common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee
index 7dab9ae342..e648955d08 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee
@@ -16,7 +16,10 @@ if Backbone?
       @$delegateElement = @$local
 
     render: ->
-      @template = DiscussionUtil.getTemplate("_inline_thread")
+      if @model.has('group_id')
+        @template = DiscussionUtil.getTemplate("_inline_thread_cohorted")
+      else
+        @template = DiscussionUtil.getTemplate("_inline_thread")
 
       if not @model.has('abbreviatedBody')
         @abbreviateBody()
diff --git a/common/static/coffee/src/discussion/views/new_post_inline_vew.coffee b/common/static/coffee/src/discussion/views/new_post_inline_vew.coffee
index ed5ee13919..ffd43ff7bf 100644
--- a/common/static/coffee/src/discussion/views/new_post_inline_vew.coffee
+++ b/common/static/coffee/src/discussion/views/new_post_inline_vew.coffee
@@ -25,6 +25,7 @@ if Backbone?
       event.preventDefault()
       title   = @$(".new-post-title").val()
       body    = @$(".new-post-body").find(".wmd-input").val()
+      group = @$(".new-post-group option:selected").attr("value")
 
       # TODO tags: commenting out til we know what to do with them
       #tags    = @$(".new-post-tags").val()
@@ -45,6 +46,7 @@ if Backbone?
         data:
           title: title
           body: body
+          group_id: group
           
           # TODO tags: commenting out til we know what to do with them
           #tags: tags
diff --git a/common/static/coffee/src/discussion/views/new_post_view.coffee b/common/static/coffee/src/discussion/views/new_post_view.coffee
index 1c49fdbc8e..606e4f30d7 100644
--- a/common/static/coffee/src/discussion/views/new_post_view.coffee
+++ b/common/static/coffee/src/discussion/views/new_post_view.coffee
@@ -14,8 +14,14 @@ if Backbone?
           @setSelectedTopic()
 
           DiscussionUtil.makeWmdEditor @$el, $.proxy(@$, @), "new-post-body"
+          
           @$(".new-post-tags").tagsInput DiscussionUtil.tagsInputOptions()
-
+          
+          if @$($(".topic_menu li a")[0]).attr('cohorted') != "True"
+            $('.choose-cohort').hide();
+          
+            
+          
       events:
           "submit .new-post-form":            "createPost"
           "click  .topic_dropdown_button":    "toggleTopicDropdown"
@@ -65,6 +71,11 @@ if Backbone?
               @topicText  = @getFullTopicName($target)
               @topicId   = $target.data('discussion_id')
               @setSelectedTopic()
+              if $target.attr('cohorted') == "True"
+                $('.choose-cohort').show();
+              else
+                $('.choose-cohort').hide();
+              
 
       setSelectedTopic: ->
           @dropdownButton.html(@fitName(@topicText) + ' <span class="drop-arrow">▾</span>')
@@ -116,6 +127,7 @@ if Backbone?
           title   = @$(".new-post-title").val()
           body    = @$(".new-post-body").find(".wmd-input").val()
           tags    = @$(".new-post-tags").val()
+          group = @$(".new-post-group option:selected").attr("value")
 
           anonymous          = false || @$("input.discussion-anonymous").is(":checked")
           anonymous_to_peers = false || @$("input.discussion-anonymous-to-peers").is(":checked")
@@ -137,6 +149,7 @@ if Backbone?
                   anonymous: anonymous
                   anonymous_to_peers: anonymous_to_peers
                   auto_subscribe: follow
+                  group_id: group
               error: DiscussionUtil.formErrorHandler(@$(".new-post-form-errors"))
               success: (response, textStatus) =>
                   # TODO: Move this out of the callback, this makes it feel sluggish
diff --git a/common/static/css/pdfviewer.css b/common/static/css/pdfviewer.css
new file mode 100644
index 0000000000..656bc47c29
--- /dev/null
+++ b/common/static/css/pdfviewer.css
@@ -0,0 +1,763 @@
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+* {
+  padding: 0;
+  margin: 0;
+}
+
+html {
+  height: 100%;
+}
+
+body {
+  height: 100%;
+  background-color: #404040;
+  background-image: url(vendor/pdfjs/images/texture.png);
+}
+
+body,
+input,
+button,
+select {
+  font: message-box;
+}
+
+.hidden {
+  display: none;
+}
+[hidden] {
+  display: none !important;
+}
+
+#viewerContainer.presentationControls {
+  cursor: default;
+}
+*/
+
+/* outer/inner center provides horizontal center */
+.outerCenter {
+  float: right;
+  position: relative;
+  right: 50%;
+}
+
+.innerCenter {
+  float: right;
+  position: relative;
+  right: -50%;
+}
+
+#outerContainer {
+  width: 100%;
+  height: 100%;
+}
+
+#mainContainer {
+/*  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;*/
+  -webkit-transition-duration: 200ms;
+  -webkit-transition-timing-function: ease;
+  -moz-transition-duration: 200ms;
+  -moz-transition-timing-function: ease;
+  -ms-transition-duration: 200ms;
+  -ms-transition-timing-function: ease;
+  -o-transition-duration: 200ms;
+  -o-transition-timing-function: ease;
+  transition-duration: 200ms;
+  transition-timing-function: ease;
+}
+
+#viewerContainer {
+/*  overflow: auto; */
+  box-shadow: inset 1px 0 0 hsla(0,0%,100%,.05);
+/*  position: absolute;
+  top: 32px;
+  right: 0;
+  bottom: 0;
+  left: 0; */
+/* switch to using these instead: */
+  position: relative;
+  overflow: hidden;
+}
+
+.toolbar {
+/*  position: absolute; */
+  left: 0;
+  right: 0; 
+  height: 32px;
+  z-index: 9999;
+  cursor: default;
+}
+
+#toolbarContainer {
+  width: 100%;
+}
+
+
+#toolbarViewer {
+  position: relative;
+  height: 32px;
+  background-image: url(vendor/pdfjs/images/texture.png),
+                    -webkit-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+  background-image: url(vendor/pdfjs/images/texture.png),
+                    -moz-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+  background-image: url(vendor/pdfjs/images/texture.png),
+                    -ms-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+  background-image: url(vendor/pdfjs/images/texture.png),
+                    -o-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+  background-image: url(vendor/pdfjs/images/texture.png),
+                    linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+  box-shadow: inset 1px 0 0 hsla(0,0%,100%,.08),
+              inset 0 1px 1px hsla(0,0%,0%,.15),
+              inset 0 -1px 0 hsla(0,0%,100%,.05),
+              0 1px 0 hsla(0,0%,0%,.15),
+              0 1px 1px hsla(0,0%,0%,.1);
+}
+
+#toolbarViewerLeft {
+  margin-left: -1px;
+/*   position: absolute;  */
+  top: 0;
+  left: 0;
+}
+
+#toolbarViewerRight {
+/*  position: absolute;  */
+  top: 0;
+  right: 0;
+}
+
+#toolbarViewerLeft > *,
+#toolbarViewerMiddle > *,
+#toolbarViewerRight > * {
+  float: left;
+}
+
+.splitToolbarButton {
+  margin: 3px 2px 4px 0;
+  display: inline-block;
+}
+.splitToolbarButton > .toolbarButton {
+  border-radius: 0;
+  float: left;
+}
+
+.toolbarButton {
+  border: 0 none;
+  background-color: rgba(0, 0, 0, 0);
+  width: 32px;
+  height: 25px;
+}
+
+.toolbarButton > span {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  overflow: hidden;
+}
+
+.toolbarButton[disabled] {
+  opacity: .5;
+}
+
+.toolbarButton.group {
+  margin-right:0;
+}
+
+.splitToolbarButton.toggled .toolbarButton {
+  margin: 0;
+}
+
+.splitToolbarButton:hover > .toolbarButton,
+.splitToolbarButton:focus > .toolbarButton,
+.splitToolbarButton.toggled > .toolbarButton,
+.toolbarButton.textButton {
+  background-color: hsla(0,0%,0%,.12);
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  border: 1px solid hsla(0,0%,0%,.35);
+  border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.15) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+  -webkit-transition-property: background-color, border-color, box-shadow;
+  -webkit-transition-duration: 150ms;
+  -webkit-transition-timing-function: ease;
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 150ms;
+  -moz-transition-timing-function: ease;
+  -ms-transition-property: background-color, border-color, box-shadow;
+  -ms-transition-duration: 150ms;
+  -ms-transition-timing-function: ease;
+  -o-transition-property: background-color, border-color, box-shadow;
+  -o-transition-duration: 150ms;
+  -o-transition-timing-function: ease;
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 150ms;
+  transition-timing-function: ease;
+
+}
+.splitToolbarButton > .toolbarButton:hover,
+.splitToolbarButton > .toolbarButton:focus,
+.dropdownToolbarButton:hover,
+.toolbarButton.textButton:hover,
+.toolbarButton.textButton:focus {
+  background-color: hsla(0,0%,0%,.2);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.15) inset,
+              0 0 1px hsla(0,0%,0%,.05);
+  z-index: 199;
+}
+.splitToolbarButton > .toolbarButton:first-child {
+  position: relative;
+  margin: 0;
+  margin-right: -1px;
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+  border-right-color: transparent;
+}
+.splitToolbarButton > .toolbarButton:last-child {
+  position: relative;
+  margin: 0;
+  margin-left: -1px;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-left-color: transparent;
+}
+.splitToolbarButtonSeparator {
+  padding: 8px 0;
+  width: 1px;
+  background-color: hsla(0,0%,00%,.5);
+  z-index: 99;
+  box-shadow: 0 0 0 1px hsla(0,0%,100%,.08);
+  display: inline-block;
+  margin: 5px 0;
+  float:left;
+}
+}
+.splitToolbarButton:hover > .splitToolbarButtonSeparator,
+.splitToolbarButton.toggled > .splitToolbarButtonSeparator {
+  padding: 12px 0;
+  margin: 1px 0;
+  box-shadow: 0 0 0 1px hsla(0,0%,100%,.03);
+  -webkit-transition-property: padding;
+  -webkit-transition-duration: 10ms;
+  -webkit-transition-timing-function: ease;
+  -moz-transition-property: padding;
+  -moz-transition-duration: 10ms;
+  -moz-transition-timing-function: ease;
+  -ms-transition-property: padding;
+  -ms-transition-duration: 10ms;
+  -ms-transition-timing-function: ease;
+  -o-transition-property: padding;
+  -o-transition-duration: 10ms;
+  -o-transition-timing-function: ease;
+  transition-property: padding;
+  transition-duration: 10ms;
+  transition-timing-function: ease;
+}
+
+.toolbarButton,
+.dropdownToolbarButton {
+  min-width: 16px;
+  padding: 2px 6px 0;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  color: hsl(0,0%,95%);
+  font-size: 12px;
+  line-height: 14px;
+  -webkit-user-select:none;
+  -moz-user-select:none;
+  -ms-user-select:none;
+  /* Opera does not support user-select, use <... unselectable="on"> instead */
+  cursor: default;
+  -webkit-transition-property: background-color, border-color, box-shadow;
+  -webkit-transition-duration: 150ms;
+  -webkit-transition-timing-function: ease;
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 150ms;
+  -moz-transition-timing-function: ease;
+  -ms-transition-property: background-color, border-color, box-shadow;
+  -ms-transition-duration: 150ms;
+  -ms-transition-timing-function: ease;
+  -o-transition-property: background-color, border-color, box-shadow;
+  -o-transition-duration: 150ms;
+  -o-transition-timing-function: ease;
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 150ms;
+  transition-timing-function: ease;
+}
+
+.toolbarButton {
+  margin: 3px 2px 4px 0;
+}
+
+.toolbarButton:hover,
+.toolbarButton:focus,
+.dropdownToolbarButton {
+  background-color: hsla(0,0%,0%,.12);
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  border: 1px solid hsla(0,0%,0%,.35);
+  border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.15) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+}
+
+.toolbarButton:hover:active,
+.dropdownToolbarButton:hover:active {
+  background-color: hsla(0,0%,0%,.2);
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.4) hsla(0,0%,0%,.45);
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
+              0 0 1px hsla(0,0%,0%,.2) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+  -webkit-transition-property: background-color, border-color, box-shadow;
+  -webkit-transition-duration: 10ms;
+  -webkit-transition-timing-function: linear;
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 10ms;
+  -moz-transition-timing-function: linear;
+  -ms-transition-property: background-color, border-color, box-shadow;
+  -ms-transition-duration: 10ms;
+  -ms-transition-timing-function: linear;
+  -o-transition-property: background-color, border-color, box-shadow;
+  -o-transition-duration: 10ms;
+  -o-transition-timing-function: linear;
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 10ms;
+  transition-timing-function: linear;
+}
+
+.toolbarButton.toggled,
+.splitToolbarButton.toggled > .toolbarButton.toggled {
+  background-color: hsla(0,0%,0%,.3);
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.45) hsla(0,0%,0%,.5);
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
+              0 0 1px hsla(0,0%,0%,.2) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+  -webkit-transition-property: background-color, border-color, box-shadow;
+  -webkit-transition-duration: 10ms;
+  -webkit-transition-timing-function: linear;
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 10ms;
+  -moz-transition-timing-function: linear;
+  -ms-transition-property: background-color, border-color, box-shadow;
+  -ms-transition-duration: 10ms;
+  -ms-transition-timing-function: linear;
+  -o-transition-property: background-color, border-color, box-shadow;
+  -o-transition-duration: 10ms;
+  -o-transition-timing-function: linear;
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 10ms;
+  transition-timing-function: linear;
+}
+
+.toolbarButton.toggled:hover:active,
+.splitToolbarButton.toggled > .toolbarButton.toggled:hover:active {
+  background-color: hsla(0,0%,0%,.4);
+  border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.5) hsla(0,0%,0%,.55);
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.2) inset,
+              0 0 1px hsla(0,0%,0%,.3) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+}
+
+.dropdownToolbarButton {
+  max-width: 120px;
+  padding: 3px 2px 2px;
+  overflow: hidden;
+  background: url(vendor/pdfjs/images/toolbarButton-menuArrows.png) no-repeat;
+  background-position: 95%;
+}
+
+.dropdownToolbarButton > select {
+  -webkit-appearance: none;
+  -moz-appearance: none; /* in the future this might matter, see bugzilla bug #649849 */
+  min-width: 140px;
+  font-size: 12px;
+  color: hsl(0,0%,95%);
+  margin:0;
+  padding:0;
+  border:none;
+  background: rgba(0,0,0,0); /* Opera does not support 'transparent' <select> background */
+}
+
+.dropdownToolbarButton > select > option {
+  background: hsl(0,0%,24%);
+}
+
+#customScaleOption {
+  display: none;
+}
+
+#pageWidthOption {
+  border-bottom: 1px rgba(255, 255, 255, .5) solid;
+}
+
+.splitToolbarButton:first-child,
+.toolbarButton:first-child,
+.splitToolbarButton:last-child,
+.toolbarButton:last-child {
+  margin-left: 4px;
+}
+
+.toolbarButtonSpacer {
+  width: 30px;
+  display: inline-block;
+  height: 1px;
+}
+
+.toolbarButtonFlexibleSpacer {
+  -webkit-box-flex: 1;
+  -moz-box-flex: 1;
+  min-width: 30px;
+}
+
+.toolbarButton#sidebarToggle::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/toolbarButton-sidebarToggle.png);
+}
+
+.toolbarButton.findPrevious::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/findbarButton-previous.png);
+}
+
+
+
+.toolbarButton.findNext::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/findbarButton-next.png);
+}
+
+
+
+.toolbarButton.pageUp::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/toolbarButton-pageUp.png);
+}
+
+
+
+.toolbarButton.pageDown::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/toolbarButton-pageDown.png);
+}
+
+
+
+.toolbarButton.zoomOut::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/toolbarButton-zoomOut.png);
+}
+
+.toolbarButton.zoomIn::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/toolbarButton-zoomIn.png);
+}
+
+.toolbarButton.fullscreen::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/toolbarButton-fullscreen.png);
+}
+
+.toolbarButton.print::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/toolbarButton-print.png);
+}
+
+.toolbarButton.openFile::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/toolbarButton-openFile.png);
+}
+
+.toolbarButton.download::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/toolbarButton-download.png);
+}
+
+.toolbarButton.bookmark {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  margin-top: 3px;
+  padding-top: 4px;
+}
+
+.toolbarButton.bookmark::before {
+  content: url(vendor/pdfjs/images/toolbarButton-bookmark.png);
+}
+
+#viewThumbnail.toolbarButton::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/toolbarButton-viewThumbnail.png);
+}
+
+#viewOutline.toolbarButton::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/toolbarButton-viewOutline.png);
+}
+
+#viewFind.toolbarButton::before {
+  display: inline-block;
+  content: url(vendor/pdfjs/images/toolbarButton-search.png);
+}
+
+
+.toolbarField {
+  padding: 3px 6px;
+  margin: 4px 0 4px 0;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  background-color: hsla(0,0%,100%,.09);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  border: 1px solid hsla(0,0%,0%,.35);
+  border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
+  box-shadow: 0 1px 0 hsla(0,0%,0%,.05) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+  color: hsl(0,0%,95%);
+  font-size: 12px;
+  line-height: 14px;
+  outline-style: none;
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 150ms;
+  -moz-transition-timing-function: ease;
+}
+
+.toolbarField[type=checkbox] {
+  display: inline-block;
+  margin: 8px 0px;
+}
+
+.toolbarField.pageNumber {
+  min-width: 16px;
+  text-align: right;
+  width: 40px;
+}
+
+.toolbarField.pageNumber::-webkit-inner-spin-button,
+.toolbarField.pageNumber::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}
+
+.toolbarField:hover {
+  background-color: hsla(0,0%,100%,.11);
+  border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.43) hsla(0,0%,0%,.45);
+}
+
+.toolbarField:focus {
+  background-color: hsla(0,0%,100%,.15);
+  border-color: hsla(204,100%,65%,.8) hsla(204,100%,65%,.85) hsla(204,100%,65%,.9);
+}
+
+.toolbarLabel {
+  min-width: 16px;
+  padding: 3px 6px 3px 2px;
+  margin: 4px 2px 4px 0;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  color: hsl(0,0%,85%);
+  font-size: 12px;
+  line-height: 14px;
+  text-align: left;
+  -webkit-user-select:none;
+  -moz-user-select:none;
+  cursor: default;
+}
+
+canvas {
+  margin: auto;
+  display: block;
+}
+
+.pdfpage {
+  direction: ltr;
+  width: 816px;
+  height: 1056px;
+  margin: 10px auto;
+  position: relative;
+  overflow: visible;
+  -webkit-box-shadow: 0px 4px 10px #000;
+  -moz-box-shadow: 0px 4px 10px #000;
+  box-shadow: 0px 4px 10px #000;
+  background-color: white;
+}
+
+.pdfpage > a {
+  display: block;
+  position: absolute;
+}
+
+.pdfpage > a:hover {
+  opacity: 0.2;
+  background: #ff0;
+  -webkit-box-shadow: 0px 2px 10px #ff0;
+  -moz-box-shadow: 0px 2px 10px #ff0;
+  box-shadow: 0px 2px 10px #ff0;
+}
+
+.loadingIcon {
+/*  position: absolute; */
+  display: block;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  background: url('vendor/pdfjs/images/loading-icon.gif') center no-repeat;
+}
+
+#loadingBox {
+/*  position: absolute; */
+  top: 50%;
+  margin-top: -25px;
+  left: 0;
+  right: 0;
+  text-align: center;
+  color: #ddd;
+  font-size: 14px;
+}
+
+#loadingBar {
+  display: inline-block;
+  clear: both;
+  margin: 0px;
+  margin-top: 5px;
+  line-height: 0;
+  border-radius: 2px;
+  width: 200px;
+  height: 25px;
+
+  background-color: hsla(0,0%,0%,.3);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  border: 1px solid #000;
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
+              0 0 1px hsla(0,0%,0%,.2) inset,
+              0 0 1px 1px rgba(255, 255, 255, 0.1);
+}
+
+#loadingBar .progress {
+  display: inline-block;
+  float: left;
+
+  background: #666;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b2b2b2), color-stop(100%,#898989));
+  background: -webkit-linear-gradient(top, #b2b2b2 0%,#898989 100%);
+  background: -moz-linear-gradient(top, #b2b2b2 0%,#898989 100%);
+  background: -ms-linear-gradient(top, #b2b2b2 0%,#898989 100%);
+  background: -o-linear-gradient(top, #b2b2b2 0%,#898989 100%);
+  background: linear-gradient(top, #b2b2b2 0%,#898989 100%);
+
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+
+  width: 0%;
+  height: 100%;
+}
+
+#loadingBar .progress.full {
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+
+#loadingBar .progress.indeterminate {
+  width: 100%;
+  height: 25px;
+  background-image: -moz-linear-gradient( 30deg, #404040, #404040 15%, #898989, #404040 85%, #404040);
+  background-image: -webkit-linear-gradient( 30deg, #404040, #404040 15%, #898989, #404040 85%, #404040);
+  background-image: -ms-linear-gradient( 30deg, #404040, #404040 15%, #898989, #404040 85%, #404040);
+  background-image: -o-linear-gradient( 30deg, #404040, #404040 15%, #898989, #404040 85%, #404040);
+  background-size: 75px 25px;
+  -moz-animation: progressIndeterminate 1s linear infinite;
+  -webkit-animation: progressIndeterminate 1s linear infinite;
+}
+
+@-moz-keyframes progressIndeterminate {
+  from { background-position: 0px 0px; }
+  to { background-position: 75px 0px; }
+}
+
+@-webkit-keyframes progressIndeterminate {
+  from { background-position: 0px 0px; }
+  to { background-position: 75px 0px; }
+}
+
+/* TODO: file FF bug to support ::-moz-selection:window-inactive
+   so we can override the opaque grey background when the window is inactive;
+   see https://bugzilla.mozilla.org/show_bug.cgi?id=706209 */
+::selection { background:rgba(0,0,255,0.3); }
+::-moz-selection { background:rgba(0,0,255,0.3); }
+
+.clearBoth {
+  clear: both;
+}
+
+@page {
+  margin: 0;
+}
+
+@media all and (max-width: 950px) {
+  #outerContainer.sidebarMoving .outerCenter,
+  #outerContainer.sidebarOpen .outerCenter {
+    float: left;
+    left: 180px;
+  }
+
+}
+
+@media all and (max-width: 770px) {
+  .outerCenter {
+    float: left;
+    left: 180px;
+  }
+}
+
+@media all and (max-width: 600px) {
+  #toolbarViewerRight {
+    display: none;
+  }
+}
+
+@media all and (max-width: 500px) {
+  #scaleSelectContainer, #pageNumberLabel {
+    display: none;
+  }
+}
+
diff --git a/common/static/css/vendor/pdfjs/images/annotation-check.svg b/common/static/css/vendor/pdfjs/images/annotation-check.svg
new file mode 100644
index 0000000000..f28f0e89a1
--- /dev/null
+++ b/common/static/css/vendor/pdfjs/images/annotation-check.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="40"
+   height="40">
+  <path
+     d="M 1.5006714,23.536225 6.8925879,18.994244 14.585721,26.037937 34.019683,4.5410479 38.499329,9.2235032 14.585721,35.458952 z"
+     id="path4"
+     style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:1.25402856;stroke-opacity:1" />
+</svg>
diff --git a/common/static/css/vendor/pdfjs/images/annotation-comment.svg b/common/static/css/vendor/pdfjs/images/annotation-comment.svg
new file mode 100644
index 0000000000..b2aee63e56
--- /dev/null
+++ b/common/static/css/vendor/pdfjs/images/annotation-comment.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   height="40"
+   width="40">
+  <rect
+     style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     width="33.76017"
+     height="33.76017"
+     x="3.119915"
+     y="3.119915" />
+  <path
+     d="m 20.677967,8.54499 c -7.342801,0 -13.295293,4.954293 -13.295293,11.065751 0,2.088793 0.3647173,3.484376 1.575539,5.150563 L 6.0267418,31.45501 13.560595,29.011117 c 2.221262,1.387962 4.125932,1.665377 7.117372,1.665377 7.3428,0 13.295291,-4.954295 13.295291,-11.065753 0,-6.111458 -5.952491,-11.065751 -13.295291,-11.065751 z"
+     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93031836;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+</svg>
diff --git a/common/static/css/vendor/pdfjs/images/annotation-help.svg b/common/static/css/vendor/pdfjs/images/annotation-help.svg
new file mode 100644
index 0000000000..349112ef36
--- /dev/null
+++ b/common/static/css/vendor/pdfjs/images/annotation-help.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="40"
+   height="40">
+  <g
+     transform="translate(0,-60)"
+     id="layer1">
+    <rect
+       width="36.460953"
+       height="34.805603"
+       x="1.7695236"
+       y="62.597198"
+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.30826771;stroke-opacity:1" />
+    <g
+       transform="matrix(0.88763677,0,0,0.88763677,2.2472646,8.9890584)">
+      <path
+         d="M 20,64.526342 C 11.454135,64.526342 4.5263421,71.454135 4.5263421,80 4.5263421,88.545865 11.454135,95.473658 20,95.473658 28.545865,95.473658 35.473658,88.545865 35.473658,80 35.473658,71.454135 28.545865,64.526342 20,64.526342 z m -0.408738,9.488564 c 3.527079,0 6.393832,2.84061 6.393832,6.335441 0,3.494831 -2.866753,6.335441 -6.393832,6.335441 -3.527079,0 -6.393832,-2.84061 -6.393832,-6.335441 0,-3.494831 2.866753,-6.335441 6.393832,-6.335441 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.02768445;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 7.2335209,71.819938 4.9702591,4.161823 c -1.679956,2.581606 -1.443939,6.069592 0.159325,8.677725 l -5.1263071,3.424463 c 0.67516,1.231452 3.0166401,3.547686 4.2331971,4.194757 l 3.907728,-4.567277 c 2.541952,1.45975 5.730694,1.392161 8.438683,-0.12614 l 3.469517,6.108336 c 1.129779,-0.44367 4.742234,-3.449633 5.416358,-5.003859 l -5.46204,-4.415541 c 1.44319,-2.424098 1.651175,-5.267515 0.557303,-7.748623 l 5.903195,-3.833951 C 33.14257,71.704996 30.616217,69.018606 29.02952,67.99296 l -4.118813,4.981678 C 22.411934,71.205099 18.900853,70.937534 16.041319,72.32916 l -3.595408,-5.322091 c -1.345962,0.579488 -4.1293881,2.921233 -5.2123901,4.812869 z m 8.1010311,3.426672 c 2.75284,-2.446266 6.769149,-2.144694 9.048998,0.420874 2.279848,2.56557 2.113919,6.596919 -0.638924,9.043185 -2.752841,2.446267 -6.775754,2.13726 -9.055604,-0.428308 -2.279851,-2.565568 -2.107313,-6.589485 0.64553,-9.035751 z"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/common/static/css/vendor/pdfjs/images/annotation-insert.svg b/common/static/css/vendor/pdfjs/images/annotation-insert.svg
new file mode 100644
index 0000000000..60fbf954cd
--- /dev/null
+++ b/common/static/css/vendor/pdfjs/images/annotation-insert.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="64"
+   height="64">
+  <path
+     d="M 32.003143,1.4044602 57.432701,62.632577 6.5672991,62.627924 z"
+     style="fill:#ffff00;fill-opacity:0.94117647;fill-rule:nonzero;stroke:#000000;stroke-width:1.00493038;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
diff --git a/common/static/css/vendor/pdfjs/images/annotation-key.svg b/common/static/css/vendor/pdfjs/images/annotation-key.svg
new file mode 100644
index 0000000000..c0bbb09c56
--- /dev/null
+++ b/common/static/css/vendor/pdfjs/images/annotation-key.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="64"
+   height="64">
+  <path
+     d="M 25.470843,9.4933766 C 25.30219,12.141818 30.139101,14.445969 34.704831,13.529144 40.62635,12.541995 41.398833,7.3856498 35.97505,5.777863 31.400921,4.1549155 25.157674,6.5445892 25.470843,9.4933766 z M 4.5246282,17.652051 C 4.068249,11.832873 9.2742983,5.9270407 18.437379,3.0977088 29.751911,-0.87185184 45.495663,1.4008022 53.603953,7.1104009 c 9.275765,6.1889221 7.158128,16.2079421 -3.171076,21.5939521 -1.784316,1.635815 -6.380222,1.21421 -7.068351,3.186186 -1.04003,0.972427 -1.288046,2.050158 -1.232864,3.168203 1.015111,2.000108 -3.831548,1.633216 -3.270553,3.759574 0.589477,5.264544 -0.179276,10.53738 -0.362842,15.806257 -0.492006,2.184998 1.163456,4.574232 -0.734888,6.610642 -2.482919,2.325184 -7.30604,2.189143 -9.193497,-0.274767 -2.733688,-1.740626 -8.254447,-3.615254 -6.104247,-6.339626 3.468112,-1.708686 -2.116197,-3.449897 0.431242,-5.080274 5.058402,-1.39256 -2.393215,-2.304318 -0.146889,-4.334645 3.069198,-0.977415 2.056986,-2.518352 -0.219121,-3.540397 1.876567,-1.807151 1.484149,-4.868919 -2.565455,-5.942205 0.150866,-1.805474 2.905737,-4.136876 -1.679967,-5.20493 C 10.260902,27.882167 4.6872697,22.95045 4.5245945,17.652051 z"
+     id="path604"
+     style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:1.72665179;stroke-opacity:1" />
+</svg>
diff --git a/common/static/css/vendor/pdfjs/images/annotation-newparagraph.svg b/common/static/css/vendor/pdfjs/images/annotation-newparagraph.svg
new file mode 100644
index 0000000000..6c179fd3f1
--- /dev/null
+++ b/common/static/css/vendor/pdfjs/images/annotation-newparagraph.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="64"
+   height="64">
+  <path
+     d="M 32.003143,10.913072 57.432701,53.086929 6.567299,53.083723 z"
+     id="path2985"
+     style="fill:#ffff00;fill-opacity:0.94117647;fill-rule:nonzero;stroke:#000000;stroke-width:0.83403099;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
diff --git a/common/static/css/vendor/pdfjs/images/annotation-note.svg b/common/static/css/vendor/pdfjs/images/annotation-note.svg
new file mode 100644
index 0000000000..ed169439b6
--- /dev/null
+++ b/common/static/css/vendor/pdfjs/images/annotation-note.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="40"
+   height="40">
+  <rect
+     width="36.075428"
+     height="31.096582"
+     x="1.962286"
+     y="4.4517088"
+     id="rect4"
+     style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.23004246;stroke-opacity:1" />
+  <rect
+     width="27.96859"
+     height="1.5012145"
+     x="6.0157046"
+     y="10.285"
+     id="rect6"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+  <rect
+     width="27.96859"
+     height="0.85783684"
+     x="6.0157056"
+     y="23.21689"
+     id="rect8"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+  <rect
+     width="27.96859"
+     height="0.85783684"
+     x="5.8130345"
+     y="28.964394"
+     id="rect10"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+  <rect
+     width="27.96859"
+     height="0.85783684"
+     x="6.0157046"
+     y="17.426493"
+     id="rect12"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/common/static/css/vendor/pdfjs/images/annotation-paragraph.svg b/common/static/css/vendor/pdfjs/images/annotation-paragraph.svg
new file mode 100644
index 0000000000..6fd90c19ff
--- /dev/null
+++ b/common/static/css/vendor/pdfjs/images/annotation-paragraph.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="40"
+   height="40">
+  <rect
+     width="33.76017"
+     height="33.76017"
+     x="3.119915"
+     y="3.119915"
+     style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 17.692678,34.50206 0,-16.182224 c -1.930515,-0.103225 -3.455824,-0.730383 -4.57593,-1.881473 -1.12011,-1.151067 -1.680164,-2.619596 -1.680164,-4.405591 0,-1.992435 0.621995,-3.5796849 1.865988,-4.7617553 1.243989,-1.1820288 3.06352,-1.7730536 5.458598,-1.7730764 l 9.802246,0 0,2.6789711 -2.229895,0 0,26.3251486 -2.632515,0 0,-26.3251486 -3.45324,0 0,26.3251486 z"
+     style="font-size:29.42051125px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.07795751;stroke-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" />
+</svg>
diff --git a/common/static/css/vendor/pdfjs/images/findbarButton-next-rtl.png b/common/static/css/vendor/pdfjs/images/findbarButton-next-rtl.png
new file mode 100644
index 0000000000..08a2c25327
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/findbarButton-next-rtl.png differ
diff --git a/common/static/css/vendor/pdfjs/images/findbarButton-next.png b/common/static/css/vendor/pdfjs/images/findbarButton-next.png
new file mode 100644
index 0000000000..beef8ccea4
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/findbarButton-next.png differ
diff --git a/common/static/css/vendor/pdfjs/images/findbarButton-previous-rtl.png b/common/static/css/vendor/pdfjs/images/findbarButton-previous-rtl.png
new file mode 100644
index 0000000000..beef8ccea4
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/findbarButton-previous-rtl.png differ
diff --git a/common/static/css/vendor/pdfjs/images/findbarButton-previous.png b/common/static/css/vendor/pdfjs/images/findbarButton-previous.png
new file mode 100644
index 0000000000..08a2c25327
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/findbarButton-previous.png differ
diff --git a/common/static/css/vendor/pdfjs/images/loading-icon.gif b/common/static/css/vendor/pdfjs/images/loading-icon.gif
new file mode 100644
index 0000000000..1c72ebb554
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/loading-icon.gif differ
diff --git a/common/static/css/vendor/pdfjs/images/loading-small.png b/common/static/css/vendor/pdfjs/images/loading-small.png
new file mode 100644
index 0000000000..1b2df8093d
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/loading-small.png differ
diff --git a/common/static/css/vendor/pdfjs/images/texture.png b/common/static/css/vendor/pdfjs/images/texture.png
new file mode 100644
index 0000000000..df00864932
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/texture.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-bookmark.png b/common/static/css/vendor/pdfjs/images/toolbarButton-bookmark.png
new file mode 100644
index 0000000000..1e5259a97a
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-bookmark.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-download.png b/common/static/css/vendor/pdfjs/images/toolbarButton-download.png
new file mode 100644
index 0000000000..8676d8e2c2
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-download.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-fullscreen.png b/common/static/css/vendor/pdfjs/images/toolbarButton-fullscreen.png
new file mode 100644
index 0000000000..fa73095505
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-fullscreen.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-menuArrows.png b/common/static/css/vendor/pdfjs/images/toolbarButton-menuArrows.png
new file mode 100644
index 0000000000..31b06b5af9
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-menuArrows.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-openFile.png b/common/static/css/vendor/pdfjs/images/toolbarButton-openFile.png
new file mode 100644
index 0000000000..fc7023f2aa
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-openFile.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-pageDown-rtl.png b/common/static/css/vendor/pdfjs/images/toolbarButton-pageDown-rtl.png
new file mode 100644
index 0000000000..c0051f8f04
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-pageDown-rtl.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-pageDown.png b/common/static/css/vendor/pdfjs/images/toolbarButton-pageDown.png
new file mode 100644
index 0000000000..762ac43e08
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-pageDown.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-pageUp-rtl.png b/common/static/css/vendor/pdfjs/images/toolbarButton-pageUp-rtl.png
new file mode 100644
index 0000000000..0d49d8e95e
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-pageUp-rtl.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-pageUp.png b/common/static/css/vendor/pdfjs/images/toolbarButton-pageUp.png
new file mode 100644
index 0000000000..3155b8bd23
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-pageUp.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-print.png b/common/static/css/vendor/pdfjs/images/toolbarButton-print.png
new file mode 100644
index 0000000000..fef84dd594
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-print.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-search.png b/common/static/css/vendor/pdfjs/images/toolbarButton-search.png
new file mode 100644
index 0000000000..604e652e5e
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-search.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-sidebarToggle.png b/common/static/css/vendor/pdfjs/images/toolbarButton-sidebarToggle.png
new file mode 100644
index 0000000000..5a937c712b
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-sidebarToggle.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-viewOutline.png b/common/static/css/vendor/pdfjs/images/toolbarButton-viewOutline.png
new file mode 100644
index 0000000000..cb3967b7f3
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-viewOutline.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-viewThumbnail.png b/common/static/css/vendor/pdfjs/images/toolbarButton-viewThumbnail.png
new file mode 100644
index 0000000000..3a27f04393
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-viewThumbnail.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-zoomIn.png b/common/static/css/vendor/pdfjs/images/toolbarButton-zoomIn.png
new file mode 100644
index 0000000000..670acd93f5
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-zoomIn.png differ
diff --git a/common/static/css/vendor/pdfjs/images/toolbarButton-zoomOut.png b/common/static/css/vendor/pdfjs/images/toolbarButton-zoomOut.png
new file mode 100644
index 0000000000..810fbf9895
Binary files /dev/null and b/common/static/css/vendor/pdfjs/images/toolbarButton-zoomOut.png differ
diff --git a/common/static/css/vendor/pdfjs/viewer.css b/common/static/css/vendor/pdfjs/viewer.css
new file mode 100644
index 0000000000..d0483a57a6
--- /dev/null
+++ b/common/static/css/vendor/pdfjs/viewer.css
@@ -0,0 +1,1431 @@
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+* {
+  padding: 0;
+  margin: 0;
+}
+
+html {
+  height: 100%;
+}
+
+body {
+  height: 100%;
+  background-color: #404040;
+  background-image: url(images/texture.png);
+}
+
+body,
+input,
+button,
+select {
+  font: message-box;
+}
+
+.hidden {
+  display: none;
+}
+[hidden] {
+  display: none !important;
+}
+
+#viewerContainer:-webkit-full-screen {
+  top: 0px;
+  border-top: 2px solid transparent;
+  background-color: #404040;
+  background-image: url(images/texture.png);
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  cursor: none;
+}
+
+#viewerContainer:-moz-full-screen {
+  top: 0px;
+  border-top: 2px solid transparent;
+  background-color: #404040;
+  background-image: url(images/texture.png);
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  cursor: none;
+}
+
+#viewerContainer:fullscreen {
+  top: 0px;
+  border-top: 2px solid transparent;
+  background-color: #404040;
+  background-image: url(images/texture.png);
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  cursor: none;
+}
+
+
+:-webkit-full-screen .page {
+  margin-bottom: 100%;
+}
+
+:-moz-full-screen .page {
+  margin-bottom: 100%;
+}
+
+:fullscreen .page {
+  margin-bottom: 100%;
+}
+
+#viewerContainer.presentationControls {
+  cursor: default;
+}
+
+/* outer/inner center provides horizontal center */
+html[dir='ltr'] .outerCenter {
+  float: right;
+  position: relative;
+  right: 50%;
+}
+html[dir='rtl'] .outerCenter {
+  float: left;
+  position: relative;
+  left: 50%;
+}
+html[dir='ltr'] .innerCenter {
+  float: right;
+  position: relative;
+  right: -50%;
+}
+html[dir='rtl'] .innerCenter {
+  float: left;
+  position: relative;
+  left: -50%;
+}
+
+#outerContainer {
+  width: 100%;
+  height: 100%;
+}
+
+#sidebarContainer {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  width: 200px;
+  visibility: hidden;
+  -webkit-transition-duration: 200ms;
+  -webkit-transition-timing-function: ease;
+  -moz-transition-duration: 200ms;
+  -moz-transition-timing-function: ease;
+  -ms-transition-duration: 200ms;
+  -ms-transition-timing-function: ease;
+  -o-transition-duration: 200ms;
+  -o-transition-timing-function: ease;
+  transition-duration: 200ms;
+  transition-timing-function: ease;
+
+}
+html[dir='ltr'] #sidebarContainer {
+  -webkit-transition-property: left;
+  -moz-transition-property: left;
+  -ms-transition-property: left;
+  -o-transition-property: left;
+  transition-property: left;
+  left: -200px;
+}
+html[dir='rtl'] #sidebarContainer {
+  -webkit-transition-property: right;
+  -ms-transition-property: right;
+  -o-transition-property: right;
+  transition-property: right;
+  right: -200px;
+}
+
+#outerContainer.sidebarMoving > #sidebarContainer,
+#outerContainer.sidebarOpen > #sidebarContainer {
+  visibility: visible;
+}
+html[dir='ltr'] #outerContainer.sidebarOpen > #sidebarContainer {
+  left: 0px;
+}
+html[dir='rtl'] #outerContainer.sidebarOpen > #sidebarContainer {
+  right: 0px;
+}
+
+#mainContainer {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  -webkit-transition-duration: 200ms;
+  -webkit-transition-timing-function: ease;
+  -moz-transition-duration: 200ms;
+  -moz-transition-timing-function: ease;
+  -ms-transition-duration: 200ms;
+  -ms-transition-timing-function: ease;
+  -o-transition-duration: 200ms;
+  -o-transition-timing-function: ease;
+  transition-duration: 200ms;
+  transition-timing-function: ease;
+}
+html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
+  -webkit-transition-property: left;
+  -moz-transition-property: left;
+  -ms-transition-property: left;
+  -o-transition-property: left;
+  transition-property: left;
+  left: 200px;
+}
+html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer {
+  -webkit-transition-property: right;
+  -moz-transition-property: right;
+  -ms-transition-property: right;
+  -o-transition-property: right;
+  transition-property: right;
+  right: 200px;
+}
+
+#sidebarContent {
+  top: 32px;
+  bottom: 0;
+  overflow: auto;
+  position: absolute;
+  width: 200px;
+
+  background-color: hsla(0,0%,0%,.1);
+  box-shadow: inset -1px 0 0 hsla(0,0%,0%,.25);
+}
+html[dir='ltr'] #sidebarContent {
+  left: 0;
+}
+html[dir='rtl'] #sidebarContent {
+  right: 0;
+}
+
+#viewerContainer {
+  overflow: auto;
+  box-shadow: inset 1px 0 0 hsla(0,0%,100%,.05);
+  position: absolute;
+  top: 32px;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
+.toolbar {
+  position: absolute;
+  left: 0;
+  right: 0;
+  height: 32px;
+  z-index: 9999;
+  cursor: default;
+}
+
+#toolbarContainer {
+  width: 100%;
+}
+
+#toolbarSidebar {
+  width: 200px;
+  height: 32px;
+  background-image: url(images/texture.png),
+                    -webkit-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
+  background-image: url(images/texture.png),
+                    -moz-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
+  background-image: url(images/texture.png),
+                    -ms-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
+  background-image: url(images/texture.png),
+                    -o-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
+  background-image: url(images/texture.png),
+                    linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
+  box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25),
+              
+              inset 0 -1px 0 hsla(0,0%,100%,.05),
+              0 1px 0 hsla(0,0%,0%,.15),
+              0 0 1px hsla(0,0%,0%,.1);
+}
+
+#toolbarViewer, .findbar {
+  position: relative;
+  height: 32px;
+  background-image: url(images/texture.png),
+                    -webkit-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+  background-image: url(images/texture.png),
+                    -moz-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+  background-image: url(images/texture.png),
+                    -ms-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+  background-image: url(images/texture.png),
+                    -o-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+  background-image: url(images/texture.png),
+                    linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+  box-shadow: inset 1px 0 0 hsla(0,0%,100%,.08),
+              inset 0 1px 1px hsla(0,0%,0%,.15),
+              inset 0 -1px 0 hsla(0,0%,100%,.05),
+              0 1px 0 hsla(0,0%,0%,.15),
+              0 1px 1px hsla(0,0%,0%,.1);
+}
+
+.findbar {
+  top: 32px;
+  position: absolute;
+  z-index: 10000;
+  height: 32px;
+
+  min-width: 16px;
+  padding: 0px 6px 0px 6px;
+  margin: 4px 2px 4px 2px;
+  color: hsl(0,0%,85%);
+  font-size: 12px;
+  line-height: 14px;
+  text-align: left;
+  cursor: default;
+}
+
+html[dir='ltr'] .findbar {
+  left: 68px;
+}
+
+html[dir='rtl'] .findbar {
+  right: 68px;
+}
+
+.findbar label {
+  -webkit-user-select:none;
+  -moz-user-select:none;
+}
+
+#findInput[data-status="pending"] {
+  background-image: url(images/loading-small.png);
+  background-repeat: no-repeat;
+  background-position: right;
+}
+
+.doorHanger {
+  border: 1px solid hsla(0,0%,0%,.5);
+  border-radius: 2px;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+}
+.doorHanger:after, .doorHanger:before {
+  bottom: 100%;
+  border: solid transparent;
+  content: " ";
+  height: 0;
+  width: 0;
+  position: absolute;
+  pointer-events: none;
+}
+.doorHanger:after {
+  border-bottom-color: hsla(0,0%,32%,.99);
+  border-width: 8px;
+}
+.doorHanger:before {
+  border-bottom-color: hsla(0,0%,0%,.5);
+  border-width: 9px;
+}
+
+html[dir='ltr'] .doorHanger:after {
+  left: 16px;
+  margin-left: -8px;
+}
+
+html[dir='ltr'] .doorHanger:before {
+  left: 16px;
+  margin-left: -9px;
+}
+
+html[dir='rtl'] .doorHanger:after {
+  right: 16px;
+  margin-right: -8px;
+}
+
+html[dir='rtl'] .doorHanger:before {
+  right: 16px;
+  margin-right: -9px;
+}
+
+#findMsg {
+  font-style: italic;
+  color: #A6B7D0;
+}
+
+.notFound {
+  background-color: rgb(255, 137, 153);
+}
+
+html[dir='ltr'] #toolbarViewerLeft {
+  margin-left: -1px;
+}
+html[dir='rtl'] #toolbarViewerRight {
+  margin-left: -1px;
+}
+
+
+html[dir='ltr'] #toolbarViewerLeft,
+html[dir='rtl'] #toolbarViewerRight {
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+html[dir='ltr'] #toolbarViewerRight,
+html[dir='rtl'] #toolbarViewerLeft {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+html[dir='ltr'] #toolbarViewerLeft > *,
+html[dir='ltr'] #toolbarViewerMiddle > *,
+html[dir='ltr'] #toolbarViewerRight > *,
+html[dir='ltr'] .findbar > * {
+  float: left;
+}
+html[dir='rtl'] #toolbarViewerLeft > *,
+html[dir='rtl'] #toolbarViewerMiddle > *,
+html[dir='rtl'] #toolbarViewerRight > *,
+html[dir='rtl'] .findbar > * {
+  float: right;
+}
+
+html[dir='ltr'] .splitToolbarButton {
+  margin: 3px 2px 4px 0;
+  display: inline-block;
+}
+html[dir='rtl'] .splitToolbarButton {
+  margin: 3px 0 4px 2px;
+  display: inline-block;
+}
+html[dir='ltr'] .splitToolbarButton > .toolbarButton {
+  border-radius: 0;
+  float: left;
+}
+html[dir='rtl'] .splitToolbarButton > .toolbarButton {
+  border-radius: 0;
+  float: right;
+}
+
+.toolbarButton {
+  border: 0 none;
+  background-color: rgba(0, 0, 0, 0);
+  width: 32px;
+  height: 25px;
+}
+
+.toolbarButton > span {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  overflow: hidden;
+}
+
+.toolbarButton[disabled] {
+  opacity: .5;
+}
+
+.toolbarButton.group {
+  margin-right:0;
+}
+
+.splitToolbarButton.toggled .toolbarButton {
+  margin: 0;
+}
+
+.splitToolbarButton:hover > .toolbarButton,
+.splitToolbarButton:focus > .toolbarButton,
+.splitToolbarButton.toggled > .toolbarButton,
+.toolbarButton.textButton {
+  background-color: hsla(0,0%,0%,.12);
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  border: 1px solid hsla(0,0%,0%,.35);
+  border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.15) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+  -webkit-transition-property: background-color, border-color, box-shadow;
+  -webkit-transition-duration: 150ms;
+  -webkit-transition-timing-function: ease;
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 150ms;
+  -moz-transition-timing-function: ease;
+  -ms-transition-property: background-color, border-color, box-shadow;
+  -ms-transition-duration: 150ms;
+  -ms-transition-timing-function: ease;
+  -o-transition-property: background-color, border-color, box-shadow;
+  -o-transition-duration: 150ms;
+  -o-transition-timing-function: ease;
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 150ms;
+  transition-timing-function: ease;
+
+}
+.splitToolbarButton > .toolbarButton:hover,
+.splitToolbarButton > .toolbarButton:focus,
+.dropdownToolbarButton:hover,
+.toolbarButton.textButton:hover,
+.toolbarButton.textButton:focus {
+  background-color: hsla(0,0%,0%,.2);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.15) inset,
+              0 0 1px hsla(0,0%,0%,.05);
+  z-index: 199;
+}
+html[dir='ltr'] .splitToolbarButton > .toolbarButton:first-child,
+html[dir='rtl'] .splitToolbarButton > .toolbarButton:last-child {
+  position: relative;
+  margin: 0;
+  margin-right: -1px;
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+  border-right-color: transparent;
+}
+html[dir='ltr'] .splitToolbarButton > .toolbarButton:last-child,
+html[dir='rtl'] .splitToolbarButton > .toolbarButton:first-child {
+  position: relative;
+  margin: 0;
+  margin-left: -1px;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-left-color: transparent;
+}
+.splitToolbarButtonSeparator {
+  padding: 8px 0;
+  width: 1px;
+  background-color: hsla(0,0%,00%,.5);
+  z-index: 99;
+  box-shadow: 0 0 0 1px hsla(0,0%,100%,.08);
+  display: inline-block;
+  margin: 5px 0;
+}
+html[dir='ltr'] .splitToolbarButtonSeparator {
+  float:left;
+}
+html[dir='rtl'] .splitToolbarButtonSeparator {
+  float:right;
+}
+.splitToolbarButton:hover > .splitToolbarButtonSeparator,
+.splitToolbarButton.toggled > .splitToolbarButtonSeparator {
+  padding: 12px 0;
+  margin: 1px 0;
+  box-shadow: 0 0 0 1px hsla(0,0%,100%,.03);
+  -webkit-transition-property: padding;
+  -webkit-transition-duration: 10ms;
+  -webkit-transition-timing-function: ease;
+  -moz-transition-property: padding;
+  -moz-transition-duration: 10ms;
+  -moz-transition-timing-function: ease;
+  -ms-transition-property: padding;
+  -ms-transition-duration: 10ms;
+  -ms-transition-timing-function: ease;
+  -o-transition-property: padding;
+  -o-transition-duration: 10ms;
+  -o-transition-timing-function: ease;
+  transition-property: padding;
+  transition-duration: 10ms;
+  transition-timing-function: ease;
+}
+
+.toolbarButton,
+.dropdownToolbarButton {
+  min-width: 16px;
+  padding: 2px 6px 0;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  color: hsl(0,0%,95%);
+  font-size: 12px;
+  line-height: 14px;
+  -webkit-user-select:none;
+  -moz-user-select:none;
+  -ms-user-select:none;
+  /* Opera does not support user-select, use <... unselectable="on"> instead */
+  cursor: default;
+  -webkit-transition-property: background-color, border-color, box-shadow;
+  -webkit-transition-duration: 150ms;
+  -webkit-transition-timing-function: ease;
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 150ms;
+  -moz-transition-timing-function: ease;
+  -ms-transition-property: background-color, border-color, box-shadow;
+  -ms-transition-duration: 150ms;
+  -ms-transition-timing-function: ease;
+  -o-transition-property: background-color, border-color, box-shadow;
+  -o-transition-duration: 150ms;
+  -o-transition-timing-function: ease;
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 150ms;
+  transition-timing-function: ease;
+}
+
+html[dir='ltr'] .toolbarButton,
+html[dir='ltr'] .dropdownToolbarButton {
+  margin: 3px 2px 4px 0;
+}
+html[dir='rtl'] .toolbarButton,
+html[dir='rtl'] .dropdownToolbarButton {
+  margin: 3px 0 4px 2px;
+}
+
+.toolbarButton:hover,
+.toolbarButton:focus,
+.dropdownToolbarButton {
+  background-color: hsla(0,0%,0%,.12);
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  border: 1px solid hsla(0,0%,0%,.35);
+  border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.15) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+}
+
+.toolbarButton:hover:active,
+.dropdownToolbarButton:hover:active {
+  background-color: hsla(0,0%,0%,.2);
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.4) hsla(0,0%,0%,.45);
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
+              0 0 1px hsla(0,0%,0%,.2) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+  -webkit-transition-property: background-color, border-color, box-shadow;
+  -webkit-transition-duration: 10ms;
+  -webkit-transition-timing-function: linear;
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 10ms;
+  -moz-transition-timing-function: linear;
+  -ms-transition-property: background-color, border-color, box-shadow;
+  -ms-transition-duration: 10ms;
+  -ms-transition-timing-function: linear;
+  -o-transition-property: background-color, border-color, box-shadow;
+  -o-transition-duration: 10ms;
+  -o-transition-timing-function: linear;
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 10ms;
+  transition-timing-function: linear;
+}
+
+.toolbarButton.toggled,
+.splitToolbarButton.toggled > .toolbarButton.toggled {
+  background-color: hsla(0,0%,0%,.3);
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.45) hsla(0,0%,0%,.5);
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
+              0 0 1px hsla(0,0%,0%,.2) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+  -webkit-transition-property: background-color, border-color, box-shadow;
+  -webkit-transition-duration: 10ms;
+  -webkit-transition-timing-function: linear;
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 10ms;
+  -moz-transition-timing-function: linear;
+  -ms-transition-property: background-color, border-color, box-shadow;
+  -ms-transition-duration: 10ms;
+  -ms-transition-timing-function: linear;
+  -o-transition-property: background-color, border-color, box-shadow;
+  -o-transition-duration: 10ms;
+  -o-transition-timing-function: linear;
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 10ms;
+  transition-timing-function: linear;
+}
+
+.toolbarButton.toggled:hover:active,
+.splitToolbarButton.toggled > .toolbarButton.toggled:hover:active {
+  background-color: hsla(0,0%,0%,.4);
+  border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.5) hsla(0,0%,0%,.55);
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.2) inset,
+              0 0 1px hsla(0,0%,0%,.3) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+}
+
+.dropdownToolbarButton {
+  max-width: 120px;
+  padding: 3px 2px 2px;
+  overflow: hidden;
+  background: url(images/toolbarButton-menuArrows.png) no-repeat;
+}
+html[dir='ltr'] .dropdownToolbarButton {
+  background-position: 95%;
+}
+html[dir='rtl'] .dropdownToolbarButton {
+  background-position: 5%;
+}
+
+.dropdownToolbarButton > select {
+  -webkit-appearance: none;
+  -moz-appearance: none; /* in the future this might matter, see bugzilla bug #649849 */
+  min-width: 140px;
+  font-size: 12px;
+  color: hsl(0,0%,95%);
+  margin:0;
+  padding:0;
+  border:none;
+  background: rgba(0,0,0,0); /* Opera does not support 'transparent' <select> background */
+}
+
+.dropdownToolbarButton > select > option {
+  background: hsl(0,0%,24%);
+}
+
+#customScaleOption {
+  display: none;
+}
+
+#pageWidthOption {
+  border-bottom: 1px rgba(255, 255, 255, .5) solid;
+}
+
+html[dir='ltr'] .splitToolbarButton:first-child,
+html[dir='ltr'] .toolbarButton:first-child,
+html[dir='rtl'] .splitToolbarButton:last-child,
+html[dir='rtl'] .toolbarButton:last-child {
+  margin-left: 4px;
+}
+html[dir='ltr'] .splitToolbarButton:last-child,
+html[dir='ltr'] .toolbarButton:last-child,
+html[dir='rtl'] .splitToolbarButton:first-child,
+html[dir='rtl'] .toolbarButton:first-child {
+  margin-right: 4px;
+}
+
+.toolbarButtonSpacer {
+  width: 30px;
+  display: inline-block;
+  height: 1px;
+}
+
+.toolbarButtonFlexibleSpacer {
+  -webkit-box-flex: 1;
+  -moz-box-flex: 1;
+  min-width: 30px;
+}
+
+.toolbarButton#sidebarToggle::before {
+  display: inline-block;
+  content: url(images/toolbarButton-sidebarToggle.png);
+}
+
+html[dir='ltr'] .toolbarButton.findPrevious::before {
+  display: inline-block;
+  content: url(images/findbarButton-previous.png);
+}
+
+html[dir='rtl'] .toolbarButton.findPrevious::before {
+  display: inline-block;
+  content: url(images/findbarButton-previous-rtl.png);
+}
+
+html[dir='ltr'] .toolbarButton.findNext::before {
+  display: inline-block;
+  content: url(images/findbarButton-next.png);
+}
+
+html[dir='rtl'] .toolbarButton.findNext::before {
+  display: inline-block;
+  content: url(images/findbarButton-next-rtl.png);
+}
+
+html[dir='ltr'] .toolbarButton.pageUp::before {
+  display: inline-block;
+  content: url(images/toolbarButton-pageUp.png);
+}
+
+html[dir='rtl'] .toolbarButton.pageUp::before {
+  display: inline-block;
+  content: url(images/toolbarButton-pageUp-rtl.png);
+}
+
+html[dir='ltr'] .toolbarButton.pageDown::before {
+  display: inline-block;
+  content: url(images/toolbarButton-pageDown.png);
+}
+
+html[dir='rtl'] .toolbarButton.pageDown::before {
+  display: inline-block;
+  content: url(images/toolbarButton-pageDown-rtl.png);
+}
+
+.toolbarButton.zoomOut::before {
+  display: inline-block;
+  content: url(images/toolbarButton-zoomOut.png);
+}
+
+.toolbarButton.zoomIn::before {
+  display: inline-block;
+  content: url(images/toolbarButton-zoomIn.png);
+}
+
+.toolbarButton.fullscreen::before {
+  display: inline-block;
+  content: url(images/toolbarButton-fullscreen.png);
+}
+
+.toolbarButton.print::before {
+  display: inline-block;
+  content: url(images/toolbarButton-print.png);
+}
+
+.toolbarButton.openFile::before {
+  display: inline-block;
+  content: url(images/toolbarButton-openFile.png);
+}
+
+.toolbarButton.download::before {
+  display: inline-block;
+  content: url(images/toolbarButton-download.png);
+}
+
+.toolbarButton.bookmark {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  margin-top: 3px;
+  padding-top: 4px;
+}
+
+.toolbarButton.bookmark::before {
+  content: url(images/toolbarButton-bookmark.png);
+}
+
+#viewThumbnail.toolbarButton::before {
+  display: inline-block;
+  content: url(images/toolbarButton-viewThumbnail.png);
+}
+
+#viewOutline.toolbarButton::before {
+  display: inline-block;
+  content: url(images/toolbarButton-viewOutline.png);
+}
+
+#viewFind.toolbarButton::before {
+  display: inline-block;
+  content: url(images/toolbarButton-search.png);
+}
+
+
+.toolbarField {
+  padding: 3px 6px;
+  margin: 4px 0 4px 0;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  background-color: hsla(0,0%,100%,.09);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  border: 1px solid hsla(0,0%,0%,.35);
+  border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
+  box-shadow: 0 1px 0 hsla(0,0%,0%,.05) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+  color: hsl(0,0%,95%);
+  font-size: 12px;
+  line-height: 14px;
+  outline-style: none;
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 150ms;
+  -moz-transition-timing-function: ease;
+}
+
+.toolbarField[type=checkbox] {
+  display: inline-block;
+  margin: 8px 0px;
+}
+
+.toolbarField.pageNumber {
+  min-width: 16px;
+  text-align: right;
+  width: 40px;
+}
+
+.toolbarField.pageNumber::-webkit-inner-spin-button,
+.toolbarField.pageNumber::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}
+
+.toolbarField:hover {
+  background-color: hsla(0,0%,100%,.11);
+  border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.43) hsla(0,0%,0%,.45);
+}
+
+.toolbarField:focus {
+  background-color: hsla(0,0%,100%,.15);
+  border-color: hsla(204,100%,65%,.8) hsla(204,100%,65%,.85) hsla(204,100%,65%,.9);
+}
+
+.toolbarLabel {
+  min-width: 16px;
+  padding: 3px 6px 3px 2px;
+  margin: 4px 2px 4px 0;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  color: hsl(0,0%,85%);
+  font-size: 12px;
+  line-height: 14px;
+  text-align: left;
+  -webkit-user-select:none;
+  -moz-user-select:none;
+  cursor: default;
+}
+
+#thumbnailView {
+  position: absolute;
+  width: 120px;
+  top: 0;
+  bottom: 0;
+  padding: 10px 40px 0;
+  overflow: auto;
+}
+
+.thumbnail {
+  margin-bottom: 15px;
+  float: left;
+}
+
+.thumbnail:not([data-loaded]) {
+  border: 1px dashed rgba(255, 255, 255, 0.5);
+}
+
+.thumbnailImage {
+  -moz-transition-duration: 150ms;
+  border: 1px solid transparent;
+  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.5), 0 2px 8px rgba(0, 0, 0, 0.3);
+  opacity: 0.8;
+  z-index: 99;
+}
+
+.thumbnailSelectionRing {
+  border-radius: 2px;
+  padding: 7px;
+  -moz-transition-duration: 150ms;
+}
+
+a:focus > .thumbnail > .thumbnailSelectionRing > .thumbnailImage,
+.thumbnail:hover > .thumbnailSelectionRing > .thumbnailImage {
+  opacity: .9;
+}
+
+a:focus > .thumbnail > .thumbnailSelectionRing,
+.thumbnail:hover > .thumbnailSelectionRing {
+  background-color: hsla(0,0%,100%,.15);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.2) inset,
+              0 0 1px hsla(0,0%,0%,.2);
+  color: hsla(0,0%,100%,.9);
+}
+
+.thumbnail.selected > .thumbnailSelectionRing > .thumbnailImage {
+  box-shadow: 0 0 0 1px hsla(0,0%,0%,.5);
+  opacity: 1;
+}
+
+.thumbnail.selected > .thumbnailSelectionRing {
+  background-color: hsla(0,0%,100%,.3);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.1) inset,
+              0 0 1px hsla(0,0%,0%,.2);
+  color: hsla(0,0%,100%,1);
+}
+
+#outlineView {
+  position: absolute;
+  width: 192px;
+  top: 0;
+  bottom: 0;
+  padding: 4px 4px 0;
+  overflow: auto;
+  -webkit-user-select:none;
+  -moz-user-select:none;
+}
+
+html[dir='ltr'] .outlineItem > .outlineItems {
+  margin-left: 20px;
+}
+
+html[dir='rtl'] .outlineItem > .outlineItems {
+  margin-right: 20px;
+}
+
+.outlineItem > a {
+  text-decoration: none;
+  display: inline-block;
+  min-width: 95%;
+  height: auto;
+  margin-bottom: 1px;
+  border-radius: 2px;
+  color: hsla(0,0%,100%,.8);
+  font-size: 13px;
+  line-height: 15px;
+  -moz-user-select:none;
+  cursor: default;
+  white-space: normal;
+}
+
+html[dir='ltr'] .outlineItem > a {
+  padding: 2px 0 5px 10px;
+}
+
+html[dir='rtl'] .outlineItem > a {
+  padding: 2px 10px 5px 0;
+}
+
+.outlineItem > a:hover {
+  background-color: hsla(0,0%,100%,.02);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.2) inset,
+              0 0 1px hsla(0,0%,0%,.2);
+  color: hsla(0,0%,100%,.9);
+}
+
+.outlineItem.selected {
+  background-color: hsla(0,0%,100%,.08);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.1) inset,
+              0 0 1px hsla(0,0%,0%,.2);
+  color: hsla(0,0%,100%,1);
+}
+
+.noOutline,
+.noResults {
+  font-size: 12px;
+  color: hsla(0,0%,100%,.8);
+  font-style: italic;
+}
+
+#findScrollView {
+  position: absolute;
+  top: 10px;
+  bottom: 10px;
+  left: 10px;
+  width: 280px;
+}
+
+#sidebarControls {
+  position:absolute;
+  width: 180px;
+  height: 32px;
+  left: 15px;
+  bottom: 35px;
+}
+
+canvas {
+  margin: auto;
+  display: block;
+}
+
+.page {
+  direction: ltr;
+  width: 816px;
+  height: 1056px;
+  margin: 10px auto;
+  position: relative;
+  overflow: visible;
+  -webkit-box-shadow: 0px 4px 10px #000;
+  -moz-box-shadow: 0px 4px 10px #000;
+  box-shadow: 0px 4px 10px #000;
+  background-color: white;
+}
+
+.page > a {
+  display: block;
+  position: absolute;
+}
+
+.page > a:hover {
+  opacity: 0.2;
+  background: #ff0;
+  -webkit-box-shadow: 0px 2px 10px #ff0;
+  -moz-box-shadow: 0px 2px 10px #ff0;
+  box-shadow: 0px 2px 10px #ff0;
+}
+
+.loadingIcon {
+  position: absolute;
+  display: block;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  background: url('images/loading-icon.gif') center no-repeat;
+}
+
+#loadingBox {
+  position: absolute;
+  top: 50%;
+  margin-top: -25px;
+  left: 0;
+  right: 0;
+  text-align: center;
+  color: #ddd;
+  font-size: 14px;
+}
+
+#loadingBar {
+  display: inline-block;
+  clear: both;
+  margin: 0px;
+  margin-top: 5px;
+  line-height: 0;
+  border-radius: 2px;
+  width: 200px;
+  height: 25px;
+
+  background-color: hsla(0,0%,0%,.3);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  border: 1px solid #000;
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
+              0 0 1px hsla(0,0%,0%,.2) inset,
+              0 0 1px 1px rgba(255, 255, 255, 0.1);
+}
+
+#loadingBar .progress {
+  display: inline-block;
+  float: left;
+
+  background: #666;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b2b2b2), color-stop(100%,#898989));
+  background: -webkit-linear-gradient(top, #b2b2b2 0%,#898989 100%);
+  background: -moz-linear-gradient(top, #b2b2b2 0%,#898989 100%);
+  background: -ms-linear-gradient(top, #b2b2b2 0%,#898989 100%);
+  background: -o-linear-gradient(top, #b2b2b2 0%,#898989 100%);
+  background: linear-gradient(top, #b2b2b2 0%,#898989 100%);
+
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+
+  width: 0%;
+  height: 100%;
+}
+
+#loadingBar .progress.full {
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+
+#loadingBar .progress.indeterminate {
+  width: 100%;
+  height: 25px;
+  background-image: -moz-linear-gradient( 30deg, #404040, #404040 15%, #898989, #404040 85%, #404040);
+  background-image: -webkit-linear-gradient( 30deg, #404040, #404040 15%, #898989, #404040 85%, #404040);
+  background-image: -ms-linear-gradient( 30deg, #404040, #404040 15%, #898989, #404040 85%, #404040);
+  background-image: -o-linear-gradient( 30deg, #404040, #404040 15%, #898989, #404040 85%, #404040);
+  background-size: 75px 25px;
+  -moz-animation: progressIndeterminate 1s linear infinite;
+  -webkit-animation: progressIndeterminate 1s linear infinite;
+}
+
+@-moz-keyframes progressIndeterminate {
+  from { background-position: 0px 0px; }
+  to { background-position: 75px 0px; }
+}
+
+@-webkit-keyframes progressIndeterminate {
+  from { background-position: 0px 0px; }
+  to { background-position: 75px 0px; }
+}
+
+.textLayer {
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  color: #000;
+  font-family: sans-serif;
+  overflow: hidden;
+}
+
+.textLayer > div {
+  color: transparent;
+  position: absolute;
+  line-height:1.3;
+  white-space:pre;
+}
+
+.textLayer .highlight {
+  margin: -1px;
+  padding: 1px;
+
+  background-color: rgba(180, 0, 170, 0.2);
+  border-radius: 4px;
+}
+
+.textLayer .highlight.begin {
+  border-radius: 4px 0px 0px 4px;
+}
+
+.textLayer .highlight.end {
+  border-radius: 0px 4px 4px 0px;
+}
+
+.textLayer .highlight.middle {
+  border-radius: 0px;
+}
+
+.textLayer .highlight.selected {
+  background-color: rgba(0, 100, 0, 0.2);
+}
+
+/* TODO: file FF bug to support ::-moz-selection:window-inactive
+   so we can override the opaque grey background when the window is inactive;
+   see https://bugzilla.mozilla.org/show_bug.cgi?id=706209 */
+::selection { background:rgba(0,0,255,0.3); }
+::-moz-selection { background:rgba(0,0,255,0.3); }
+
+.annotText > div {
+  z-index: 200;
+  position: absolute;
+  padding: 0.6em;
+  max-width: 20em;
+  background-color: #FFFF99;
+  -webkit-box-shadow: 0px 2px 10px #333;
+  -moz-box-shadow: 0px 2px 10px #333;
+  box-shadow: 0px 2px 10px #333;
+  border-radius: 7px;
+  -moz-border-radius: 7px;
+}
+
+.annotText > img {
+  position: absolute;
+  opacity: 0.6;
+}
+
+.annotText > img:hover {
+  cursor: pointer;
+  opacity: 1;
+}
+
+.annotText > div > h1 {
+  font-size: 1.2em;
+  border-bottom: 1px solid #000000;
+  margin: 0px;
+}
+
+#errorWrapper {
+  background: none repeat scroll 0 0 #FF5555;
+  color: white;
+  left: 0;
+  position: absolute;
+  right: 0;
+  top: 32px;
+  z-index: 1000;
+  padding: 3px;
+  font-size: 0.8em;
+}
+
+#errorMessageLeft {
+  float: left;
+}
+
+#errorMessageRight {
+  float: right;
+}
+
+#errorMoreInfo {
+  background-color: #FFFFFF;
+  color: black;
+  padding: 3px;
+  margin: 3px;
+  width: 98%;
+}
+
+.clearBoth {
+  clear: both;
+}
+
+.fileInput {
+  background: white;
+  color: black;
+  margin-top: 5px;
+}
+
+#PDFBug {
+  background: none repeat scroll 0 0 white;
+  border: 1px solid #666666;
+  position: fixed;
+  top: 32px;
+  right: 0;
+  bottom: 0;
+  font-size: 10px;
+  padding: 0;
+  width: 300px;
+}
+#PDFBug .controls {
+    background:#EEEEEE;
+    border-bottom: 1px solid #666666;
+    padding: 3px;
+}
+#PDFBug .panels {
+  bottom: 0;
+  left: 0;
+  overflow: auto;
+  position: absolute;
+  right: 0;
+  top: 27px;
+}
+#PDFBug button.active {
+  font-weight: bold;
+}
+.debuggerShowText {
+  background: none repeat scroll 0 0 yellow;
+  color: blue;
+  opacity: 0.3;
+}
+.debuggerHideText:hover {
+  background: none repeat scroll 0 0 yellow;
+  opacity: 0.3;
+}
+#PDFBug .stats {
+  font-family: courier;
+  font-size: 10px;
+  white-space: pre;
+}
+#PDFBug .stats .title {
+    font-weight: bold;
+}
+#PDFBug table {
+  font-size: 10px;
+}
+
+#viewer.textLayer-visible .textLayer > div,
+#viewer.textLayer-hover .textLayer > div:hover {
+  background-color: white;
+  color: black;
+}
+
+#viewer.textLayer-shadow .textLayer > div {
+  background-color: rgba(255,255,255, .6);
+  color: black;
+}
+
+@page {
+  margin: 0;
+}
+
+#printContainer {
+  display: none;
+}
+
+@media print {
+  /* Rules for browsers that don't support mozPrintCallback. */
+  #sidebarContainer, .toolbar, #loadingBox, #errorWrapper, .textLayer {
+    display: none;
+  }
+
+  #mainContainer, #viewerContainer, .page, .page canvas {
+    position: static;
+    padding: 0;
+    margin: 0;
+  }
+
+  .page {
+    float: left;
+    display: none;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+  }
+
+  .page[data-loaded] {
+    display: block;
+  }
+
+  /* Rules for browsers that support mozPrintCallback */
+  body[data-mozPrintCallback] #outerContainer {
+    display: none;
+  }
+  body[data-mozPrintCallback] #printContainer {
+    display: block;
+  }
+  #printContainer canvas {
+    position: relative;
+    top: 0;
+    left: 0;
+  }
+}
+
+@media all and (max-width: 950px) {
+  html[dir='ltr'] #outerContainer.sidebarMoving .outerCenter,
+  html[dir='ltr'] #outerContainer.sidebarOpen .outerCenter {
+    float: left;
+    left: 180px;
+  }
+  html[dir='rtl'] #outerContainer.sidebarMoving .outerCenter,
+  html[dir='rtl'] #outerContainer.sidebarOpen .outerCenter {
+    float: right;
+    right: 180px;
+  }
+}
+
+@media all and (max-width: 770px) {
+  #sidebarContainer {
+    top: 33px;
+    z-index: 100;
+  }
+  #sidebarContent {
+    top: 32px;
+    background-color: hsla(0,0%,0%,.7);
+  }
+
+  html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
+    left: 0px;
+  }
+  html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer {
+    right: 0px;
+  }
+
+  html[dir='ltr'] .outerCenter {
+    float: left;
+    left: 180px;
+  }
+  html[dir='rtl'] .outerCenter {
+    float: right;
+    right: 180px;
+  }
+}
+
+@media all and (max-width: 600px) {
+  #toolbarViewerRight, #findbar, #viewFind {
+    display: none;
+  }
+}
+
+@media all and (max-width: 500px) {
+  #scaleSelectContainer, #pageNumberLabel {
+    display: none;
+  }
+}
+
diff --git a/common/static/js/course_groups/cohorts.js b/common/static/js/course_groups/cohorts.js
index 97837c6bac..2c9904ef40 100644
--- a/common/static/js/course_groups/cohorts.js
+++ b/common/static/js/course_groups/cohorts.js
@@ -144,6 +144,7 @@ var CohortManager = (function ($) {
             $(".remove", tr).html('<a href="#">remove</a>')
                 .click(function() { 
                     remove_user_from_cohort(item.username, current_cohort_id, tr);
+                    return false;
                 });
             
             detail_users.append(tr);
@@ -217,6 +218,7 @@ var CohortManager = (function ($) {
         show_cohorts_button.click(function() { 
             state = state_summary;
             render();
+            return false;
         });
         
         add_cohort_input.change(function() {
@@ -231,12 +233,14 @@ var CohortManager = (function ($) {
             var add_url = url + '/add';
             data = {'name': add_cohort_input.val()}
             $.post(add_url, data).done(added_cohort);
+            return false;
         });
 
         add_members_button.click(function() { 
             var add_url = detail_url + '/add';
             data = {'users': users_area.val()}
             $.post(add_url, data).done(added_users);
+            return false;
         });
 
 
diff --git a/common/static/js/pdfviewer.js b/common/static/js/pdfviewer.js
new file mode 100644
index 0000000000..c81709fa0f
--- /dev/null
+++ b/common/static/js/pdfviewer.js
@@ -0,0 +1,367 @@
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * Modified (and JQuerified) from PDF-JS sample code (viewer.js) 
+ */
+/* globals: PDFJS as defined in pdf.js.  Also assumes that jquery is included. */
+
+//
+// Disable workers to avoid yet another cross-origin issue (workers need the URL of
+// the script to be loaded, and currently do not allow cross-origin scripts)
+//
+PDFJS.disableWorker = true;
+
+(function($) {
+    $.fn.PDFViewer = function(options) {
+        var pdfViewer = this;
+
+        var pdfDocument = null;
+        var urlToLoad = null;
+        if (options.url) {
+            urlToLoad = options.url;
+        }
+        var chapterUrls = null;
+        if (options.chapters) {
+            chapterUrls = options.chapters;
+        }
+        var chapterToLoad = 1;
+        if (options.chapterNum) {
+            // TODO: this should only be specified if there are 
+            // chapters, and it should be in-bounds.
+            chapterToLoad = options.chapterNum;
+        }
+        var pageToLoad = 1;
+        if (options.pageNum) {
+            pageToLoad = options.pageNum;
+        }
+
+        var chapterNum = 1;
+        var pageNum = 1;
+
+        var viewerElement = document.getElementById('viewer');
+        var ANNOT_MIN_SIZE = 10;
+        var DEFAULT_SCALE_DELTA = 1.1;
+        var UNKNOWN_SCALE = 0;
+        var MIN_SCALE = 0.25;
+        var MAX_SCALE = 4.0;
+
+        var currentScale = UNKNOWN_SCALE;
+        var currentScaleValue = "0";
+        var DEFAULT_SCALE_VALUE = "1";
+
+        var setupText = function setupText(textdiv, content, viewport) {
+
+            function getPageNumberFromDest(dest) {
+                var destPage = 1;
+                if (dest instanceof Array) {
+                    var destRef = dest[0]; 
+                    if (destRef instanceof Object) {
+                        // we would need to look this up in the 
+                        // list of all pages that have been loaded,
+                        // but we're trying to not have to load all the pages
+                        // right now.  
+                        // destPage = this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'];
+                    } else {
+                        destPage = (destRef + 1);
+                    }
+                }
+                return destPage;
+            }
+
+            function bindLink(link, dest) {
+                // get page number from dest:
+                destPage = getPageNumberFromDest(dest);
+                link.href = '#page=' + destPage;
+                link.onclick = function pageViewSetupLinksOnclick() {
+                    if (dest && dest instanceof Array )
+                        renderPage(destPage);
+                    return false;
+                };
+            }
+
+            function createElementWithStyle(tagName, item, rect) {
+                if (!rect) {
+                    rect = viewport.convertToViewportRectangle(item.rect);
+                    rect = PDFJS.Util.normalizeRect(rect);
+                }
+                var element = document.createElement(tagName);
+                element.style.left = Math.floor(rect[0]) + 'px';
+                element.style.top = Math.floor(rect[1]) + 'px';
+                element.style.width = Math.ceil(rect[2] - rect[0]) + 'px';
+                element.style.height = Math.ceil(rect[3] - rect[1]) + 'px';
+                // BW: my additions here, but should use css:
+                // TODO: move these to css
+                element.style.position = 'absolute';
+                element.style.cursor = 'auto';
+
+                return element;
+            }
+
+            function createTextAnnotation(item) {
+                var container = document.createElement('section');
+                container.className = 'annotText';
+                var rect = viewport.convertToViewportRectangle(item.rect);
+                rect = PDFJS.Util.normalizeRect(rect);
+                // sanity check because of OOo-generated PDFs
+                if ((rect[3] - rect[1]) < ANNOT_MIN_SIZE) {
+                    rect[3] = rect[1] + ANNOT_MIN_SIZE;
+                }
+                if ((rect[2] - rect[0]) < ANNOT_MIN_SIZE) {
+                    rect[2] = rect[0] + (rect[3] - rect[1]);
+                    // make it square
+                }
+                var image = createElementWithStyle('img', item, rect);
+                var iconName = item.name;
+            }
+
+
+            content.getAnnotations().then(function(items) {
+                for (var i = 0; i < items.length; i++) {
+                    var item = items[i];
+                    switch (item.type) {
+                        case 'Link':
+                            var link = createElementWithStyle('a', item);
+                            link.href = item.url || '';
+                            if (!item.url)
+                                bindLink(link, ('dest' in item) ? item.dest : null);
+                            textdiv.appendChild(link);
+                            break;
+                        case 'Text':
+                            var textAnnotation = createTextAnnotation(item);
+                            if (textAnnotation)
+                                textdiv.appendChild(textAnnotation);
+                            break;
+                    }
+                }
+            });
+        }
+
+        //
+        // Get page info from document, resize canvas accordingly, and render page
+        //
+        renderPage = function(num) {
+            // don't try to render a page that cannot be rendered
+            if (num < 1 || num > pdfDocument.numPages) {
+                return;
+            }
+
+            // Update logging:
+            log_event("book", { "type" : "gotopage", "old" : pageNum, "new" : num });
+
+            parentElement = viewerElement;
+            while (parentElement.hasChildNodes())
+                parentElement.removeChild(parentElement.lastChild);
+
+            // Using promise to fetch the page
+            pdfDocument.getPage(num).then(function(page) {
+                var viewport = page.getViewport(currentScale);
+
+                var pageDisplayWidth = viewport.width;
+                var pageDisplayHeight = viewport.height;
+
+                var pageDivHolder = document.createElement('div');
+                pageDivHolder.className = 'pdfpage';
+                pageDivHolder.style.width = pageDisplayWidth + 'px';
+                pageDivHolder.style.height = pageDisplayHeight + 'px';
+                parentElement.appendChild(pageDivHolder);
+
+                // Prepare canvas using PDF page dimensions
+                var canvas = document.createElement('canvas');
+                var context = canvas.getContext('2d');
+                canvas.width = pageDisplayWidth;
+                canvas.height = pageDisplayHeight;
+                pageDivHolder.appendChild(canvas);
+
+                // Render PDF page into canvas context
+                var renderContext = {
+                    canvasContext : context,
+                    viewport : viewport
+                };
+                page.render(renderContext);
+
+                // Prepare and populate text elements layer
+                setupText(pageDivHolder, page, viewport);
+
+            });
+            pageNum = num;
+
+            // Update page counters
+            document.getElementById('numPages').textContent = 'of ' + pdfDocument.numPages;
+            $("#pageNumber").max = pdfDocument.numPages;
+            $("#pageNumber").val(pageNum);
+        }
+
+        // Go to previous page
+        prevPage = function prev_page() {
+            if (pageNum <= 1)
+                return;
+            renderPage(pageNum - 1);
+            log_event("book", { "type" : "prevpage", "new" : pageNum });
+        }
+
+        // Go to next page
+        nextPage = function next_page() {
+            if (pageNum >= pdfDocument.numPages)
+                return;
+            renderPage(pageNum + 1);
+            log_event("book", { "type" : "nextpage", "new" : pageNum });
+        }
+
+        selectScaleOption = function(value) {
+            var options = $('#scaleSelect options');
+            var predefinedValueFound = false;
+            for (var i = 0; i < options.length; i++) {
+                var option = options[i];
+                if (option.value != value) {
+                    option.selected = false;
+                    continue;
+                }
+                option.selected = true;
+                predefinedValueFound = true;
+            }
+            return predefinedValueFound;
+        }
+
+        setScale = function pdfViewSetScale(val, resetAutoSettings, noScroll) {
+            if (val == currentScale)
+                return;
+            currentScale = val;
+            var customScaleOption = $('#customScaleOption')[0];
+            customScaleOption.selected = false
+            var predefinedValueFound = selectScaleOption('' + currentScale);
+            if (!predefinedValueFound) {
+                customScaleOption.textContent = Math.round(currentScale * 10000) / 100 + '%';
+                customScaleOption.selected = true;
+            }
+            $('#zoom_in').disabled = (currentScale === MAX_SCALE);
+            $('#zoom_out').disabled = (currentScale === MIN_SCALE);
+
+            // Just call renderPage once the scale
+            // has been changed.  If we were saving information about
+            // the rendering of other pages, we would need
+            // to reset those as well.
+            renderPage(pageNum);
+        };
+
+        parseScale = function pdfViewParseScale(value, resetAutoSettings, noScroll) {
+            // we shouldn't be choosing the 'custom' value -- it's only for display.  
+            // Check, just in case.
+            if ('custom' == value)
+                return;
+
+            var scale = parseFloat(value);
+            if (scale) {
+                currentScaleValue = value;
+                setScale(scale, true, noScroll);
+                return;
+            }
+        };
+
+        zoomIn = function pdfViewZoomIn() {
+            var newScale = (currentScale * DEFAULT_SCALE_DELTA).toFixed(2);
+            newScale = Math.min(MAX_SCALE, newScale);
+            parseScale(newScale, true);
+        };
+
+        zoomOut = function pdfViewZoomOut() {
+            var newScale = (currentScale / DEFAULT_SCALE_DELTA).toFixed(2);
+            newScale = Math.max(MIN_SCALE, newScale);
+            parseScale(newScale, true);
+        };
+
+        //
+        // Asynchronously download PDF as an ArrayBuffer
+        //
+        loadUrl = function pdfViewLoadUrl(url, page) {
+            PDFJS.getDocument(url).then(
+                function getDocument(_pdfDocument) {
+                    pdfDocument = _pdfDocument;
+                    pageNum = page;
+                    // if the scale has not been set before, set it now.
+                    // Otherwise, don't change the current scale,
+                    // but make sure it gets refreshed.
+                    if (currentScale == UNKNOWN_SCALE) {
+                        parseScale(DEFAULT_SCALE_VALUE);
+                    } else {
+                        var preservedScale = currentScale;
+                        currentScale = UNKNOWN_SCALE;
+                        parseScale(preservedScale);
+                    }
+                }, 
+                function getDocumentError(message, exception) {
+                    // placeholder: don't expect errors :)
+                }, 
+                function getDocumentProgress(progressData) {
+                    // placeholder: not yet ready to display loading progress
+                });
+            }; 
+
+        loadChapterUrl = function pdfViewLoadChapterUrl(chapterNum, pageVal) {
+            if (chapterNum < 1 || chapterNum > chapterUrls.length) {
+                return;
+            }
+            var chapterUrl = chapterUrls[chapterNum-1];
+            loadUrl(chapterUrl, pageVal);
+        }
+
+        $("#previous").click(function(event) {
+            prevPage();
+        });
+
+        $("#next").click(function(event) {
+            nextPage();
+        });
+
+        $('#zoom_in').click(function(event) {
+            zoomIn();
+        });
+        $('#zoom_out').click(function(event) {
+            zoomOut();
+        });
+
+        $('#scaleSelect').change(function(event) {
+            parseScale(this.value);
+        });
+
+
+        $('#pageNumber').change(function(event) {
+            var newPageVal = parseInt(this.value);
+            if (newPageVal) {
+                renderPage(newPageVal);
+            }
+        });
+
+        // define navigation links for chapters:  
+        if (chapterUrls != null) {
+            var loadChapterUrlHelper = function(i) {
+                return function(event) {
+                    // when opening a new chapter, always open the first page:
+                    loadChapterUrl(i, 1);
+                };
+            };
+            for (var index = 1; index <= chapterUrls.length; index += 1) {
+                $("#pdfchapter-" + index).click(loadChapterUrlHelper(index));
+            }   
+        }
+
+        // finally, load the appropriate url/page
+        if (urlToLoad != null) {
+            loadUrl(urlToLoad, pageToLoad);
+        } else {
+            loadChapterUrl(chapterToLoad, pageToLoad);
+        }       
+            
+        return pdfViewer;
+    }
+})(jQuery);
diff --git a/common/static/js/vendor/pdfjs/compatibility.js b/common/static/js/vendor/pdfjs/compatibility.js
new file mode 100644
index 0000000000..04e3a14f77
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/compatibility.js
@@ -0,0 +1,430 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* globals VBArray */
+
+'use strict';
+
+// Checking if the typed arrays are supported
+(function checkTypedArrayCompatibility() {
+  if (typeof Uint8Array !== 'undefined') {
+    // some mobile versions do not support subarray (e.g. safari 5 / iOS)
+    if (typeof Uint8Array.prototype.subarray === 'undefined') {
+        Uint8Array.prototype.subarray = function subarray(start, end) {
+          return new Uint8Array(this.slice(start, end));
+        };
+        Float32Array.prototype.subarray = function subarray(start, end) {
+          return new Float32Array(this.slice(start, end));
+        };
+    }
+
+    // some mobile version might not support Float64Array
+    if (typeof Float64Array === 'undefined')
+      window.Float64Array = Float32Array;
+
+    return;
+  }
+
+  function subarray(start, end) {
+    return new TypedArray(this.slice(start, end));
+  }
+
+  function setArrayOffset(array, offset) {
+    if (arguments.length < 2)
+      offset = 0;
+    for (var i = 0, n = array.length; i < n; ++i, ++offset)
+      this[offset] = array[i] & 0xFF;
+  }
+
+  function TypedArray(arg1) {
+    var result;
+    if (typeof arg1 === 'number') {
+      result = [];
+      for (var i = 0; i < arg1; ++i)
+        result[i] = 0;
+    } else
+      result = arg1.slice(0);
+
+    result.subarray = subarray;
+    result.buffer = result;
+    result.byteLength = result.length;
+    result.set = setArrayOffset;
+
+    if (typeof arg1 === 'object' && arg1.buffer)
+      result.buffer = arg1.buffer;
+
+    return result;
+  }
+
+  window.Uint8Array = TypedArray;
+
+  // we don't need support for set, byteLength for 32-bit array
+  // so we can use the TypedArray as well
+  window.Uint32Array = TypedArray;
+  window.Int32Array = TypedArray;
+  window.Uint16Array = TypedArray;
+  window.Float32Array = TypedArray;
+  window.Float64Array = TypedArray;
+})();
+
+// Object.create() ?
+(function checkObjectCreateCompatibility() {
+  if (typeof Object.create !== 'undefined')
+    return;
+
+  Object.create = function objectCreate(proto) {
+    function Constructor() {}
+    Constructor.prototype = proto;
+    return new Constructor();
+  };
+})();
+
+// Object.defineProperty() ?
+(function checkObjectDefinePropertyCompatibility() {
+  if (typeof Object.defineProperty !== 'undefined') {
+    var definePropertyPossible = true;
+    try {
+      // some browsers (e.g. safari) cannot use defineProperty() on DOM objects
+      // and thus the native version is not sufficient
+      Object.defineProperty(new Image(), 'id', { value: 'test' });
+      // ... another test for android gb browser for non-DOM objects
+      var Test = function Test() {};
+      Test.prototype = { get id() { } };
+      Object.defineProperty(new Test(), 'id',
+        { value: '', configurable: true, enumerable: true, writable: false });
+    } catch (e) {
+      definePropertyPossible = false;
+    }
+    if (definePropertyPossible) return;
+  }
+
+  Object.defineProperty = function objectDefineProperty(obj, name, def) {
+    delete obj[name];
+    if ('get' in def)
+      obj.__defineGetter__(name, def['get']);
+    if ('set' in def)
+      obj.__defineSetter__(name, def['set']);
+    if ('value' in def) {
+      obj.__defineSetter__(name, function objectDefinePropertySetter(value) {
+        this.__defineGetter__(name, function objectDefinePropertyGetter() {
+          return value;
+        });
+        return value;
+      });
+      obj[name] = def.value;
+    }
+  };
+})();
+
+// Object.keys() ?
+(function checkObjectKeysCompatibility() {
+  if (typeof Object.keys !== 'undefined')
+    return;
+
+  Object.keys = function objectKeys(obj) {
+    var result = [];
+    for (var i in obj) {
+      if (obj.hasOwnProperty(i))
+        result.push(i);
+    }
+    return result;
+  };
+})();
+
+// No readAsArrayBuffer ?
+(function checkFileReaderReadAsArrayBuffer() {
+  if (typeof FileReader === 'undefined')
+    return; // FileReader is not implemented
+  var frPrototype = FileReader.prototype;
+  // Older versions of Firefox might not have readAsArrayBuffer
+  if ('readAsArrayBuffer' in frPrototype)
+    return; // readAsArrayBuffer is implemented
+  Object.defineProperty(frPrototype, 'readAsArrayBuffer', {
+    value: function fileReaderReadAsArrayBuffer(blob) {
+      var fileReader = new FileReader();
+      var originalReader = this;
+      fileReader.onload = function fileReaderOnload(evt) {
+        var data = evt.target.result;
+        var buffer = new ArrayBuffer(data.length);
+        var uint8Array = new Uint8Array(buffer);
+
+        for (var i = 0, ii = data.length; i < ii; i++)
+          uint8Array[i] = data.charCodeAt(i);
+
+        Object.defineProperty(originalReader, 'result', {
+          value: buffer,
+          enumerable: true,
+          writable: false,
+          configurable: true
+        });
+
+        var event = document.createEvent('HTMLEvents');
+        event.initEvent('load', false, false);
+        originalReader.dispatchEvent(event);
+      };
+      fileReader.readAsBinaryString(blob);
+    }
+  });
+})();
+
+// No XMLHttpRequest.response ?
+(function checkXMLHttpRequestResponseCompatibility() {
+  var xhrPrototype = XMLHttpRequest.prototype;
+  if (!('overrideMimeType' in xhrPrototype)) {
+    // IE10 might have response, but not overrideMimeType
+    Object.defineProperty(xhrPrototype, 'overrideMimeType', {
+      value: function xmlHttpRequestOverrideMimeType(mimeType) {}
+    });
+  }
+  if ('response' in xhrPrototype ||
+      'mozResponseArrayBuffer' in xhrPrototype ||
+      'mozResponse' in xhrPrototype ||
+      'responseArrayBuffer' in xhrPrototype)
+    return;
+  // IE9 ?
+  if (typeof VBArray !== 'undefined') {
+    Object.defineProperty(xhrPrototype, 'response', {
+      get: function xmlHttpRequestResponseGet() {
+        return new Uint8Array(new VBArray(this.responseBody).toArray());
+      }
+    });
+    return;
+  }
+
+  // other browsers
+  function responseTypeSetter() {
+    // will be only called to set "arraybuffer"
+    this.overrideMimeType('text/plain; charset=x-user-defined');
+  }
+  if (typeof xhrPrototype.overrideMimeType === 'function') {
+    Object.defineProperty(xhrPrototype, 'responseType',
+                          { set: responseTypeSetter });
+  }
+  function responseGetter() {
+    var text = this.responseText;
+    var i, n = text.length;
+    var result = new Uint8Array(n);
+    for (i = 0; i < n; ++i)
+      result[i] = text.charCodeAt(i) & 0xFF;
+    return result;
+  }
+  Object.defineProperty(xhrPrototype, 'response', { get: responseGetter });
+})();
+
+// window.btoa (base64 encode function) ?
+(function checkWindowBtoaCompatibility() {
+  if ('btoa' in window)
+    return;
+
+  var digits =
+    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+
+  window.btoa = function windowBtoa(chars) {
+    var buffer = '';
+    var i, n;
+    for (i = 0, n = chars.length; i < n; i += 3) {
+      var b1 = chars.charCodeAt(i) & 0xFF;
+      var b2 = chars.charCodeAt(i + 1) & 0xFF;
+      var b3 = chars.charCodeAt(i + 2) & 0xFF;
+      var d1 = b1 >> 2, d2 = ((b1 & 3) << 4) | (b2 >> 4);
+      var d3 = i + 1 < n ? ((b2 & 0xF) << 2) | (b3 >> 6) : 64;
+      var d4 = i + 2 < n ? (b3 & 0x3F) : 64;
+      buffer += (digits.charAt(d1) + digits.charAt(d2) +
+                 digits.charAt(d3) + digits.charAt(d4));
+    }
+    return buffer;
+  };
+})();
+
+// Function.prototype.bind ?
+(function checkFunctionPrototypeBindCompatibility() {
+  if (typeof Function.prototype.bind !== 'undefined')
+    return;
+
+  Function.prototype.bind = function functionPrototypeBind(obj) {
+    var fn = this, headArgs = Array.prototype.slice.call(arguments, 1);
+    var bound = function functionPrototypeBindBound() {
+      var args = Array.prototype.concat.apply(headArgs, arguments);
+      return fn.apply(obj, args);
+    };
+    return bound;
+  };
+})();
+
+// IE9/10 text/html data URI
+(function checkDataURICompatibility() {
+  if (!('documentMode' in document) ||
+      document.documentMode !== 9 && document.documentMode !== 10)
+    return;
+  // overriding the src property
+  var originalSrcDescriptor = Object.getOwnPropertyDescriptor(
+    HTMLIFrameElement.prototype, 'src');
+  Object.defineProperty(HTMLIFrameElement.prototype, 'src', {
+    get: function htmlIFrameElementPrototypeSrcGet() { return this.$src; },
+    set: function htmlIFrameElementPrototypeSrcSet(src) {
+      this.$src = src;
+      if (src.substr(0, 14) != 'data:text/html') {
+        originalSrcDescriptor.set.call(this, src);
+        return;
+      }
+      // for text/html, using blank document and then
+      // document's open, write, and close operations
+      originalSrcDescriptor.set.call(this, 'about:blank');
+      setTimeout((function htmlIFrameElementPrototypeSrcOpenWriteClose() {
+        var doc = this.contentDocument;
+        doc.open('text/html');
+        doc.write(src.substr(src.indexOf(',') + 1));
+        doc.close();
+      }).bind(this), 0);
+    },
+    enumerable: true
+  });
+})();
+
+// HTMLElement dataset property
+(function checkDatasetProperty() {
+  var div = document.createElement('div');
+  if ('dataset' in div)
+    return; // dataset property exists
+
+  Object.defineProperty(HTMLElement.prototype, 'dataset', {
+    get: function() {
+      if (this._dataset)
+        return this._dataset;
+
+      var dataset = {};
+      for (var j = 0, jj = this.attributes.length; j < jj; j++) {
+        var attribute = this.attributes[j];
+        if (attribute.name.substring(0, 5) != 'data-')
+          continue;
+        var key = attribute.name.substring(5).replace(/\-([a-z])/g,
+          function(all, ch) { return ch.toUpperCase(); });
+        dataset[key] = attribute.value;
+      }
+
+      Object.defineProperty(this, '_dataset', {
+        value: dataset,
+        writable: false,
+        enumerable: false
+      });
+      return dataset;
+    },
+    enumerable: true
+  });
+})();
+
+// HTMLElement classList property
+(function checkClassListProperty() {
+  var div = document.createElement('div');
+  if ('classList' in div)
+    return; // classList property exists
+
+  function changeList(element, itemName, add, remove) {
+    var s = element.className || '';
+    var list = s.split(/\s+/g);
+    if (list[0] === '') list.shift();
+    var index = list.indexOf(itemName);
+    if (index < 0 && add)
+      list.push(itemName);
+    if (index >= 0 && remove)
+      list.splice(index, 1);
+    element.className = list.join(' ');
+  }
+
+  var classListPrototype = {
+    add: function(name) {
+      changeList(this.element, name, true, false);
+    },
+    remove: function(name) {
+      changeList(this.element, name, false, true);
+    },
+    toggle: function(name) {
+      changeList(this.element, name, true, true);
+    }
+  };
+
+  Object.defineProperty(HTMLElement.prototype, 'classList', {
+    get: function() {
+      if (this._classList)
+        return this._classList;
+
+      var classList = Object.create(classListPrototype, {
+        element: {
+          value: this,
+          writable: false,
+          enumerable: true
+        }
+      });
+      Object.defineProperty(this, '_classList', {
+        value: classList,
+        writable: false,
+        enumerable: false
+      });
+      return classList;
+    },
+    enumerable: true
+  });
+})();
+
+// Check console compatability
+(function checkConsoleCompatibility() {
+  if (!('console' in window)) {
+    window.console = {
+      log: function() {},
+      error: function() {}
+    };
+  } else if (!('bind' in console.log)) {
+    // native functions in IE9 might not have bind
+    console.log = (function(fn) {
+      return function(msg) { return fn(msg); };
+    })(console.log);
+    console.error = (function(fn) {
+      return function(msg) { return fn(msg); };
+    })(console.error);
+  }
+})();
+
+// Check onclick compatibility in Opera
+(function checkOnClickCompatibility() {
+  // workaround for reported Opera bug DSK-354448:
+  // onclick fires on disabled buttons with opaque content
+  function ignoreIfTargetDisabled(event) {
+    if (isDisabled(event.target)) {
+      event.stopPropagation();
+    }
+  }
+  function isDisabled(node) {
+    return node.disabled || (node.parentNode && isDisabled(node.parentNode));
+  }
+  if (navigator.userAgent.indexOf('Opera') != -1) {
+    // use browser detection since we cannot feature-check this bug
+    document.addEventListener('click', ignoreIfTargetDisabled, true);
+  }
+})();
+
+// Checks if navigator.language is supported
+(function checkNavigatorLanguage() {
+  if ('language' in navigator)
+    return;
+  Object.defineProperty(navigator, 'language', {
+    get: function navigatorLanguage() {
+      var language = navigator.userLanguage || 'en-US';
+      return language.substring(0, 2).toLowerCase() +
+        language.substring(2).toUpperCase();
+    },
+    enumerable: true
+  });
+})();
diff --git a/common/static/js/vendor/pdfjs/debugger.js b/common/static/js/vendor/pdfjs/debugger.js
new file mode 100644
index 0000000000..c14ad3fdad
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/debugger.js
@@ -0,0 +1,491 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* globals PDFJS */
+
+'use strict';
+
+var FontInspector = (function FontInspectorClosure() {
+  var fonts;
+  var panelWidth = 300;
+  var active = false;
+  var fontAttribute = 'data-font-name';
+  function removeSelection() {
+    var divs = document.querySelectorAll('div[' + fontAttribute + ']');
+    for (var i = 0, ii = divs.length; i < ii; ++i) {
+      var div = divs[i];
+      div.className = '';
+    }
+  }
+  function resetSelection() {
+    var divs = document.querySelectorAll('div[' + fontAttribute + ']');
+    for (var i = 0, ii = divs.length; i < ii; ++i) {
+      var div = divs[i];
+      div.className = 'debuggerHideText';
+    }
+  }
+  function selectFont(fontName, show) {
+    var divs = document.querySelectorAll('div[' + fontAttribute + '=' +
+                                         fontName + ']');
+    for (var i = 0, ii = divs.length; i < ii; ++i) {
+      var div = divs[i];
+      div.className = show ? 'debuggerShowText' : 'debuggerHideText';
+    }
+  }
+  function textLayerClick(e) {
+    if (!e.target.dataset.fontName || e.target.tagName != 'DIV')
+      return;
+    var fontName = e.target.dataset.fontName;
+    var selects = document.getElementsByTagName('input');
+    for (var i = 0; i < selects.length; ++i) {
+      var select = selects[i];
+      if (select.dataset.fontName != fontName) continue;
+      select.checked = !select.checked;
+      selectFont(fontName, select.checked);
+      select.scrollIntoView();
+    }
+  }
+  return {
+    // Properties/functions needed by PDFBug.
+    id: 'FontInspector',
+    name: 'Font Inspector',
+    panel: null,
+    manager: null,
+    init: function init() {
+      var panel = this.panel;
+      panel.setAttribute('style', 'padding: 5px;');
+      var tmp = document.createElement('button');
+      tmp.addEventListener('click', resetSelection);
+      tmp.textContent = 'Refresh';
+      panel.appendChild(tmp);
+
+      fonts = document.createElement('div');
+      panel.appendChild(fonts);
+    },
+    enabled: false,
+    get active() {
+      return active;
+    },
+    set active(value) {
+      active = value;
+      if (active) {
+        document.body.addEventListener('click', textLayerClick, true);
+        resetSelection();
+      } else {
+        document.body.removeEventListener('click', textLayerClick, true);
+        removeSelection();
+      }
+    },
+    // FontInspector specific functions.
+    fontAdded: function fontAdded(fontObj, url) {
+      function properties(obj, list) {
+        var moreInfo = document.createElement('table');
+        for (var i = 0; i < list.length; i++) {
+          var tr = document.createElement('tr');
+          var td1 = document.createElement('td');
+          td1.textContent = list[i];
+          tr.appendChild(td1);
+          var td2 = document.createElement('td');
+          td2.textContent = obj[list[i]].toString();
+          tr.appendChild(td2);
+          moreInfo.appendChild(tr);
+        }
+        return moreInfo;
+      }
+      var moreInfo = properties(fontObj, ['name', 'type']);
+      var m = /url\(['"]?([^\)"']+)/.exec(url);
+      var fontName = fontObj.loadedName;
+      var font = document.createElement('div');
+      var name = document.createElement('span');
+      name.textContent = fontName;
+      var download = document.createElement('a');
+      download.href = m[1];
+      download.textContent = 'Download';
+      var logIt = document.createElement('a');
+      logIt.href = '';
+      logIt.textContent = 'Log';
+      logIt.addEventListener('click', function(event) {
+        event.preventDefault();
+        console.log(fontObj);
+      });
+      var select = document.createElement('input');
+      select.setAttribute('type', 'checkbox');
+      select.dataset.fontName = fontName;
+      select.addEventListener('click', (function(select, fontName) {
+        return (function() {
+           selectFont(fontName, select.checked);
+        });
+      })(select, fontName));
+      font.appendChild(select);
+      font.appendChild(name);
+      font.appendChild(document.createTextNode(' '));
+      font.appendChild(download);
+      font.appendChild(document.createTextNode(' '));
+      font.appendChild(logIt);
+      font.appendChild(moreInfo);
+      fonts.appendChild(font);
+      // Somewhat of a hack, should probably add a hook for when the text layer
+      // is done rendering.
+      setTimeout(function() {
+        if (this.active)
+          resetSelection();
+      }.bind(this), 2000);
+    }
+  };
+})();
+
+// Manages all the page steppers.
+var StepperManager = (function StepperManagerClosure() {
+  var steppers = [];
+  var stepperDiv = null;
+  var stepperControls = null;
+  var stepperChooser = null;
+  var breakPoints = {};
+  return {
+    // Properties/functions needed by PDFBug.
+    id: 'Stepper',
+    name: 'Stepper',
+    panel: null,
+    manager: null,
+    init: function init() {
+      var self = this;
+      this.panel.setAttribute('style', 'padding: 5px;');
+      stepperControls = document.createElement('div');
+      stepperChooser = document.createElement('select');
+      stepperChooser.addEventListener('change', function(event) {
+        self.selectStepper(this.value);
+      });
+      stepperControls.appendChild(stepperChooser);
+      stepperDiv = document.createElement('div');
+      this.panel.appendChild(stepperControls);
+      this.panel.appendChild(stepperDiv);
+      if (sessionStorage.getItem('pdfjsBreakPoints'))
+        breakPoints = JSON.parse(sessionStorage.getItem('pdfjsBreakPoints'));
+    },
+    enabled: false,
+    active: false,
+    // Stepper specific functions.
+    create: function create(pageIndex) {
+      var debug = document.createElement('div');
+      debug.id = 'stepper' + pageIndex;
+      debug.setAttribute('hidden', true);
+      debug.className = 'stepper';
+      stepperDiv.appendChild(debug);
+      var b = document.createElement('option');
+      b.textContent = 'Page ' + (pageIndex + 1);
+      b.value = pageIndex;
+      stepperChooser.appendChild(b);
+      var initBreakPoints = breakPoints[pageIndex] || [];
+      var stepper = new Stepper(debug, pageIndex, initBreakPoints);
+      steppers.push(stepper);
+      if (steppers.length === 1)
+        this.selectStepper(pageIndex, false);
+      return stepper;
+    },
+    selectStepper: function selectStepper(pageIndex, selectPanel) {
+      if (selectPanel)
+        this.manager.selectPanel(1);
+      for (var i = 0; i < steppers.length; ++i) {
+        var stepper = steppers[i];
+        if (stepper.pageIndex == pageIndex)
+          stepper.panel.removeAttribute('hidden');
+        else
+          stepper.panel.setAttribute('hidden', true);
+      }
+      var options = stepperChooser.options;
+      for (var i = 0; i < options.length; ++i) {
+        var option = options[i];
+        option.selected = option.value == pageIndex;
+      }
+    },
+    saveBreakPoints: function saveBreakPoints(pageIndex, bps) {
+      breakPoints[pageIndex] = bps;
+      sessionStorage.setItem('pdfjsBreakPoints', JSON.stringify(breakPoints));
+    }
+  };
+})();
+
+// The stepper for each page's IRQueue.
+var Stepper = (function StepperClosure() {
+  function Stepper(panel, pageIndex, initialBreakPoints) {
+    this.panel = panel;
+    this.len = 0;
+    this.breakPoint = 0;
+    this.nextBreakPoint = null;
+    this.pageIndex = pageIndex;
+    this.breakPoints = initialBreakPoints;
+    this.currentIdx = -1;
+  }
+  Stepper.prototype = {
+    init: function init(IRQueue) {
+      // Shorter way to create element and optionally set textContent.
+      function c(tag, textContent) {
+        var d = document.createElement(tag);
+        if (textContent)
+          d.textContent = textContent;
+        return d;
+      }
+      var panel = this.panel;
+      this.len = IRQueue.fnArray.length;
+      var content = c('div', 'c=continue, s=step');
+      var table = c('table');
+      content.appendChild(table);
+      table.cellSpacing = 0;
+      var headerRow = c('tr');
+      table.appendChild(headerRow);
+      headerRow.appendChild(c('th', 'Break'));
+      headerRow.appendChild(c('th', 'Idx'));
+      headerRow.appendChild(c('th', 'fn'));
+      headerRow.appendChild(c('th', 'args'));
+
+      var self = this;
+      for (var i = 0; i < IRQueue.fnArray.length; i++) {
+        var line = c('tr');
+        line.className = 'line';
+        line.dataset.idx = i;
+        table.appendChild(line);
+        var checked = this.breakPoints.indexOf(i) != -1;
+        var args = IRQueue.argsArray[i] ? IRQueue.argsArray[i] : [];
+
+        var breakCell = c('td');
+        var cbox = c('input');
+        cbox.type = 'checkbox';
+        cbox.className = 'points';
+        cbox.checked = checked;
+        cbox.onclick = (function(x) {
+          return function() {
+            if (this.checked)
+              self.breakPoints.push(x);
+            else
+              self.breakPoints.splice(self.breakPoints.indexOf(x), 1);
+            StepperManager.saveBreakPoints(self.pageIndex, self.breakPoints);
+          };
+        })(i);
+
+        breakCell.appendChild(cbox);
+        line.appendChild(breakCell);
+        line.appendChild(c('td', i.toString()));
+        line.appendChild(c('td', IRQueue.fnArray[i]));
+        line.appendChild(c('td', args.join(', ')));
+      }
+      panel.appendChild(content);
+      var self = this;
+    },
+    getNextBreakPoint: function getNextBreakPoint() {
+      this.breakPoints.sort(function(a, b) { return a - b; });
+      for (var i = 0; i < this.breakPoints.length; i++) {
+        if (this.breakPoints[i] > this.currentIdx)
+          return this.breakPoints[i];
+      }
+      return null;
+    },
+    breakIt: function breakIt(idx, callback) {
+      StepperManager.selectStepper(this.pageIndex, true);
+      var self = this;
+      var dom = document;
+      self.currentIdx = idx;
+      var listener = function(e) {
+        switch (e.keyCode) {
+          case 83: // step
+            dom.removeEventListener('keydown', listener, false);
+            self.nextBreakPoint = self.currentIdx + 1;
+            self.goTo(-1);
+            callback();
+            break;
+          case 67: // continue
+            dom.removeEventListener('keydown', listener, false);
+            var breakPoint = self.getNextBreakPoint();
+            self.nextBreakPoint = breakPoint;
+            self.goTo(-1);
+            callback();
+            break;
+        }
+      };
+      dom.addEventListener('keydown', listener, false);
+      self.goTo(idx);
+    },
+    goTo: function goTo(idx) {
+      var allRows = this.panel.getElementsByClassName('line');
+      for (var x = 0, xx = allRows.length; x < xx; ++x) {
+        var row = allRows[x];
+        if (row.dataset.idx == idx) {
+          row.style.backgroundColor = 'rgb(251,250,207)';
+          row.scrollIntoView();
+        } else {
+          row.style.backgroundColor = null;
+        }
+      }
+    }
+  };
+  return Stepper;
+})();
+
+var Stats = (function Stats() {
+  var stats = [];
+  function clear(node) {
+    while (node.hasChildNodes())
+      node.removeChild(node.lastChild);
+  }
+  function getStatIndex(pageNumber) {
+    for (var i = 0, ii = stats.length; i < ii; ++i)
+      if (stats[i].pageNumber === pageNumber)
+        return i;
+    return false;
+  }
+  return {
+    // Properties/functions needed by PDFBug.
+    id: 'Stats',
+    name: 'Stats',
+    panel: null,
+    manager: null,
+    init: function init() {
+      this.panel.setAttribute('style', 'padding: 5px;');
+      PDFJS.enableStats = true;
+    },
+    enabled: false,
+    active: false,
+    // Stats specific functions.
+    add: function(pageNumber, stat) {
+      if (!stat)
+        return;
+      var statsIndex = getStatIndex(pageNumber);
+      if (statsIndex !== false) {
+        var b = stats[statsIndex];
+        this.panel.removeChild(b.div);
+        stats.splice(statsIndex, 1);
+      }
+      var wrapper = document.createElement('div');
+      wrapper.className = 'stats';
+      var title = document.createElement('div');
+      title.className = 'title';
+      title.textContent = 'Page: ' + pageNumber;
+      var statsDiv = document.createElement('div');
+      statsDiv.textContent = stat.toString();
+      wrapper.appendChild(title);
+      wrapper.appendChild(statsDiv);
+      stats.push({ pageNumber: pageNumber, div: wrapper });
+      stats.sort(function(a, b) { return a.pageNumber - b.pageNumber; });
+      clear(this.panel);
+      for (var i = 0, ii = stats.length; i < ii; ++i)
+        this.panel.appendChild(stats[i].div);
+    }
+  };
+})();
+
+// Manages all the debugging tools.
+var PDFBug = (function PDFBugClosure() {
+  var panelWidth = 300;
+  var buttons = [];
+  var activePanel = null;
+
+  return {
+    tools: [
+      FontInspector,
+      StepperManager,
+      Stats
+    ],
+    enable: function(ids) {
+      var all = false, tools = this.tools;
+      if (ids.length === 1 && ids[0] === 'all')
+        all = true;
+      for (var i = 0; i < tools.length; ++i) {
+        var tool = tools[i];
+        if (all || ids.indexOf(tool.id) !== -1)
+          tool.enabled = true;
+      }
+      if (!all) {
+        // Sort the tools by the order they are enabled.
+        tools.sort(function(a, b) {
+          var indexA = ids.indexOf(a.id);
+          indexA = indexA < 0 ? tools.length : indexA;
+          var indexB = ids.indexOf(b.id);
+          indexB = indexB < 0 ? tools.length : indexB;
+          return indexA - indexB;
+        });
+      }
+    },
+    init: function init() {
+      /*
+       * Basic Layout:
+       * PDFBug
+       *  Controls
+       *  Panels
+       *    Panel
+       *    Panel
+       *    ...
+       */
+      var ui = document.createElement('div');
+      ui.id = 'PDFBug';
+
+      var controls = document.createElement('div');
+      controls.setAttribute('class', 'controls');
+      ui.appendChild(controls);
+
+      var panels = document.createElement('div');
+      panels.setAttribute('class', 'panels');
+      ui.appendChild(panels);
+
+      var container = document.getElementById('viewerContainer');
+      container.appendChild(ui);
+      container.style.right = panelWidth + 'px';
+
+      // Initialize all the debugging tools.
+      var tools = this.tools;
+      var self = this;
+      for (var i = 0; i < tools.length; ++i) {
+        var tool = tools[i];
+        var panel = document.createElement('div');
+        var panelButton = document.createElement('button');
+        panelButton.textContent = tool.name;
+        panelButton.addEventListener('click', (function(selected) {
+          return function(event) {
+            event.preventDefault();
+            self.selectPanel(selected);
+          };
+        })(i));
+        controls.appendChild(panelButton);
+        panels.appendChild(panel);
+        tool.panel = panel;
+        tool.manager = this;
+        if (tool.enabled)
+          tool.init();
+        else
+          panel.textContent = tool.name + ' is disabled. To enable add ' +
+                              ' "' + tool.id + '" to the pdfBug parameter ' +
+                              'and refresh (seperate multiple by commas).';
+        buttons.push(panelButton);
+      }
+      this.selectPanel(0);
+    },
+    selectPanel: function selectPanel(index) {
+      if (index === activePanel)
+        return;
+      activePanel = index;
+      var tools = this.tools;
+      for (var j = 0; j < tools.length; ++j) {
+        if (j == index) {
+          buttons[j].setAttribute('class', 'active');
+          tools[j].active = true;
+          tools[j].panel.removeAttribute('hidden');
+        } else {
+          buttons[j].setAttribute('class', '');
+          tools[j].active = false;
+          tools[j].panel.setAttribute('hidden', 'true');
+        }
+      }
+    }
+  };
+})();
diff --git a/common/static/js/vendor/pdfjs/l10n.js b/common/static/js/vendor/pdfjs/l10n.js
new file mode 100644
index 0000000000..5435631651
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/l10n.js
@@ -0,0 +1,922 @@
+/** Copyright (c) 2011-2012 Fabien Cazenave, Mozilla.
+  *
+  * 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.
+  */
+/*
+  Additional modifications for PDF.js project:
+    - Disables language initialization on page loading;
+    - Adds fallback argument to the getL10nData;
+    - Removes consoleLog and simplifies consoleWarn;
+    - Removes window._ assignment.
+*/
+/*jshint browser: true, devel: true, es5: true, globalstrict: true */
+'use strict';
+
+document.webL10n = (function(window, document, undefined) {
+  var gL10nData = {};
+  var gTextData = '';
+  var gTextProp = 'textContent';
+  var gLanguage = '';
+  var gMacros = {};
+  var gReadyState = 'loading';
+
+  // read-only setting -- we recommend to load l10n resources synchronously
+  var gAsyncResourceLoading = true;
+
+  // debug helpers
+  function consoleWarn(message) {
+    console.log('[l10n] ' + message);
+  };
+
+  /**
+   * DOM helpers for the so-called "HTML API".
+   *
+   * These functions are written for modern browsers. For old versions of IE,
+   * they're overridden in the 'startup' section at the end of this file.
+   */
+
+  function getL10nResourceLinks() {
+    return document.querySelectorAll('link[type="application/l10n"]');
+  }
+
+  function getTranslatableChildren(element) {
+    return element ? element.querySelectorAll('*[data-l10n-id]') : [];
+  }
+
+  function getL10nAttributes(element) {
+    if (!element)
+      return {};
+
+    var l10nId = element.getAttribute('data-l10n-id');
+    var l10nArgs = element.getAttribute('data-l10n-args');
+    var args = {};
+    if (l10nArgs) {
+      try {
+        args = JSON.parse(l10nArgs);
+      } catch (e) {
+        consoleWarn('could not parse arguments for #' + l10nId);
+      }
+    }
+    return { id: l10nId, args: args };
+  }
+
+  function fireL10nReadyEvent(lang) {
+    var evtObject = document.createEvent('Event');
+    evtObject.initEvent('localized', false, false);
+    evtObject.language = lang;
+    window.dispatchEvent(evtObject);
+  }
+
+
+  /**
+   * l10n resource parser:
+   *  - reads (async XHR) the l10n resource matching `lang';
+   *  - imports linked resources (synchronously) when specified;
+   *  - parses the text data (fills `gL10nData' and `gTextData');
+   *  - triggers success/failure callbacks when done.
+   *
+   * @param {string} href
+   *    URL of the l10n resource to parse.
+   *
+   * @param {string} lang
+   *    locale (language) to parse.
+   *
+   * @param {Function} successCallback
+   *    triggered when the l10n resource has been successully parsed.
+   *
+   * @param {Function} failureCallback
+   *    triggered when the an error has occured.
+   *
+   * @return {void}
+   *    uses the following global variables: gL10nData, gTextData, gTextProp.
+   */
+
+  function parseResource(href, lang, successCallback, failureCallback) {
+    var baseURL = href.replace(/\/[^\/]*$/, '/');
+
+    // handle escaped characters (backslashes) in a string
+    function evalString(text) {
+      if (text.lastIndexOf('\\') < 0)
+        return text;
+      return text.replace(/\\\\/g, '\\')
+                 .replace(/\\n/g, '\n')
+                 .replace(/\\r/g, '\r')
+                 .replace(/\\t/g, '\t')
+                 .replace(/\\b/g, '\b')
+                 .replace(/\\f/g, '\f')
+                 .replace(/\\{/g, '{')
+                 .replace(/\\}/g, '}')
+                 .replace(/\\"/g, '"')
+                 .replace(/\\'/g, "'");
+    }
+
+    // parse *.properties text data into an l10n dictionary
+    function parseProperties(text) {
+      var dictionary = [];
+
+      // token expressions
+      var reBlank = /^\s*|\s*$/;
+      var reComment = /^\s*#|^\s*$/;
+      var reSection = /^\s*\[(.*)\]\s*$/;
+      var reImport = /^\s*@import\s+url\((.*)\)\s*$/i;
+      var reSplit = /^([^=\s]*)\s*=\s*(.+)$/; // TODO: escape EOLs with '\'
+
+      // parse the *.properties file into an associative array
+      function parseRawLines(rawText, extendedSyntax) {
+        var entries = rawText.replace(reBlank, '').split(/[\r\n]+/);
+        var currentLang = '*';
+        var genericLang = lang.replace(/-[a-z]+$/i, '');
+        var skipLang = false;
+        var match = '';
+
+        for (var i = 0; i < entries.length; i++) {
+          var line = entries[i];
+
+          // comment or blank line?
+          if (reComment.test(line))
+            continue;
+
+          // the extended syntax supports [lang] sections and @import rules
+          if (extendedSyntax) {
+            if (reSection.test(line)) { // section start?
+              match = reSection.exec(line);
+              currentLang = match[1];
+              skipLang = (currentLang !== '*') &&
+                  (currentLang !== lang) && (currentLang !== genericLang);
+              continue;
+            } else if (skipLang) {
+              continue;
+            }
+            if (reImport.test(line)) { // @import rule?
+              match = reImport.exec(line);
+              loadImport(baseURL + match[1]); // load the resource synchronously
+            }
+          }
+
+          // key-value pair
+          var tmp = line.match(reSplit);
+          if (tmp && tmp.length == 3)
+            dictionary[tmp[1]] = evalString(tmp[2]);
+        }
+      }
+
+      // import another *.properties file
+      function loadImport(url) {
+        loadResource(url, function(content) {
+          parseRawLines(content, false); // don't allow recursive imports
+        }, false, false); // load synchronously
+      }
+
+      // fill the dictionary
+      parseRawLines(text, true);
+      return dictionary;
+    }
+
+    // load the specified resource file
+    function loadResource(url, onSuccess, onFailure, asynchronous) {
+      var xhr = new XMLHttpRequest();
+      xhr.open('GET', url, asynchronous);
+      if (xhr.overrideMimeType) {
+        xhr.overrideMimeType('text/plain; charset=utf-8');
+      }
+      xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+          if (xhr.status == 200 || xhr.status === 0) {
+            if (onSuccess)
+              onSuccess(xhr.responseText);
+          } else {
+            if (onFailure)
+              onFailure();
+          }
+        }
+      };
+      xhr.send(null);
+    }
+
+    // load and parse l10n data (warning: global variables are used here)
+    loadResource(href, function(response) {
+      gTextData += response; // mostly for debug
+
+      // parse *.properties text data into an l10n dictionary
+      var data = parseProperties(response);
+
+      // find attribute descriptions, if any
+      for (var key in data) {
+        var id, prop, index = key.lastIndexOf('.');
+        if (index > 0) { // an attribute has been specified
+          id = key.substring(0, index);
+          prop = key.substr(index + 1);
+        } else { // no attribute: assuming text content by default
+          id = key;
+          prop = gTextProp;
+        }
+        if (!gL10nData[id]) {
+          gL10nData[id] = {};
+        }
+        gL10nData[id][prop] = data[key];
+      }
+
+      // trigger callback
+      if (successCallback)
+        successCallback();
+    }, failureCallback, gAsyncResourceLoading);
+  };
+
+  // load and parse all resources for the specified locale
+  function loadLocale(lang, callback) {
+    clear();
+    gLanguage = lang;
+
+    // check all <link type="application/l10n" href="..." /> nodes
+    // and load the resource files
+    var langLinks = getL10nResourceLinks();
+    var langCount = langLinks.length;
+    if (langCount == 0) {
+      consoleWarn('no resource to load, early way out');
+      fireL10nReadyEvent(lang);
+      gReadyState = 'complete';
+      return;
+    }
+
+    // start the callback when all resources are loaded
+    var onResourceLoaded = null;
+    var gResourceCount = 0;
+    onResourceLoaded = function() {
+      gResourceCount++;
+      if (gResourceCount >= langCount) {
+        if (callback) // execute the [optional] callback
+          callback();
+        fireL10nReadyEvent(lang);
+        gReadyState = 'complete';
+      }
+    };
+
+    // load all resource files
+    function l10nResourceLink(link) {
+      var href = link.href;
+      var type = link.type;
+      this.load = function(lang, callback) {
+        var applied = lang;
+        parseResource(href, lang, callback, function() {
+          consoleWarn(href + ' not found.');
+          applied = '';
+        });
+        return applied; // return lang if found, an empty string if not found
+      };
+    }
+
+    for (var i = 0; i < langCount; i++) {
+      var resource = new l10nResourceLink(langLinks[i]);
+      var rv = resource.load(lang, onResourceLoaded);
+      if (rv != lang) { // lang not found, used default resource instead
+        consoleWarn('"' + lang + '" resource not found');
+        gLanguage = '';
+      }
+    }
+  }
+
+  // clear all l10n data
+  function clear() {
+    gL10nData = {};
+    gTextData = '';
+    gLanguage = '';
+    // TODO: clear all non predefined macros.
+    // There's no such macro /yet/ but we're planning to have some...
+  }
+
+
+  /**
+   * Get rules for plural forms (shared with JetPack), see:
+   * http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
+   * https://github.com/mozilla/addon-sdk/blob/master/python-lib/plural-rules-generator.p
+   *
+   * @param {string} lang
+   *    locale (language) used.
+   *
+   * @return {Function}
+   *    returns a function that gives the plural form name for a given integer:
+   *       var fun = getPluralRules('en');
+   *       fun(1)    -> 'one'
+   *       fun(0)    -> 'other'
+   *       fun(1000) -> 'other'.
+   */
+
+  function getPluralRules(lang) {
+    var locales2rules = {
+      'af': 3,
+      'ak': 4,
+      'am': 4,
+      'ar': 1,
+      'asa': 3,
+      'az': 0,
+      'be': 11,
+      'bem': 3,
+      'bez': 3,
+      'bg': 3,
+      'bh': 4,
+      'bm': 0,
+      'bn': 3,
+      'bo': 0,
+      'br': 20,
+      'brx': 3,
+      'bs': 11,
+      'ca': 3,
+      'cgg': 3,
+      'chr': 3,
+      'cs': 12,
+      'cy': 17,
+      'da': 3,
+      'de': 3,
+      'dv': 3,
+      'dz': 0,
+      'ee': 3,
+      'el': 3,
+      'en': 3,
+      'eo': 3,
+      'es': 3,
+      'et': 3,
+      'eu': 3,
+      'fa': 0,
+      'ff': 5,
+      'fi': 3,
+      'fil': 4,
+      'fo': 3,
+      'fr': 5,
+      'fur': 3,
+      'fy': 3,
+      'ga': 8,
+      'gd': 24,
+      'gl': 3,
+      'gsw': 3,
+      'gu': 3,
+      'guw': 4,
+      'gv': 23,
+      'ha': 3,
+      'haw': 3,
+      'he': 2,
+      'hi': 4,
+      'hr': 11,
+      'hu': 0,
+      'id': 0,
+      'ig': 0,
+      'ii': 0,
+      'is': 3,
+      'it': 3,
+      'iu': 7,
+      'ja': 0,
+      'jmc': 3,
+      'jv': 0,
+      'ka': 0,
+      'kab': 5,
+      'kaj': 3,
+      'kcg': 3,
+      'kde': 0,
+      'kea': 0,
+      'kk': 3,
+      'kl': 3,
+      'km': 0,
+      'kn': 0,
+      'ko': 0,
+      'ksb': 3,
+      'ksh': 21,
+      'ku': 3,
+      'kw': 7,
+      'lag': 18,
+      'lb': 3,
+      'lg': 3,
+      'ln': 4,
+      'lo': 0,
+      'lt': 10,
+      'lv': 6,
+      'mas': 3,
+      'mg': 4,
+      'mk': 16,
+      'ml': 3,
+      'mn': 3,
+      'mo': 9,
+      'mr': 3,
+      'ms': 0,
+      'mt': 15,
+      'my': 0,
+      'nah': 3,
+      'naq': 7,
+      'nb': 3,
+      'nd': 3,
+      'ne': 3,
+      'nl': 3,
+      'nn': 3,
+      'no': 3,
+      'nr': 3,
+      'nso': 4,
+      'ny': 3,
+      'nyn': 3,
+      'om': 3,
+      'or': 3,
+      'pa': 3,
+      'pap': 3,
+      'pl': 13,
+      'ps': 3,
+      'pt': 3,
+      'rm': 3,
+      'ro': 9,
+      'rof': 3,
+      'ru': 11,
+      'rwk': 3,
+      'sah': 0,
+      'saq': 3,
+      'se': 7,
+      'seh': 3,
+      'ses': 0,
+      'sg': 0,
+      'sh': 11,
+      'shi': 19,
+      'sk': 12,
+      'sl': 14,
+      'sma': 7,
+      'smi': 7,
+      'smj': 7,
+      'smn': 7,
+      'sms': 7,
+      'sn': 3,
+      'so': 3,
+      'sq': 3,
+      'sr': 11,
+      'ss': 3,
+      'ssy': 3,
+      'st': 3,
+      'sv': 3,
+      'sw': 3,
+      'syr': 3,
+      'ta': 3,
+      'te': 3,
+      'teo': 3,
+      'th': 0,
+      'ti': 4,
+      'tig': 3,
+      'tk': 3,
+      'tl': 4,
+      'tn': 3,
+      'to': 0,
+      'tr': 0,
+      'ts': 3,
+      'tzm': 22,
+      'uk': 11,
+      'ur': 3,
+      've': 3,
+      'vi': 0,
+      'vun': 3,
+      'wa': 4,
+      'wae': 3,
+      'wo': 0,
+      'xh': 3,
+      'xog': 3,
+      'yo': 0,
+      'zh': 0,
+      'zu': 3
+    };
+
+    // utility functions for plural rules methods
+    function isIn(n, list) {
+      return list.indexOf(n) !== -1;
+    }
+    function isBetween(n, start, end) {
+      return start <= n && n <= end;
+    }
+
+    // list of all plural rules methods:
+    // map an integer to the plural form name to use
+    var pluralRules = {
+      '0': function(n) {
+        return 'other';
+      },
+      '1': function(n) {
+        if ((isBetween((n % 100), 3, 10)))
+          return 'few';
+        if (n === 0)
+          return 'zero';
+        if ((isBetween((n % 100), 11, 99)))
+          return 'many';
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '2': function(n) {
+        if (n !== 0 && (n % 10) === 0)
+          return 'many';
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '3': function(n) {
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '4': function(n) {
+        if ((isBetween(n, 0, 1)))
+          return 'one';
+        return 'other';
+      },
+      '5': function(n) {
+        if ((isBetween(n, 0, 2)) && n != 2)
+          return 'one';
+        return 'other';
+      },
+      '6': function(n) {
+        if (n === 0)
+          return 'zero';
+        if ((n % 10) == 1 && (n % 100) != 11)
+          return 'one';
+        return 'other';
+      },
+      '7': function(n) {
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '8': function(n) {
+        if ((isBetween(n, 3, 6)))
+          return 'few';
+        if ((isBetween(n, 7, 10)))
+          return 'many';
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '9': function(n) {
+        if (n === 0 || n != 1 && (isBetween((n % 100), 1, 19)))
+          return 'few';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '10': function(n) {
+        if ((isBetween((n % 10), 2, 9)) && !(isBetween((n % 100), 11, 19)))
+          return 'few';
+        if ((n % 10) == 1 && !(isBetween((n % 100), 11, 19)))
+          return 'one';
+        return 'other';
+      },
+      '11': function(n) {
+        if ((isBetween((n % 10), 2, 4)) && !(isBetween((n % 100), 12, 14)))
+          return 'few';
+        if ((n % 10) === 0 ||
+            (isBetween((n % 10), 5, 9)) ||
+            (isBetween((n % 100), 11, 14)))
+          return 'many';
+        if ((n % 10) == 1 && (n % 100) != 11)
+          return 'one';
+        return 'other';
+      },
+      '12': function(n) {
+        if ((isBetween(n, 2, 4)))
+          return 'few';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '13': function(n) {
+        if ((isBetween((n % 10), 2, 4)) && !(isBetween((n % 100), 12, 14)))
+          return 'few';
+        if (n != 1 && (isBetween((n % 10), 0, 1)) ||
+            (isBetween((n % 10), 5, 9)) ||
+            (isBetween((n % 100), 12, 14)))
+          return 'many';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '14': function(n) {
+        if ((isBetween((n % 100), 3, 4)))
+          return 'few';
+        if ((n % 100) == 2)
+          return 'two';
+        if ((n % 100) == 1)
+          return 'one';
+        return 'other';
+      },
+      '15': function(n) {
+        if (n === 0 || (isBetween((n % 100), 2, 10)))
+          return 'few';
+        if ((isBetween((n % 100), 11, 19)))
+          return 'many';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '16': function(n) {
+        if ((n % 10) == 1 && n != 11)
+          return 'one';
+        return 'other';
+      },
+      '17': function(n) {
+        if (n == 3)
+          return 'few';
+        if (n === 0)
+          return 'zero';
+        if (n == 6)
+          return 'many';
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '18': function(n) {
+        if (n === 0)
+          return 'zero';
+        if ((isBetween(n, 0, 2)) && n !== 0 && n != 2)
+          return 'one';
+        return 'other';
+      },
+      '19': function(n) {
+        if ((isBetween(n, 2, 10)))
+          return 'few';
+        if ((isBetween(n, 0, 1)))
+          return 'one';
+        return 'other';
+      },
+      '20': function(n) {
+        if ((isBetween((n % 10), 3, 4) || ((n % 10) == 9)) && !(
+            isBetween((n % 100), 10, 19) ||
+            isBetween((n % 100), 70, 79) ||
+            isBetween((n % 100), 90, 99)
+            ))
+          return 'few';
+        if ((n % 1000000) === 0 && n !== 0)
+          return 'many';
+        if ((n % 10) == 2 && !isIn((n % 100), [12, 72, 92]))
+          return 'two';
+        if ((n % 10) == 1 && !isIn((n % 100), [11, 71, 91]))
+          return 'one';
+        return 'other';
+      },
+      '21': function(n) {
+        if (n === 0)
+          return 'zero';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '22': function(n) {
+        if ((isBetween(n, 0, 1)) || (isBetween(n, 11, 99)))
+          return 'one';
+        return 'other';
+      },
+      '23': function(n) {
+        if ((isBetween((n % 10), 1, 2)) || (n % 20) === 0)
+          return 'one';
+        return 'other';
+      },
+      '24': function(n) {
+        if ((isBetween(n, 3, 10) || isBetween(n, 13, 19)))
+          return 'few';
+        if (isIn(n, [2, 12]))
+          return 'two';
+        if (isIn(n, [1, 11]))
+          return 'one';
+        return 'other';
+      }
+    };
+
+    // return a function that gives the plural form name for a given integer
+    var index = locales2rules[lang.replace(/-.*$/, '')];
+    if (!(index in pluralRules)) {
+      consoleWarn('plural form unknown for [' + lang + ']');
+      return function() { return 'other'; };
+    }
+    return pluralRules[index];
+  }
+
+  // pre-defined 'plural' macro
+  gMacros.plural = function(str, param, key, prop) {
+    var n = parseFloat(param);
+    if (isNaN(n))
+      return str;
+
+    // TODO: support other properties (l20n still doesn't...)
+    if (prop != gTextProp)
+      return str;
+
+    // initialize _pluralRules
+    if (!gMacros._pluralRules)
+      gMacros._pluralRules = getPluralRules(gLanguage);
+    var index = '[' + gMacros._pluralRules(n) + ']';
+
+    // try to find a [zero|one|two] key if it's defined
+    if (n === 0 && (key + '[zero]') in gL10nData) {
+      str = gL10nData[key + '[zero]'][prop];
+    } else if (n == 1 && (key + '[one]') in gL10nData) {
+      str = gL10nData[key + '[one]'][prop];
+    } else if (n == 2 && (key + '[two]') in gL10nData) {
+      str = gL10nData[key + '[two]'][prop];
+    } else if ((key + index) in gL10nData) {
+      str = gL10nData[key + index][prop];
+    }
+
+    return str;
+  };
+
+
+  /**
+   * l10n dictionary functions
+   */
+
+  // fetch an l10n object, warn if not found, apply `args' if possible
+  function getL10nData(key, args, fallback) {
+    var data = gL10nData[key];
+    if (!data) {
+      consoleWarn('#' + key + ' missing for [' + gLanguage + ']');
+      if (!fallback) {
+        return null;
+      }
+      data = fallback;
+    }
+
+    /** This is where l10n expressions should be processed.
+      * The plan is to support C-style expressions from the l20n project;
+      * until then, only two kinds of simple expressions are supported:
+      *   {[ index ]} and {{ arguments }}.
+      */
+    var rv = {};
+    for (var prop in data) {
+      var str = data[prop];
+      str = substIndexes(str, args, key, prop);
+      str = substArguments(str, args);
+      rv[prop] = str;
+    }
+    return rv;
+  }
+
+  // replace {[macros]} with their values
+  function substIndexes(str, args, key, prop) {
+    var reIndex = /\{\[\s*([a-zA-Z]+)\(([a-zA-Z]+)\)\s*\]\}/;
+    var reMatch = reIndex.exec(str);
+    if (!reMatch || !reMatch.length)
+      return str;
+
+    // an index/macro has been found
+    // Note: at the moment, only one parameter is supported
+    var macroName = reMatch[1];
+    var paramName = reMatch[2];
+    var param;
+    if (args && paramName in args) {
+      param = args[paramName];
+    } else if (paramName in gL10nData) {
+      param = gL10nData[paramName];
+    }
+
+    // there's no macro parser yet: it has to be defined in gMacros
+    if (macroName in gMacros) {
+      var macro = gMacros[macroName];
+      str = macro(str, param, key, prop);
+    }
+    return str;
+  }
+
+  // replace {{arguments}} with their values
+  function substArguments(str, args) {
+    var reArgs = /\{\{\s*([a-zA-Z\.]+)\s*\}\}/;
+    var match = reArgs.exec(str);
+    while (match) {
+      if (!match || match.length < 2)
+        return str; // argument key not found
+
+      var arg = match[1];
+      var sub = '';
+      if (arg in args) {
+        sub = args[arg];
+      } else if (arg in gL10nData) {
+        sub = gL10nData[arg][gTextProp];
+      } else {
+        consoleWarn('could not find argument {{' + arg + '}}');
+        return str;
+      }
+
+      str = str.substring(0, match.index) + sub +
+            str.substr(match.index + match[0].length);
+      match = reArgs.exec(str);
+    }
+    return str;
+  }
+
+  // translate an HTML element
+  function translateElement(element) {
+    var l10n = getL10nAttributes(element);
+    if (!l10n.id)
+      return;
+
+    // get the related l10n object
+    var data = getL10nData(l10n.id, l10n.args);
+    if (!data) {
+      consoleWarn('#' + l10n.id + ' missing for [' + gLanguage + ']');
+      return;
+    }
+
+    // translate element (TODO: security checks?)
+    // for the node content, replace the content of the first child textNode
+    // and clear other child textNodes
+    if (data[gTextProp]) { // XXX
+      if (element.children.length === 0) {
+        element[gTextProp] = data[gTextProp];
+      } else {
+        var children = element.childNodes,
+            found = false;
+        for (var i = 0, l = children.length; i < l; i++) {
+          if (children[i].nodeType === 3 &&
+              /\S/.test(children[i].textContent)) { // XXX
+            // using nodeValue seems cross-browser
+            if (found) {
+              children[i].nodeValue = '';
+            } else {
+              children[i].nodeValue = data[gTextProp];
+              found = true;
+            }
+          }
+        }
+        if (!found) {
+          consoleWarn('unexpected error, could not translate element content');
+        }
+      }
+      delete data[gTextProp];
+    }
+
+    for (var k in data) {
+      element[k] = data[k];
+    }
+  }
+
+  // translate an HTML subtree
+  function translateFragment(element) {
+    element = element || document.documentElement;
+
+    // check all translatable children (= w/ a `data-l10n-id' attribute)
+    var children = getTranslatableChildren(element);
+    var elementCount = children.length;
+    for (var i = 0; i < elementCount; i++) {
+      translateElement(children[i]);
+    }
+
+    // translate element itself if necessary
+    translateElement(element);
+  }
+
+  // cross-browser API (sorry, oldIE doesn't support getters & setters)
+  return {
+    // get a localized string
+    get: function(key, args, fallback) {
+      var data = getL10nData(key, args, {textContent: fallback});
+      if (data) { // XXX double-check this
+        return 'textContent' in data ? data.textContent : '';
+      }
+      return '{{' + key + '}}';
+    },
+
+    // debug
+    getData: function() { return gL10nData; },
+    getText: function() { return gTextData; },
+
+    // get|set the document language
+    getLanguage: function() { return gLanguage; },
+    setLanguage: function(lang) { loadLocale(lang, translateFragment); },
+
+    // get the direction (ltr|rtl) of the current language
+    getDirection: function() {
+      // http://www.w3.org/International/questions/qa-scripts
+      // Arabic, Hebrew, Farsi, Pashto, Urdu
+      var rtlList = ['ar', 'he', 'fa', 'ps', 'ur'];
+      return (rtlList.indexOf(gLanguage) >= 0) ? 'rtl' : 'ltr';
+    },
+
+    // translate an element or document fragment
+    translate: translateFragment,
+
+    // this can be used to prevent race conditions
+    getReadyState: function() { return gReadyState; }
+  };
+
+}) (window, document);
diff --git a/common/static/js/vendor/pdfjs/locale/ar/viewer.properties b/common/static/js/vendor/pdfjs/locale/ar/viewer.properties
new file mode 100644
index 0000000000..954436ef97
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/ar/viewer.properties
@@ -0,0 +1,111 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=الصفحة السابقة
+previous_label=السابق
+next.title=الصفحة التاليه
+next_label=التالي
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=الصفحة:
+page_of=من {{pageCount}}
+
+zoom_out.title=تصغير
+zoom_out_label=تصغير
+zoom_in.title=تكبير
+zoom_in_label=تكبير
+zoom.title=التكبير
+print.title=طباعة
+print_label=طباعة
+fullscreen.title=ملء الشاشة
+fullscreen_label=ملء الشاشة
+open_file.title=فتح الملف
+open_file_label=فتح
+download.title=تحميل
+download_label=تحميل
+bookmark.title=المشهد الحالي (نسخ أو فتح في نافذة جديدة)
+bookmark_label=المشهد الحالي
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_slider.title=تبديل الزلاق
+toggle_slider_label=تبديل الزلاق
+outline.title=إظهار ملخص المستند
+outline_label=ملخص المستند
+thumbs.title=إظهار الصور المصغرة
+thumbs_label=الصور المصغرة
+findbar.title=البحث في المستند
+findbar_label=بحث
+
+# Document outline messages
+no_outline=لا يوجد ملخص
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=الصفحة {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=صورة مصغرة من الصفحة {{page}}
+
+# Context menu
+page_rotate_cw.label=تدوير مع عقارب الساعة
+page_rotate_ccw.label=تدوير عكس عقارب الساعة
+
+# Find panel button title and messages
+find=بحث
+find_terms_not_found=(لا يوجد)
+
+# Error panel labels
+error_more_info=مزيد من المعلومات
+error_less_info=معلومات أقل
+error_close=إغلاق
+# LOCALIZATION NOTE (error_build): "{{build}}" will be replaced by the PDF.JS
+# build ID.
+error_build=بناء PDF.JS: {{build}}
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=رسالة: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=المكدس: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=الملف: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=السطر: {{line}}
+rendering_error=حدث خطأ اثناء رسم الصفحة.
+
+# Predefined zoom values
+page_scale_width=عرض الصفحة
+page_scale_fit=تناسب الصفحة
+page_scale_auto=تقريب تلقائي
+page_scale_actual=الحجم الحقيقي
+
+# Loading indicator messages
+loading_error_indicator=خطأ
+loading_error=حدث خطأ أثناء تحميل وثيقه الـPDF
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[ملاحظة {{type}}]
+request_password=الـPDF محمي بكلمة مرور:
+
+printing_not_supported=تحذير: الطباعة ليست مدعومة كليًا في هذا المتصفح.
diff --git a/common/static/js/vendor/pdfjs/locale/ca/viewer.properties b/common/static/js/vendor/pdfjs/locale/ca/viewer.properties
new file mode 100644
index 0000000000..639577e0ba
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/ca/viewer.properties
@@ -0,0 +1,127 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Pàgina anterior
+previous_label=Anterior
+next.title=Pàgina següent
+next_label=Següent
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Pàgina:
+page_of=de {{pageCount}}
+
+zoom_out.title=Reduir
+zoom_out_label=Reduir
+zoom_in.title=Ampliar
+zoom_in_label=Ampliar
+zoom.title=Ampliació
+print.title=Imprimir
+print_label=Imprimir
+fullscreen.title=Pantalla completa
+fullscreen_label=Pantalla completa
+presentation_mode.title=Canviar a mode de Presentació
+presentation_mode_label=Mode de Presentació
+open_file.title=Obrir arxiu
+open_file_label=Obrir
+download.title=Descarregar
+download_label=Descarregar
+bookmark.title=Vista actual (copiï o obri en una finestra nova)
+bookmark_label=Vista actual
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_slider.title=Alternar lliscador
+toggle_slider_label=Alternar lliscador
+outline.title=Mostrar esquema del document
+outline_label=Esquema del document
+thumbs.title=Mostrar miniatures
+thumbs_label=Miniatures
+findbar.title=Cercar en el document
+findbar_label=Cercar
+
+# Document outline messages
+no_outline=No hi ha cap esquema disponible
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Pàgina {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Miniatura de la pàgina {{page}}
+
+# Find panel button title and messages
+find=Cercar
+find_terms_not_found=(No trobat)
+# Context menu
+first_page.label=Primera pàgina
+last_page.label=Darrera pàgina
+page_rotate_cw.label=Rotar sentit horari
+page_rotate_ccw.label=Rotar sentit anti-horari
+
+# Find panel button title and messages
+find_label=Cerca:
+find_previous.title=Trobar ocurrència anterior
+find_previous_label=Previ
+find_next.title=Trobar ocurrència posterior
+find_next_label=Següent
+find_highlight=Contrastar tot
+find_match_case_label=Majúscules i minúscules
+find_wrapped_to_bottom=Part superior assolida, continu a la part inferior
+find_wrapped_to_top=Final de pàgina finalitzada, continu a la part superior
+find_not_found=Frase no trobada
+
+# Error panel labels
+error_more_info=Més informació
+error_less_info=Menys informació
+error_close=Tancar
+# LOCALIZATION NOTE (error_build): "{{build}}" will be replaced by the PDF.JS
+# build ID.
+error_build=Compilació de PDF.JS: {{build}}
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Missatge: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Pila: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Arxiu: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Línia: {{line}}
+rendering_error=Ha ocurregut un error mentre es renderitzava la pàgina.
+
+# Predefined zoom values
+page_scale_width=Ample de pàgina
+page_scale_fit=Ajustar a la pàgina
+page_scale_auto=Ampliació automàtica
+page_scale_actual=Tamany real
+
+# Loading indicator messages
+loading_error_indicator=Error
+loading_error=Ha ocorregut un error mentres es carregava el PDF.
+invalid_file_error=Invàlid o fitxer PDF corrupte.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[Anotació {{type}}]
+request_password=El PDF està protegit amb una contrasenya:
+
+printing_not_supported=Avís: La impressió no és compatible totalment en aquest navegador.
diff --git a/common/static/js/vendor/pdfjs/locale/cs/viewer.properties b/common/static/js/vendor/pdfjs/locale/cs/viewer.properties
new file mode 100644
index 0000000000..629480f570
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/cs/viewer.properties
@@ -0,0 +1,59 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bookmark.title=Aktuální zobrazení(zkopírovat nebo otevřít v novém okně)
+previous.title=Předchozí stránka
+next.title=Další stránka
+print.title=Tisk
+download.title=Stáhnout
+zoom_out.title=Zmenšit
+zoom_in.title=Zvětšit
+error_more_info=Více informací
+error_less_info=Méně informací
+error_close=Zavřít
+error_build=PDF.JS Build: {{build}}
+error_message=Zpráva:{{message}}
+error_stack=Stack:{{stack}}
+error_file=Soubor:{{file}}
+error_line=Řádek:{{line}}
+page_scale_width=Šířka stránky
+page_scale_fit=Stránka
+page_scale_auto=Automatické přibližení
+page_scale_actual=Skutečná velikost
+toggle_slider.title=Přepnout posuvník
+thumbs.title=Zobrazit náhledy
+outline.title=Zobrazit osnovu dokumentu
+loading=Načítám... {{percent}}%
+loading_error_indicator=Chyba
+loading_error=Došlo k chybě při načítání PDF.
+rendering_error=Došlo k chybě při vykreslování stránky.
+page_label=Stránka:
+page_of=z{{pageCount}}
+no_outline=Žádné osnovy k dispozici
+open_file.title=Otevřít soubor
+text_annotation_type=[{{type}}Anotace]
+toggle_slider_label=Přepnout posuvník
+thumbs_label=Náhledy
+outline_label=Přehled dokumentu
+bookmark_label=Aktuální zobrazení
+previous_label=Předchozí
+next_label=Další
+print_label=Tisk
+download_label=Stáhnout
+zoom_out_label=Zmenšit
+zoom_in_label=Přiblížit
+zoom.title=Zvětšit
+thumb_page_title=Stránka{{page}}
+thumb_page_canvas=Náhled stránky {{page}}
+request_password=PDF je chráněn heslem:
diff --git a/common/static/js/vendor/pdfjs/locale/da/viewer.properties b/common/static/js/vendor/pdfjs/locale/da/viewer.properties
new file mode 100644
index 0000000000..c710189ace
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/da/viewer.properties
@@ -0,0 +1,107 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Værktøjslinje knapper (tooltups og billedtekster)
+previous.title=Forrige
+previous_label=Forrige
+next.title=Næste
+next_label=Næste
+
+# Oversættelsesnote:
+# Disse tekststrenge bliver sammensat i formen "Side: X af Y"
+# Oversæt ikke "{{pageCount}}", det er en variabel og vil blive erstattet
+# med det egentlig antal sider i PDF filen
+page_label=Side:
+page_of=af {{pageCount}}
+
+zoom_out.title=Zoom ud
+zoom_out_label=Zoom ud
+zoom_in.title=Zoom ind
+zoom_in_label=Zoom ind
+zoom.title=Zoom
+print_label=Udskriv
+print.title=Udskriv
+fullscreen.title=Fuldskærm
+fullscreen_label=Fuldskærm
+open_file.title=Åbn fil
+open_file_label=Åbn
+download.title=Hent
+download_label=Hent
+bookmark.title=Aktuel visning (kopier eller åbn i et nyt vindue)
+bookmark_label=Aktuel visning
+
+# Tooltips of alternativ billedtekst til sidepanelet
+# (_label strengene er den alternative billedtekst, mens .title
+# strengene er tooltips
+toggle_slider.title=Skift slider
+toggle_slider_label=Skift slider
+outline.title=Vis dokumentoversigt
+outline_label=Dokumentoversigt
+thumbs.title=Vis thumbnails
+thumbs_label=Thumbnails
+findbar.title=Søg i dokumentet
+findbar_label=Søg
+
+# Dokumentoversigtsbeskeder
+no_outline=Ingen dokumentoversigt tilgængelig
+
+# Thumbnails panelet (tooltips og alt. billedtekst)
+# Oversættelsesnote: "{{page}}" vil blive erstattet af det
+# egentlige sidetal
+thumb_page_title=Side {{page}}
+# Oversættelsesnote: "{{page}}" vil blive erstattet af det
+# egentlige sidetal
+thumb_page_canvas=Thumbnail af side {{page}}
+
+# Søgepanelet
+find=Søg
+find_terms_not_found=(Ikke fundet)
+
+# Fejlpanel
+error_more_info=Mere information
+error_less_info=Mindre information
+error_close=Luk
+# Oversættelsesnote: "{{build}}" vil blive erstattet af PDF.JS build nummer
+#
+error_build=PDF.JS Build: {{build}}
+# Oversættelsesnote: "{{message}}" vil blive erstattet af en (engelsk) fejlbesked
+#
+error_message=Besked: {{message}}
+# Oversættelsesnote: "{{stack}}" vil blive erstattet af et stack trace
+#
+error_stack=Stak: {{stack}}
+# Oversættelsesnote: "{{file}}" vil blive erstattet af et filnavn
+error_file=Fil: {{file}}
+# Oversættelsesnote: "{{line}}" vil blive erstattet af et linjetal
+error_line=Linje: {{line}}
+rendering_error=Der skete en fejl under gengivelsen af PDF-filen
+
+# Prædefinerede zoom værdier
+page_scale_width=Sidebredde
+page_scale_fit=Helside
+page_scale_auto=Automatisk zoom
+page_scale_actual=Faktisk størrelse
+
+# Indlæsningsindikator (load ikon)
+loading_error_indicator=Fejl
+loading_error=Der skete en fejl under indlæsningen af PDF-filen
+
+# Oversættelsesnote: Dette vil blive brugt som et tooltip
+# "{{type}}" vil blive ersattet af en kommentar type fra en liste
+# defineret i PDF specifikationen (32000-1:2008 Table 169 – Annotation types).
+# Nogle almindelige typer er f.eks.: "Check", "Text", "Comment" og "Note"
+text_annotation_type=[{{type}} Kommentar]
+request_password=PDF filen er beskyttet med et kodeord:
+
+printing_not_supported=Advarsel: Denne browser er ikke fuldt understøttet ved udskrift
diff --git a/common/static/js/vendor/pdfjs/locale/de/viewer.properties b/common/static/js/vendor/pdfjs/locale/de/viewer.properties
new file mode 100644
index 0000000000..0e37c01ff4
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/de/viewer.properties
@@ -0,0 +1,123 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Eine Seite zurück
+previous_label=Zurück
+next.title=Eine Seite vor
+next_label=Vor
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Seite:
+page_of=von {{pageCount}}
+
+zoom_out.title=Verkleinern
+zoom_out_label=Verkleinern
+zoom_in.title=Vergrößern
+zoom_in_label=Vergrößern
+zoom.title=Zoom
+print.title=Drucken
+print_label=Drucken
+presentation_mode.title=Zum Präsentationsmodus wechseln
+presentation_mode_label=Bildschirmpräsentation
+open_file.title=Datei öffnen
+open_file_label=Öffnen
+download.title=Herunterladen
+download_label=Herunterladen
+bookmark.title=Aktuelle Ansicht (Kopieren oder in einem neuen Fenster öffnen)
+bookmark_label=Aktuelle Ansicht
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_slider.title=Seitenleiste anzeigen
+toggle_slider_label=Seitenleiste
+outline.title=Zeige Inhaltsverzeichnis
+outline_label=Inhaltsverzeichnis
+thumbs.title=Zeige Vorschaubilder
+thumbs_label=Vorschaubilder
+findbar.title=Im Dokument suchen
+findbar_label=Suchen
+
+# Document outline messages
+no_outline=Kein Inhaltsverzeichnis verfügbar
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Seite {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Vorschau von Seite {{page}}
+
+# Context menu
+first_page.label=Erste Seite
+last_page.label=Letzte Seite
+page_rotate_cw.label=Im Uhrzeigersinn drehen
+page_rotate_ccw.label=Entgegen dem Uhrzeigersinn drehen
+
+# Find panel button title and messages
+find_label=Suchen:
+find_previous.title=Das vorherige Auftreten des Ausdrucks suchen
+find_previous_label=Aufwärts
+find_next.title=Das nächste Auftreten des Ausdrucks suchen
+find_next_label=Abwärts
+find_highlight=Hervorheben
+find_match_case_label=Groß-/Kleinschreibung
+find_reached_top=Der Anfang des Dokuments wurde erreicht, Suche am Ende des Dokuments fortgesetzt
+find_reached_bottom=Das Ende des Dokuments wurde erreicht, Suche am Anfang des Dokuments fortgesetzt
+find_not_found=Ausdruck nicht gefunden
+
+# Error panel labels
+error_more_info=Mehr Info
+error_less_info=Weniger Info
+error_close=Schließen
+# LOCALIZATION NOTE (error_build): "{{build}}" will be replaced by the PDF.JS
+# build ID.
+error_build=PDF.JS Build: {{build}}
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Nachricht: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Stack: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Datei: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Zeile: {{line}}
+rendering_error=Das PDF konnte nicht angezeigt werden.
+
+# Predefined zoom values
+page_scale_width=Seitenbreite
+page_scale_fit=Ganze Seite
+page_scale_auto=Automatisch
+page_scale_actual=Originalgröße
+
+# Loading indicator messages
+loading_error_indicator=Fehler
+loading_error=Das PDF konnte nicht geladen werden.
+invalid_file_error=Ungültige oder beschädigte PDF-Datei.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[{{type}} Annotation]
+request_password=Das PDF ist passwortgeschützt:
+
+printing_not_supported=Warnung: Drucken wird durch diesen Browser nicht vollständig unterstützt.
+web_fonts_disabled=Webfonts sind deaktiviert: Eingebundene PDF-Schriftarten können nicht verwendet werden.
diff --git a/common/static/js/vendor/pdfjs/locale/en-US/viewer.properties b/common/static/js/vendor/pdfjs/locale/en-US/viewer.properties
new file mode 100644
index 0000000000..e3517cd46a
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/en-US/viewer.properties
@@ -0,0 +1,124 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Previous Page
+previous_label=Previous
+next.title=Next Page
+next_label=Next
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Page:
+page_of=of {{pageCount}}
+
+zoom_out.title=Zoom Out
+zoom_out_label=Zoom Out
+zoom_in.title=Zoom In
+zoom_in_label=Zoom In
+zoom.title=Zoom
+print.title=Print
+print_label=Print
+presentation_mode.title=Switch to Presentation Mode
+presentation_mode_label=Presentation Mode
+open_file.title=Open File
+open_file_label=Open
+download.title=Download
+download_label=Download
+bookmark.title=Current view (copy or open in new window)
+bookmark_label=Current View
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_sidebar.title=Toggle Sidebar
+toggle_sidebar_label=Toggle Sidebar
+outline.title=Show Document Outline
+outline_label=Document Outline
+thumbs.title=Show Thumbnails
+thumbs_label=Thumbnails
+findbar.title=Find in Document
+findbar_label=Find
+
+# Document outline messages
+no_outline=No Outline Available
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Page {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Thumbnail of Page {{page}}
+
+# Context menu
+first_page.label=Go to First Page
+last_page.label=Go to Last Page
+page_rotate_cw.label=Rotate Clockwise
+page_rotate_ccw.label=Rotate Counterclockwise
+
+# Find panel button title and messages
+find_label=Find:
+find_previous.title=Find the previous occurrence of the phrase
+find_previous_label=Previous
+find_next.title=Find the next occurrence of the phrase
+find_next_label=Next
+find_highlight=Highlight all
+find_match_case_label=Match case
+find_reached_top=Reached top of document, continued from bottom
+find_reached_bottom=Reached end of document, continued from top
+find_not_found=Phrase not found
+
+# Error panel labels
+error_more_info=More Information
+error_less_info=Less Information
+error_close=Close
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (build: {{build}})
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Message: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Stack: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=File: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Line: {{line}}
+rendering_error=An error occurred while rendering the page.
+
+# Predefined zoom values
+page_scale_width=Page Width
+page_scale_fit=Page Fit
+page_scale_auto=Automatic Zoom
+page_scale_actual=Actual Size
+
+# Loading indicator messages
+loading_error_indicator=Error
+loading_error=An error occurred while loading the PDF.
+invalid_file_error=Invalid or corrupted PDF file.
+missing_file_error=Missing PDF file.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[{{type}} Annotation]
+request_password=PDF is protected by a password:
+
+printing_not_supported=Warning: Printing is not fully supported by this browser.
+web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
diff --git a/common/static/js/vendor/pdfjs/locale/es-MX/viewer.properties b/common/static/js/vendor/pdfjs/locale/es-MX/viewer.properties
new file mode 100644
index 0000000000..ebbcaf9b1b
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/es-MX/viewer.properties
@@ -0,0 +1,124 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Página anterior
+previous_label=Anterior
+next.title=Página siguiente
+next_label=Siguiente
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Página:
+page_of=of {{pageCount}}
+
+zoom_out.title=Reducir
+zoom_out_label=Reducir
+zoom_in.title=Aumentar
+zoom_in_label=Aumentar
+zoom.title=Tamaño
+print.title=Imprimir
+print_label=Imprimir
+presentation_mode.title=Cambiar al modo de presentación
+presentation_mode_label=Modo de presentación
+open_file.title=Abrir archivo
+open_file_label=Abrir
+download.title=Descargar
+download_label=Descargar
+bookmark.title=Vista actual (copiar o abrir en una nueva ventana)
+bookmark_label=Vista actual
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_sidebar.title=Activar barra lateral
+toggle_sidebar_label=Activar barra lateral
+outline.title=Mostrar el esquema del documento
+outline_label=Esquema del documento
+thumbs.title=Mostrar miniaturas
+thumbs_label=Miniaturas
+findbar.title=Buscar en el documento
+findbar_label=Buscar
+
+# Document outline messages
+no_outline=No hay esquema disponible
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Página {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Miniatura o página {{page}}
+
+# Context menu
+first_page.label=Ir a la primera página
+last_page.label=Ir a la última página
+page_rotate_cw.label=Girar hacia la derecha
+page_rotate_ccw.label=Girar hacia la izquierda
+
+# Find panel button title and messages
+find_label=Buscar:
+find_previous.title=Ir a la anterior frase encontrada
+find_previous_label=Anterior
+find_next.title=Ir a la siguiente frase encontrada
+find_next_label=Siguiente
+find_highlight=Marcar todo
+find_match_case_label=Coincidir con mayúsculas y minúsculas
+find_reached_top=Inicio del documento, se continúa desde el final
+find_reached_bottom=Final del documento, se continúa desde el inicio
+find_not_found=No se encontró la frase
+
+# Error panel labels
+error_more_info=Más información
+error_less_info=Menos información
+error_close=Cerrar
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (compilación: {{build}})
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Mensaje: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Pila: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Archivo: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Línea: {{line}}
+rendering_error=Ocurrió un error al interpretar la página.
+
+# Predefined zoom values
+page_scale_width=Ancho de página
+page_scale_fit=Ajustar a la página
+page_scale_auto=Ampliación automática
+page_scale_actual=Tamaño real
+
+# Loading indicator messages
+loading_error_indicator=Error
+loading_error=Ocurrió un error al cargar el PDF.
+invalid_file_error=Archivo PDF inválido o corrupto.
+missing_file_error=Archivo PDF faltante.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[Anotación {{type}}]
+request_password=El archivo PDF está protegido por contraseña:
+
+printing_not_supported=Advertencia: la impresión no está completamente soportada en este navegador.
+web_fonts_disabled=Las tipografías web están deshabilitadas: no es posible utilizar tipografías PDF incrustadas.
diff --git a/common/static/js/vendor/pdfjs/locale/es/viewer.properties b/common/static/js/vendor/pdfjs/locale/es/viewer.properties
new file mode 100644
index 0000000000..b4d8055d9f
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/es/viewer.properties
@@ -0,0 +1,107 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Página anterior
+previous_label=Anterior
+next.title=Página siguiente
+next_label=Siguiente
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Página:
+page_of=de {{pageCount}}
+
+zoom_out.title=Reducir
+zoom_out_label=Reducir
+zoom_in.title=Ampliar
+zoom_in_label=Ampliar
+zoom.title=Ampliación
+print.title=Imprimir
+print_label=Imprimir
+fullscreen.title=Pantalla completa
+fullscreen_label=Pantalla completa
+open_file.title=Abrir archivo
+open_file_label=Abrir
+download.title=Descargar
+download_label=Descargar
+bookmark.title=Vista actual (copie o abra en una ventana nueva)
+bookmark_label=Vista actual
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_slider.title=Alternar deslizador
+toggle_slider_label=Alternar deslizador
+outline.title=Mostrar esquema del documento
+outline_label=Esquema del documento
+thumbs.title=Mostrar miniaturas
+thumbs_label=Miniaturas
+findbar.title=Buscar en el documento
+findbar_label=Buscar
+
+# Document outline messages
+no_outline=No hay un esquema disponible
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Página {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Miniatura de la página {{page}}
+
+# Find panel button title and messages
+find=Buscar
+find_terms_not_found=(No encontrado)
+
+# Error panel labels
+error_more_info=Más información
+error_less_info=Menos información
+error_close=Cerrar
+# LOCALIZATION NOTE (error_build): "{{build}}" will be replaced by the PDF.JS
+# build ID.
+error_build=Compilación de PDF.JS: {{build}}
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Mensaje: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Pila: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Archivo: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Línea: {{line}}
+rendering_error=Ocurrió un error mientras se renderizaba la página.
+
+# Predefined zoom values
+page_scale_width=Anchura de página
+page_scale_fit=Ajustar a la página
+page_scale_auto=Ampliación automática
+page_scale_actual=Tamaño real
+
+# Loading indicator messages
+loading_error_indicator=Error
+loading_error=Ocurrió un error mientras se cargaba el PDF.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[Anotación {{type}}]
+request_password=El PDF está protegido con una contraseña:
+
+printing_not_supported=Aviso: La impresión no es compatible totalmente con este navegador.
diff --git a/common/static/js/vendor/pdfjs/locale/fi/viewer.properties b/common/static/js/vendor/pdfjs/locale/fi/viewer.properties
new file mode 100644
index 0000000000..077b5ea276
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/fi/viewer.properties
@@ -0,0 +1,108 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Edellinen sivu
+previous_label=Edellinen
+next.title=Seuraava sivu
+next_label=Seuraava
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Sivu:
+page_of=/ {{pageCount}}
+
+zoom_out.title=Suurenna
+zoom_out_label=Suurenna
+zoom_in.title=Pienennä
+zoom_in_label=Pienennä
+zoom.title=Sivun suurennus
+print.title=Tulosta
+print_label=Tulosta
+fullscreen.title=Kokoruututila
+fullscreen_label=Kokoruututila
+open_file.title=Avaa tiedosto
+open_file_label=Avaa
+download.title=Lataa
+download_label=Lataa
+bookmark.title=Nykyinen näkymä (kopioi tai avaa uuteen ikkunaan)
+bookmark_label=Nykyinen näkymä
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_slider.title=Vaihda vieritysnäkymä
+toggle_slider_label=Vaihda vieritysnäkymä
+outline.title=Näytä asiakirjan jäsennys
+outline_label=Asiakirjan jäsennys
+thumbs.title=Näytä esikatselukuvat
+thumbs_label=Esikatselukuvat
+findbar.title=Etsi asiakirjasta
+findbar_label=Etsi
+
+# Document outline messages
+no_outline=Jäsennystä ei ole tarjolla
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Sivu {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Sivun {{page}} esikatselukuva
+
+# Find panel button title and messages
+find=Etsi
+find_terms_not_found=(Ei löytynyt)
+
+# Error panel labels
+error_more_info=Enemmän tietoa
+error_less_info=Vähemmän tietoa
+error_close=Sulje
+# LOCALIZATION NOTE (error_build): "{{build}}" will be replaced by the PDF.JS
+# build ID.
+error_build=PDF.JS rakennus: {{build}}
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Viesti: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Kutsupino: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Tiedosto: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Rivi: {{line}}
+rendering_error=Virhe on tapahtunut sivua mallintaessa.
+
+# Predefined zoom values
+page_scale_width=Sivun leveys
+page_scale_fit=Sivun sovitus
+page_scale_auto=Automaatinen sivun suurennus
+page_scale_actual=Todellinen koko
+
+# Loading indicator messages
+loading_error_indicator=Virhe
+loading_error=Virhe on tapahtunut PDF:ää ladattaessa.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[{{type}} Selite]
+request_password=PDF on salasanasuojattu:
+
+printing_not_supported=Varoitus: Tämä selain ei täysin tue tulostusta.
+
diff --git a/common/static/js/vendor/pdfjs/locale/fr/viewer.properties b/common/static/js/vendor/pdfjs/locale/fr/viewer.properties
new file mode 100644
index 0000000000..1c9abfc394
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/fr/viewer.properties
@@ -0,0 +1,71 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+previous.title=Page précédente
+previous_label=Précédent
+next.title=Page suivante
+next_label=Suivant
+page_label=Page :
+page_of=sur {{pageCount}}
+zoom_out.title=Zoom arrière
+zoom_out_label=Zoom arrière
+zoom_in.title=Zoom avant
+zoom_in_label=Zoom avant
+zoom.title=Zoom
+print.title=Imprimer
+print_label=Imprimer
+presentation_mode.title=Basculer en mode présentation
+presentation_mode_label=Mode présentation
+open_file.title=Ouvrir le fichier
+open_file_label=Ouvrir
+download.title=Télécharger
+download_label=Télécharger
+bookmark.title=Affichage courant (copier ou ouvrir dans une nouvelle fenêtre)
+bookmark_label=Affichage actuel
+toggle_slider.title=Afficher/masquer le panneau latéral
+toggle_slider_label=Afficher/masquer le panneau latéral
+outline.title=Afficher les signets
+outline_label=Signets du document
+thumbs.title=Afficher les vignettes
+thumbs_label=Vignettes
+findbar.title=Rechercher dans le document
+findbar_label=Rechercher
+no_outline=Aucun signet disponible
+thumb_page_title=Page {{page}}
+thumb_page_canvas=Vignette de la page {{page}}
+first_page.label=Aller à la première page
+last_page.label=Aller à la dernière page
+page_rotate_cw.label=Rotation horaire
+page_rotate_ccw.label=Rotation anti-horaire
+
+# Find panel button title and messages
+find_label=Rechercher :
+find_previous.title=Trouver l'occurrence précédente de la phrase
+find_previous_label=Précédent
+find_next.title=Trouver la prochaine occurrence de la phrase
+find_next_label=Suivant
+find_highlight=Tout surligner
+find_match_case_label=Respecter la casse
+find_wrapped_to_bottom=Bas de la page atteint, poursuite depuis la fin
+find_wrapped_to_top=Bas de la page atteint, poursuite au début
+find_not_found=Phrase introuvable
+
+error_more_info=Plus d'informations
+error_less_info=Moins d'informations
+error_close=Fermer
+error_build=Version de PDF.JS : {{build}}
+error_message=Message : {{message}}
+error_stack=Pile : {{stack}}
+error_file=Fichier : {{file}}
+error_line=Ligne : {{line}}
+rendering_error=Une erreur s'est produite lors de l'affichage de la page.
+page_scale_width=Pleine largeur
+page_scale_fit=Page entière
+page_scale_auto=Zoom automatique
+page_scale_actual=Taille réelle
+loading_error_indicator=Erreur
+loading_error=Une erreur s'est produite lors du chargement du fichier PDF.
+text_annotation_type=[Annotation {{type}}]
+request_password=Le PDF est protégé par un mot de passe :
+printing_not_supported=Attention : l'impression n'est pas totalement prise en charge par ce navigateur.
diff --git a/common/static/js/vendor/pdfjs/locale/he/viewer.properties b/common/static/js/vendor/pdfjs/locale/he/viewer.properties
new file mode 100644
index 0000000000..6073521747
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/he/viewer.properties
@@ -0,0 +1,60 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bookmark.title=דף נוכחי (העתקה או פתיחה בחלון חדש)
+previous.title=דף קודם
+next.title=דף הבא
+print.title=הדפסה
+download.title=הורדה
+zoom_out.title=התרחקות
+zoom_in.title=התקרבות
+error_more_info=יותר מידע
+error_less_info=פחות מידע
+error_close=סגירה
+error_build=בניית PDF.JS‏: {{build}}
+error_message=הודעה: {{message}}
+error_stack=מחסנית: {{stack}}
+error_file=קובץ: {{file}}
+error_line=שורה: {{line}}
+page_scale_width=רוחב דף
+page_scale_fit=גודל דף
+page_scale_auto=התקרבות אוטומטית
+page_scale_actual=גודל אמיתי
+toggle_slider.title=מתג החלקה
+thumbs.title=הצגת תמונות ממוזערות
+outline.title=הצגת מתאר מסמך
+loading=בטעינה... {{percent}}%
+loading_error_indicator=שגיאה
+loading_error=אירעה שגיאה בעת טעינת קובץ PDF.
+rendering_error=אירעה שגיאה בעת עיבוד הדף.
+page_label=דף:
+page_of=מתוך {{pageCount}}
+no_outline=אין מתאר זמין
+open_file.title=פתיחת קובץ
+text_annotation_type=[{{type}} Annotation]
+toggle_slider_label=מתג החלקה
+thumbs_label=תמונות ממוזערות
+outline_label=מתאר מסמך
+bookmark_label=תצוגה נוכחית
+previous_label=קודם
+next_label=הבא
+print_label=הדפסה
+download_label=הורדה
+zoom_out_label=התרחקות
+zoom_in_label=התקרבות
+zoom.title=מרחק מתצוגה
+thumb_page_title=דף {{page}}
+thumb_page_canvas=תמונה ממוזערת של דף {{page}}
+request_password=קובץ PDF מוגן בססמה:
+open_file_label=פתיחה
diff --git a/common/static/js/vendor/pdfjs/locale/it/viewer.properties b/common/static/js/vendor/pdfjs/locale/it/viewer.properties
new file mode 100644
index 0000000000..ac7ba369aa
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/it/viewer.properties
@@ -0,0 +1,45 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bookmark.title=Visualizzazione corrente (copia o apri in una nuova finestra)
+previous.title=Precedente
+next.title=Successiva
+print.title=Stampa
+download.title=Download
+zoom_out.title=Riduci Zoom
+zoom_in.title=Aumenta Zoom
+error_more_info=Pi� Informazioni
+error_less_info=Meno Informazioni
+error_close=Chiudi
+error_build=PDF.JS Build: {{build}}
+error_message=Messaggio: {{message}}
+error_stack=Stack: {{stack}}
+error_file=File: {{file}}
+error_line=Linea: {{line}}
+page_scale_width=Adatta alla Larghezza
+page_scale_fit=Adatta alla Pagina
+page_scale_auto=Zoom Automatico
+page_scale_actual=Dimensione Attuale
+toggle_slider.title=Visualizza Riquadro Laterale
+thumbs.title=Mostra Miniature
+outline.title=Mostra Indice Documento
+loading=Caricamento... {{percent}}%
+loading_error_indicator=Errore
+loading_error=� accaduto un errore durante il caricamento del PDF.
+rendering_error=� accaduto un errore durante il rendering della pagina.
+page_label=Pagina:
+page_of=di {{pageCount}}
+no_outline=Nessun Indice Disponibile
+open_file.title=Apri File
+text_annotation_type=[{{type}} Annotazione]
diff --git a/common/static/js/vendor/pdfjs/locale/ja/viewer.properties b/common/static/js/vendor/pdfjs/locale/ja/viewer.properties
new file mode 100644
index 0000000000..43280355ea
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/ja/viewer.properties
@@ -0,0 +1,124 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=前のページ
+previous_label=前へ
+next.title=次のページ
+next_label=次へ
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=ページ：
+page_of=of {{pageCount}}
+
+zoom_out.title=縮小
+zoom_out_label=縮小
+zoom_in.title=拡大
+zoom_in_label=拡大
+zoom.title=ズーム
+print.title=印刷
+print_label=印刷
+presentation_mode.title=プレゼンテーションモードに切り替えます
+presentation_mode_label=プレゼンテーションモード
+open_file.title=ファイルを開く
+open_file_label=開く
+download.title=ダウンロード
+download_label=ダウンロード
+bookmark.title=現在のビューをブックマーク
+bookmark_label=現在のビューをブックマーク
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_sidebar.title=サイドバーの切り替え
+toggle_sidebar_label=サイドバーの切り替え
+outline.title=文書の目次
+outline_label=文書の目次
+thumbs.title=縮小版
+thumbs_label=縮小版
+findbar.title=検索
+findbar_label=検索
+
+# Document outline messages
+no_outline=利用可能な目次はありません
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title={{page}} ページ
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=ページの縮小版 {{page}}
+
+# Context menu
+first_page.label=最初のページへ移動
+last_page.label=最後のページへ移動
+page_rotate_cw.label=右回転
+page_rotate_ccw.label=左回転
+
+# Find panel button title and messages
+find_label=検索:
+find_previous.title=指定文字列に一致する 1 つ前の部分を検索します
+find_previous_label=前へ
+find_next.title=指定文字列に一致する次の部分を検索します
+find_next_label=次へ
+find_highlight=すべて強調表示
+find_match_case_label=大文字/小文字を区別
+find_reached_top=文書先頭まで検索したので末尾に戻って検索しました。
+find_reached_bottom=文書末尾まで検索したので先頭に戻って検索しました。
+find_not_found=見つかりませんでした。
+
+# Error panel labels
+error_more_info=詳細情報
+error_less_info=詳細情報の非表示
+error_close=閉じる
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (ビルド: {{build}})
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=メッセージ: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=スタック: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=ファイル: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=ライン: {{line}}
+rendering_error=ページのレンダリング中にエラーが発生しました
+
+# Predefined zoom values
+page_scale_width=幅に合わせる
+page_scale_fit=ページのサイズに合わせる
+page_scale_auto=自動ズーム
+page_scale_actual=実際のサイズ
+
+# Loading indicator messages
+loading_error_indicator=エラー
+loading_error=PDFの読み込み中にエラーが発生しました
+invalid_file_error=無効または破損したPDFファイル
+missing_file_error=PDF ファイルが見つかりません。
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[{{type}} 注釈]
+request_password=PDFはパスワードによって保護されています
+
+printing_not_supported=警告：このブラウザでは印刷が完全にサポートされていません
+web_fonts_disabled=Webフォントが無効になっています: 埋め込まれたPDFのフォントを使用することができません
diff --git a/common/static/js/vendor/pdfjs/locale/locale.properties b/common/static/js/vendor/pdfjs/locale/locale.properties
new file mode 100644
index 0000000000..553f3599cb
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/locale.properties
@@ -0,0 +1,69 @@
+[ar]
+@import url(ar/viewer.properties)
+
+[ca]
+@import url(ca/viewer.properties)
+
+[cs]
+@import url(cs/viewer.properties)
+
+[da]
+@import url(da/viewer.properties)
+
+[de]
+@import url(de/viewer.properties)
+
+[en-US]
+@import url(en-US/viewer.properties)
+
+[es]
+@import url(es/viewer.properties)
+
+[es-MX]
+@import url(es-MX/viewer.properties)
+
+[fi]
+@import url(fi/viewer.properties)
+
+[fr]
+@import url(fr/viewer.properties)
+
+[he]
+@import url(he/viewer.properties)
+
+[it]
+@import url(it/viewer.properties)
+
+[ja]
+@import url(ja/viewer.properties)
+
+[nl]
+@import url(nl/viewer.properties)
+
+[pl]
+@import url(pl/viewer.properties)
+
+[pt-BR]
+@import url(pt-BR/viewer.properties)
+
+[ro]
+@import url(ro/viewer.properties)
+
+[ru]
+@import url(ru/viewer.properties)
+
+[sr]
+@import url(sr/viewer.properties)
+
+[sv]
+@import url(sv/viewer.properties)
+
+[tr]
+@import url(tr/viewer.properties)
+
+[zh-CN]
+@import url(zh-CN/viewer.properties)
+
+[zh-TW]
+@import url(zh-TW/viewer.properties)
+
diff --git a/common/static/js/vendor/pdfjs/locale/nl/viewer.properties b/common/static/js/vendor/pdfjs/locale/nl/viewer.properties
new file mode 100644
index 0000000000..477a51fb23
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/nl/viewer.properties
@@ -0,0 +1,124 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Vorige pagina
+previous_label=Vorige
+next.title=Volgende pagina
+next_label=Volgende
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Pagina:
+page_of=van {{pageCount}}
+
+zoom_out.title=Uitzoomen
+zoom_out_label=Uitzoomen
+zoom_in.title=Inzoomen
+zoom_in_label=Inzoomen
+zoom.title=Zoomen
+print.title=Afdrukken
+print_label=Afdrukken
+presentation_mode.title=Omschakelen naar presentatiemodus
+presentation_mode_label=Presentatiemodus
+open_file.title=Bestand openen
+open_file_label=Openen
+download.title=Downloaden
+download_label=Downloaden
+bookmark.title=Huidige weergave (kopiëren of openen in nieuw venster)
+bookmark_label=Huidige weergave
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_sidebar.title=Zijbalk tonen/verbergen
+toggle_sidebar_label=Zijbalk tonen/verbergen
+outline.title=Documentstructuur tonen
+outline_label=Documentstructuur
+thumbs.title=Miniaturen tonen
+thumbs_label=Miniaturen
+findbar.title=Zoeken in document
+findbar_label=Zoeken
+
+# Document outline messages
+no_outline=Geen documentstructuur beschikbaar
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Pagina {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Miniatuur van pagina {{page}}
+
+# Context menu
+first_page.label=Naar de eerste pagina gaan
+last_page.label=Naar de laatste pagina gaan
+page_rotate_cw.label=Met de klok mee roteren
+page_rotate_ccw.label=Tegen de klok in roteren
+
+# Find panel button title and messages
+find_label=Zoeken:
+find_previous.title=Het vorige voorkomen van de tekst zoeken
+find_previous_label=Vorige
+find_next.title=Het volgende voorkomen van de tekst zoeken
+find_next_label=Volgende
+find_highlight=Alles markeren
+find_match_case_label=Hoofdlettergevoelig
+find_reached_top=Bovenkant van de pagina bereikt, doorgegaan vanaf de onderkant
+find_reached_bottom=Onderkant van de pagina bereikt, doorgegaan vanaf de bovenkant
+find_not_found=Tekst niet gevonden
+
+# Error panel labels
+error_more_info=Meer informatie
+error_less_info=Minder informatie
+error_close=Sluiten
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js versie {{version}} (build {{build}})
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Bericht: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Stack: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Bestand: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Regel: {{line}}
+rendering_error=Er is een probleem opgetreden bij het renderen van de pagina.
+
+# Predefined zoom values
+page_scale_width=Paginabreed maken
+page_scale_fit=Passend maken
+page_scale_auto=Automatisch zoomen
+page_scale_actual=Werkelijke grootte
+
+# Loading indicator messages
+loading_error_indicator=Fout
+loading_error=Er is een fout opgetreden bij het laden van de PDF.
+invalid_file_error=Ongeldig of corrupt PDF-bestand.
+missing_file_error=Ontbrekend PDF-bestand.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[{{type}}-aantekening]
+request_password=Dit PDF-bestand is beveiligd met een wachtwoord:
+
+printing_not_supported=Waarschuwing: afdrukken wordt niet volledig ondersteund door deze browser.
+web_fonts_disabled=Weblettertypen zijn uitgeschakeld: kan geen ingebakken PDF-lettertypen gebruiken.
diff --git a/common/static/js/vendor/pdfjs/locale/pl/viewer.properties b/common/static/js/vendor/pdfjs/locale/pl/viewer.properties
new file mode 100644
index 0000000000..d16736911a
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/pl/viewer.properties
@@ -0,0 +1,57 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bookmark.title=Aktualny widok (kopiuj lub otwórz w nowym oknie)
+previous.title=Poprzednia strona
+next.title=Następna strona
+print.title=Drukuj
+download.title=Pobierz
+zoom_out.title=Pomniejsz
+zoom_in.title=Powiększ
+error_more_info=Więcej informacji
+error_less_info=Mniej informacji
+error_close=Zamknij
+error_build=Wersja PDF.JS: {{build}}
+error_message=Wiadomość: {{message}}
+error_stack=Stos: {{stack}}
+error_file=Plik: {{file}}
+error_line=Linia: {{line}}
+page_scale_width=Szerokość strony
+page_scale_fit=Cała strona
+page_scale_auto=Automatyczne dopasowanie
+page_scale_actual=Rzeczywisty rozmiar
+toggle_slider.title=Włącz/wyłącz suwak
+thumbs.title=Wyświetl miniatury
+outline.title=Wyświetl konspekt dokumentu
+loading=Wczytywanie... {{percent}}%
+loading_error_indicator=Błąd
+loading_error=Wystąpił błąd podczas wczytywania pliku PDF.
+invalid_file_error=Błędny lub zepsuty plik PDF.
+rendering_error=Wystąpił błąd podczas wyświetlania strony.
+page_label=Strona:
+page_of=z {{pageCount}}
+no_outline=Konspekt nie jest dostępny
+open_file.title=Otwórz plik
+text_annotation_type=[Komentarz {{type}}]
+toggle_slider_label=Przełącz suwak
+thumbs_label=Miniatury
+outline_label=Konspekt dokumentu
+bookmark_label=Aktualny widok
+previous_label=Wstecz
+next_label=Dalej
+print_label=Drukuj
+download_label=Pobierz
+zoom_out_label=Pomniejsz
+zoom_in_label=Powiększ
+zoom.title=Powiększenie
diff --git a/common/static/js/vendor/pdfjs/locale/pt-BR/viewer.properties b/common/static/js/vendor/pdfjs/locale/pt-BR/viewer.properties
new file mode 100644
index 0000000000..84ab287630
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/pt-BR/viewer.properties
@@ -0,0 +1,45 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bookmark.title=Marcar posição atual (bookmark)
+previous.title=Página anterior
+next.title=Próxima página
+print.title=Imprimir
+download.title=Baixar arquivo
+zoom_out.title=Diminuir Zoom
+zoom_in.title=Aumentar Zoom
+error_more_info=Mais informações
+error_less_info=Menos informações
+error_close=Fechar
+error_build=PDF.JS Versão: {{build}}
+error_message=Mensagem: {{message}}
+error_stack=Pilha: {{stack}}
+error_file=Arquivo: {{file}}
+error_line=Linha: {{line}}
+page_scale_width=Largura da página
+page_scale_fit=Página inteira
+page_scale_auto=Zoom automático
+page_scale_actual=Tamanho original
+toggle_slider.title=Abrir/fechar aba lateral
+thumbs.title=Mostrar miniaturas
+outline.title=Mostrar índice
+loading=Carregando... {{percent}}%
+loading_error_indicator=Erro
+loading_error=Um erro ocorreu ao carregar o arquivo.
+rendering_error=Um erro ocorreu ao apresentar a página.
+page_label=Página:
+page_of=de {{pageCount}}
+no_outline=Índice não disponível
+open_file.title=Abrir arquivo
+text_annotation_type=[{{type}} Anotações]
diff --git a/common/static/js/vendor/pdfjs/locale/ro/viewer.properties b/common/static/js/vendor/pdfjs/locale/ro/viewer.properties
new file mode 100644
index 0000000000..af983ab7ff
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/ro/viewer.properties
@@ -0,0 +1,56 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bookmark.title=Vederea curentă (copiază sau deschide în fereastră nouă)
+previous.title=Pagina precedentă
+next.title=Pagina următoare
+print.title=Tipărește
+download.title=Descarcă
+zoom_out.title=Micșorează
+zoom_in.title=Mărește
+error_more_info=Detaliat
+error_less_info=Sumarizat
+error_close=Închide
+error_build=PDF.JS Build: {{build}}
+error_message=Message: {{message}}
+error_stack=Stack: {{stack}}
+error_file=File: {{file}}
+error_line=Line: {{line}}
+page_scale_width=După lățime
+page_scale_fit=Toată pagina
+page_scale_auto=Mărime automată
+page_scale_actual=Mărime originală
+toggle_slider.title=Vedere de ansamblu
+thumbs.title=Miniaturi
+outline.title=Cuprins
+loading=Încărcare... {{percent}}%
+loading_error_indicator=Eroare
+loading_error=S-a produs o eroare în timpul încărcării documentului.
+rendering_error=S-a produs o eroare în timpul procesării paginii.
+page_label=Pagina:
+page_of=din {{pageCount}}
+no_outline=Cuprins indisponibil
+open_file.title=Deschide fișier
+text_annotation_type=[Adnotare {{type}}]
+toggle_slider_label=Vedere de ansamblu
+thumbs_label=Miniaturi
+outline_label=Cuprins
+bookmark_label=Vederea curentă
+previous_label=Înapoi
+next_label=Înainte
+print_label=Tipărește
+download_label=Descarcă
+zoom_out_label=Micșorează
+zoom_in_label=Mărește
+zoom.title=Mărime
diff --git a/common/static/js/vendor/pdfjs/locale/ru/viewer.properties b/common/static/js/vendor/pdfjs/locale/ru/viewer.properties
new file mode 100644
index 0000000000..7f2019b17b
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/ru/viewer.properties
@@ -0,0 +1,63 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bookmark.title=Ссылка на текущий вид (скопировать или открыть в новом окне)
+previous.title=Предыдущая страница
+next.title=Следующая страница
+print.title=Печать
+download.title=Загрузить
+zoom_out.title=Уменьшить
+zoom_in.title=Увеличить
+error_more_info=Детали
+error_less_info=Скрыть детали
+error_close=Закрыть
+error_build=PDF.JS компиляция: {{build}}
+error_message=Сообщение: {{message}}
+error_stack=Стeк: {{stack}}
+error_file=Файл: {{file}}
+error_line=Строка: {{line}}
+page_scale_width=По ширине страницы
+page_scale_fit=Во всю страницу
+page_scale_auto=Авто
+page_scale_actual=Настоящий размер
+toggle_slider.title=Открыть/закрыть вспомогательную панель
+thumbs.title=Показать уменьшенные изображения
+outline.title=Показать содержание документа
+loading=Загрузка... {{percent}}%
+loading_error_indicator=Ошибка
+loading_error=Произошла ошибка во время загрузки PDF.
+rendering_error=Произошла ошибка во время создания страницы.
+page_label=Страница:
+page_of=из {{pageCount}}
+no_outline=Содержание не доступно
+open_file.title=Открыть файл
+text_annotation_type=[Аннотация {{type}}]
+toggle_slider_label=Вспомогательная панель
+thumbs_label=Уменьшенные изображения
+outline_label=Содержание документа
+bookmark_label=Текущий вид
+previous_label=Предыдущая
+next_label=Следующая
+print_label=Печать
+download_label=Загрузить
+zoom_out_label=Уменьшить
+zoom_in_label=Увеличить
+zoom.title=Масштаб
+thumb_page_title=Страница {{page}}
+thumb_page_canvas=Уменьшенное изображение страницы {{page}}
+request_password=PDF защищён паролем:
+fullscreen.title=Полный экран
+fullscreen_label=Полный экран
+page_rotate_cw.label=Повернуть по часовой стрелке
+page_rotate_ccw.label=Повернуть против часовой стрелки
diff --git a/common/static/js/vendor/pdfjs/locale/sr/viewer.properties b/common/static/js/vendor/pdfjs/locale/sr/viewer.properties
new file mode 100644
index 0000000000..04498a91e7
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/sr/viewer.properties
@@ -0,0 +1,56 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bookmark.title=Тренутни приказ (Умножити или отворити у новом прозору)
+previous.title=Предходна страна
+next.title=Следећа страна
+print.title=Штампај
+download.title=Преузми
+zoom_out.title=Умањи
+zoom_in.title=Увећај
+error_more_info=Више информација
+error_less_info=Мање информација
+error_close=Затвори
+error_build=PDF.JS Build: {{build}}
+error_message=Message: {{message}}
+error_stack=Stack: {{stack}}
+error_file=File: {{file}}
+error_line=Line: {{line}}
+page_scale_width=Ширина странице
+page_scale_fit=Уклопи 
+page_scale_auto=Увећај аутоматски
+page_scale_actual=Стварна величина
+toggle_slider.title=Клизач
+thumbs.title=Прикажи у сличицама
+outline.title=Прикажи у линијама
+loading=Учитавање... {{percent}}%
+loading_error_indicator=Грешка
+loading_error=Дошло је до грешке током учитавања ПДФ-а.
+rendering_error=Дошло је до грешке приликом приказивања стране.
+page_label=Страна:
+page_of=од {{pageCount}}
+no_outline=Нема линија
+open_file.title=Отвори датотеку
+text_annotation_type=[{{type}} Annotation]
+toggle_slider_label=Клизач
+thumbs_label=Сличице
+outline_label=Документи у линијама
+bookmark_label=Тренутни приказ
+previous_label=Предходна
+next_label=Следећа
+print_label=Штампај
+download_label=Преузми
+zoom_out_label=Умањи
+zoom_in_label=Увећај
+zoom.title=Скала
diff --git a/common/static/js/vendor/pdfjs/locale/sv/viewer.properties b/common/static/js/vendor/pdfjs/locale/sv/viewer.properties
new file mode 100644
index 0000000000..4d0969dfc0
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/sv/viewer.properties
@@ -0,0 +1,124 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Föregående sida
+previous_label=Föregående
+next.title=Nästa sida
+next_label=Nästa
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Sida:
+page_of=av {{pageCount}}
+
+zoom_out.title=Zooma ut
+zoom_out_label=Zooma ut
+zoom_in.title=Zooma in
+zoom_in_label=Zooma in
+zoom.title=Zooma
+print.title=Skriv ut
+print_label=Skriv ut
+presentation_mode.title=Presentationsläge
+presentation_mode_label=Presentationsläge
+open_file.title=Öppna fil
+open_file_label=Öppna
+download.title=Ladda ner
+download_label=Ladda ner
+bookmark.title=Aktuell vy (kopiera eller öppna i nytt fönster)
+bookmark_label=Aktuell vy
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_sidebar.title=Visa/Dölj sidopanel
+toggle_sidebar_label=Visa/Dölj sidopanel
+outline.title=Visa bokmärken
+outline_label=Bokmärken
+thumbs.title=Visa sidminiatyrer
+thumbs_label=Sidminiatyrer
+findbar.title=Sök i dokumentet
+findbar_label=Sök
+
+# Document outline messages
+no_outline=Inga bokmärken tillgängliga
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Sida {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Miniatyr av sida {{page}}
+
+# Context menu
+first_page.label=Gå till första sidan
+last_page.label=Gå till sista sidan
+page_rotate_cw.label=Rotera medurs
+page_rotate_ccw.label=Rotera moturs
+
+# Find panel button title and messages
+find_label=Sök:
+find_previous.title=Hitta föregående förekomst av frasen
+find_previous_label=Föregående
+find_next.title=Hitta nästa förekomst av frasen
+find_next_label=Nästa
+find_highlight=Markera alla
+find_match_case_label=Matcha VERSALER/gemener
+find_reached_top=Kommit till början av dokumentet, börjat om
+find_reached_bottom=Kommit till slutet av dokumentet, börjat om
+find_not_found=Frasen hittades inte
+
+# Error panel labels
+error_more_info=Mer information
+error_less_info=Mindre information
+error_close=Stäng
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (bygge: {{build}})
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Meddelande: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Stack: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Fil: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Rad: {{line}}
+rendering_error=Ett fel inträffade när sidan renderades.
+
+# Predefined zoom values
+page_scale_width=Sidbredd
+page_scale_fit=Helsida
+page_scale_auto=Automatisk zoom
+page_scale_actual=Faktisk storlek
+
+# Loading indicator messages
+loading_error_indicator=Fel
+loading_error=Ett fel inträffade när PDF-filen laddades.
+invalid_file_error=Ogiltig eller korrupt PDF-fil.
+missing_file_error=PDF-filen saknas.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[{{type}}-anteckning]
+request_password=PDF-filen är lösenordsskyddad:
+
+printing_not_supported=Varning: Utskrifter stöds inte fullt ut av denna webbläsare.
+web_fonts_disabled=Webbtypsnitt är inaktiverade: Typsnitt inkluderade i PDF-filer kan ej användas.
diff --git a/common/static/js/vendor/pdfjs/locale/tr/viewer.properties b/common/static/js/vendor/pdfjs/locale/tr/viewer.properties
new file mode 100644
index 0000000000..ffb95f5df9
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/tr/viewer.properties
@@ -0,0 +1,124 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Önceki Sayfa
+previous_label=Önceki
+next.title=Sonraki Sayfa
+next_label=Sonraki
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Sayfa:
+page_of=- {{pageCount}}
+
+zoom_out.title=Uzaklaş
+zoom_out_label=Uzaklaş
+zoom_in.title=Yakınlaş
+zoom_in_label=Yakınlaş
+zoom.title=Yakınlaştır
+print.title=Yazdır
+print_label=Yazdır
+presentation_mode.title=Sunum moduna geçiş yap
+presentation_mode_label=Sunum Modu
+open_file.title=Dosya Aç
+open_file_label=Aç
+download.title=İndir
+download_label=İndir
+bookmark.title=Mevcut görünüm (kopyala yada yeni sayfada aç)
+bookmark_label=Mevcut Görünüm
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_sidebar.title=Yan Menü Aç/Kapa
+toggle_sidebar_label=Yan Menü
+outline.title=Sayfa kenarlıklarını döster 
+outline_label=Sayfa Kenarlıkları
+thumbs.title=Önizleme resimlerini göster
+thumbs_label=Önizleme
+findbar.title=Döküman içerisinde bul
+findbar_label=Bul
+
+# Document outline messages
+no_outline=Kenarlık Mevcut Değil
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Sayfa {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas={{page}} sayfasının ön izlemesi
+
+# Context menu
+first_page.label=İlk Sayfaya Git
+last_page.label=Son Sayfaya Git
+page_rotate_cw.label=Sağa Çevir
+page_rotate_ccw.label=Sola Çevir
+
+# Find panel button title and messages
+find_label=Bul:
+find_previous.title=Önceki cümleyi bul
+find_previous_label=Önceki
+find_next.title=Sonraki cümleyi bul
+find_next_label=Sonraki
+find_highlight=Hepsini belirt
+find_match_case_label=harf eşleme
+find_reached_top=Dosyanın en üstüne varıldı. Sonundan devam ediliyor
+find_reached_bottom=Dosyanın sonuna varıldı. Başından devam ediliyor
+find_not_found=Aramanızla eşleşen sonuç yok
+
+# Error panel labels
+error_more_info=Daha falza bilgi
+error_less_info=daha az bilgi
+error_close=Kapat
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (build: {{build}})
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Mesaj: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Yığın: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Dosya: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Satır: {{line}}
+rendering_error=Sayfa oluşturulurken bir hata meydana geldi.
+
+# Predefined zoom values
+page_scale_width=Sayfa Genişliği
+page_scale_fit=Sayfayı Sığdır
+page_scale_auto=Otomatik Yakınlaşma
+page_scale_actual=Gerçek boyut
+
+# Loading indicator messages
+loading_error_indicator=Hata
+loading_error=PDF yüklenirken hata.
+invalid_file_error=Geçersiz yada bozuk dosya.
+missing_file_error=PDF dosyası bulunamadı.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[{{type}} Not]
+request_password=PDF Şifre ile korunmakta:
+
+printing_not_supported=Uyarı: Yazdırma işlemi bu tarayıcı ile tam desteklenmiyor.
+web_fonts_disabled=Web Fontları devre dışı. Web fontlar yüklenemiyor.
diff --git a/common/static/js/vendor/pdfjs/locale/zh-CN/viewer.properties b/common/static/js/vendor/pdfjs/locale/zh-CN/viewer.properties
new file mode 100644
index 0000000000..80ee751b64
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/zh-CN/viewer.properties
@@ -0,0 +1,124 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=上一页
+previous_label=向上
+next.title=下一页
+next_label=向下
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=页码:
+page_of=/ {{pageCount}}
+
+zoom_out.title=缩小
+zoom_out_label=缩小
+zoom_in.title=放大
+zoom_in_label=放大
+zoom.title=缩放
+print.title=打印
+print_label=打印
+presentation_mode.title=切换至幻灯模式
+presentation_mode_label=幻灯模式
+open_file.title=打开文件
+open_file_label=打开
+download.title=下载
+download_label=下载
+bookmark.title=当前视图（复制或在新窗口中打开）
+bookmark_label=当前视图
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_sidebar.title=切换侧栏
+toggle_sidebar_label=切换侧栏
+outline.title=显示文档大纲
+outline_label=文档大纲
+thumbs.title=显示缩略图
+thumbs_label=缩略图
+findbar.title=在该文档内查找
+findbar_label=查找
+
+# Document outline messages
+no_outline=没有可用的大纲
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=页码 {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=页面 {{page}} 的缩略图
+
+# Context menu
+first_page.label=转到第一页
+last_page.label=转到结尾页
+page_rotate_cw.label=顺时针旋转
+page_rotate_ccw.label=逆时针旋转
+
+# Find panel button title and messages
+find_label=查找:
+find_previous.title=查找该短语上一次出现的位置
+find_previous_label=上一个
+find_next.title=查找该短语下一次出现的位置
+find_next_label=下一个
+find_highlight=全部高亮
+find_match_case_label=区分大小写
+find_reached_top=已查找至文档的开始位置，将从文档末尾继续查找
+find_reached_bottom=已查找至文档的末尾位置，将从文档的开始位置继续查找
+find_not_found=找不到
+
+# Error panel labels
+error_more_info=更多信息
+error_less_info=简略信息
+error_close=关闭
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (构建版本: {{build}})
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=错误信息: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=堆栈: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=文件: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=行数: {{line}}
+rendering_error=渲染页面时出错。
+
+# Predefined zoom values
+page_scale_width=符合页宽
+page_scale_fit=符合页面
+page_scale_auto=自动缩放
+page_scale_actual=实际大小
+
+# Loading indicator messages
+loading_error_indicator=错误
+loading_error=加载 PDF 文件时出错。
+invalid_file_error=PDF 文件无效或已损坏。
+missing_file_error=缺失 PDF 文件。
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[{{type}} 注解]
+request_password=该 PDF 文档受密码保护：
+
+printing_not_supported=警告：该浏览器不能完全支持打印。
+web_fonts_disabled=Web 页面字体已被禁用，无法使用嵌入到 PDF 中的字体。
diff --git a/common/static/js/vendor/pdfjs/locale/zh-TW/viewer.properties b/common/static/js/vendor/pdfjs/locale/zh-TW/viewer.properties
new file mode 100644
index 0000000000..8ddd069de7
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/locale/zh-TW/viewer.properties
@@ -0,0 +1,114 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# 主工具列按鍵 (工具提示和圖像的替代文字)
+previous.title=上一頁
+previous_label=上一頁
+next.title=下一頁
+next_label=下一頁
+
+# 本地化提示 (page_label, page_of):
+# 這些字符串會連接成 "Page: X of Y" 的表示方式。
+# 不要翻譯 "{{pageCount}}" , 因為它用來表示總頁數。
+page_label=第 
+page_of=頁，共 {{pageCount}} 頁
+
+zoom_out.title=縮小
+zoom_out_label=縮小
+zoom_in.title=放大
+zoom_in_label=放大
+zoom.title=縮放
+print.title=列印
+print_label=列印
+presentation_mode.title=切換到簡報模式
+presentation_mode_label=簡報模式
+open_file.title=開啟檔案
+open_file_label=開啟
+download.title=下載
+download_label=下載
+bookmark.title=目前檢視（複製或在新視窗中開啟）
+bookmark_label=目前檢視
+
+# 側邊欄工具列按鍵 (工具提示和圖像的替代文字)
+# (_label 字符串是按鍵的替代文字, .title 字符串是工具提示)
+toggle_sidebar.title=切換側邊欄
+toggle_sidebar_label=切換側邊欄
+outline.title=顯示文件綱要
+outline_label=文件綱要
+thumbs.title=顯示縮圖
+thumbs_label=縮圖
+findbar.title=在文件中搜尋
+findbar_label=搜索
+
+# 文件綱要相關訊息
+no_outline=無可用的綱要
+
+# 縮圖面板項目 (工具提示和圖像的替代文字)
+# 本地化提示 (thumb_page_title): "{{page}}" 會被頁數取代。
+thumb_page_title=第 {{page}} 頁
+# 本地化提示 (thumb_page_canvas): "{{page}}" 會被頁數取代。
+thumb_page_canvas=第 {{page}} 頁的縮圖
+
+# 右鍵菜單
+page_rotate_cw.label=順時針旋轉
+page_rotate_ccw.label=逆時針旋轉
+
+# 搜尋面板按鍵文字及訊息
+find_label=搜尋：
+find_previous.title=尋找上一個出現的詞組
+find_previous_label=上一個
+find_next.title=尋找下一個出現的詞組
+find_next_label=下一個
+find_highlight=全部以高亮顯示
+find_match_case_label=區分大小寫
+find_reached_top=到達文件頂端，由末端繼續搜尋
+find_reached_bottom=到達文件末端，由頂端繼續搜尋
+find_not_found=找不到詞組
+
+# 錯誤面板標籤
+error_more_info=更多資訊
+error_less_info=更少資訊
+error_close=關閉
+# 本地化提示 (error_version_info): "{{version}}" and "{{build}}" 會被PDF.JS版本編號及組建編號取代。
+error_version_info=PDF.js v{{version}} (組建: {{build}})
+# 本地化提示 (error_message): "{{message}}" 會被英文的錯誤描述取代。
+error_message=錯誤信息：{{message}}
+# 本地化提示 (error_stack): "{{stack}}" 會被錯誤堆疊取代。
+error_stack=堆疊：{{stack}}
+# 本地化提示 (error_file): "{{file}}" 會被檔案名稱取代。
+error_file=檔案：{{file}}
+# 本地化提示 (error_line): "{{line}}" 會被行數取代。
+error_line=行數：{{line}}
+rendering_error=渲染頁面時發生錯誤。
+
+# 預設的縮放值
+page_scale_width=符合頁寬
+page_scale_fit=符合頁面
+page_scale_auto=自動縮放
+page_scale_actual=實際大小
+
+# 載入指示訊息
+loading_error_indicator=錯誤
+loading_error=載入PDF檔案時發生錯誤。
+invalid_file_error=無效或受損的PDF檔案。
+missing_file_error=遺失PDF檔案。
+
+# 其他標籤和訊息
+# "{{type}}" 用來表示PDF格式規範 (32000-1:2008 Table 169 – Annotation types) 入面所定義的註解種類。
+# 一些常見的類型有: "Check"、 "Text"、 "Comment"、 "Note"
+text_annotation_type=［{{type}} 註解］
+request_password=PDF檔案受密碼保護：
+
+printing_not_supported=警告：這個瀏覽器不完全支援列印。
+web_fonts_disabled=禁止使用網路字型：無法使用嵌入PDF檔案的字型。
diff --git a/common/static/js/vendor/pdfjs/pdf.js.REMOVED.git-id b/common/static/js/vendor/pdfjs/pdf.js.REMOVED.git-id
new file mode 100644
index 0000000000..b39c0476bb
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/pdf.js.REMOVED.git-id
@@ -0,0 +1 @@
+34d1996e44f78168a73297217b3a0973c2ae90e1
\ No newline at end of file
diff --git a/common/static/js/vendor/pdfjs/viewer.html b/common/static/js/vendor/pdfjs/viewer.html
new file mode 100644
index 0000000000..6dfb306f30
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/viewer.html
@@ -0,0 +1,204 @@
+<!DOCTYPE html>
+<!--
+Copyright 2012 Mozilla Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<html dir="ltr" mozdisallowselectionprint>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title>PDF.js viewer</title>
+
+
+    <link rel="stylesheet" href="/static/css/vendor/pdfjs/viewer.css"/>
+
+    <script type="text/javascript" src="/static/js/vendor/pdfjs/compatibility.js"></script>
+
+
+
+<!-- This snippet is used in production, see Makefile -->
+<link rel="resource" type="application/l10n" href="/static/js/vendor/pdfjs/locale/locale.properties"/>
+<script type="text/javascript" src="/static/js/vendor/pdfjs/l10n.js"></script>
+<script type="text/javascript" src="/static/js/vendor/pdfjs/pdf.js"></script>
+
+
+    <script type="text/javascript" src="/static/js/vendor/pdfjs/debugger.js"></script>
+    <script type="text/javascript" src="/static/js/vendor/pdfjs/viewer.js"></script>
+  </head>
+
+  <body>
+    <div id="outerContainer">
+
+      <div id="sidebarContainer">
+        <div id="toolbarSidebar">
+          <div class="splitToolbarButton toggled">
+            <button id="viewThumbnail" class="toolbarButton group toggled" title="Show Thumbnails" tabindex="1" data-l10n-id="thumbs">
+               <span data-l10n-id="thumbs_label">Thumbnails</span>
+            </button>
+            <button id="viewOutline" class="toolbarButton group" title="Show Document Outline" tabindex="2" data-l10n-id="outline">
+               <span data-l10n-id="outline_label">Document Outline</span>
+            </button>
+          </div>
+        </div>
+        <div id="sidebarContent">
+          <div id="thumbnailView">
+          </div>
+          <div id="outlineView" class="hidden">
+          </div>
+        </div>
+      </div>  <!-- sidebarContainer -->
+
+      <div id="mainContainer">
+        <div class="findbar hidden doorHanger" id="findbar">
+          <label for="findInput" class="toolbarLabel" data-l10n-id="find_label">Find:</label>
+          <input id="findInput" class="toolbarField" tabindex="20">
+          <div class="splitToolbarButton">
+            <button class="toolbarButton findPrevious" title="" id="findPrevious" tabindex="21" data-l10n-id="find_previous">
+              <span data-l10n-id="find_previous_label">Previous</span>
+            </button>
+            <div class="splitToolbarButtonSeparator"></div>
+            <button class="toolbarButton findNext" title="" id="findNext" tabindex="22" data-l10n-id="find_next">
+              <span data-l10n-id="find_next_label">Next</span>
+            </button>
+          </div>
+          <input type="checkbox" id="findHighlightAll" class="toolbarField">
+          <label for="findHighlightAll" class="toolbarLabel" tabindex="23" data-l10n-id="find_highlight">Highlight all</label>
+          <input type="checkbox" id="findMatchCase" class="toolbarField">
+          <label for="findMatchCase" class="toolbarLabel" tabindex="24" data-l10n-id="find_match_case_label">Match case</label>
+          <span id="findMsg" class="toolbarLabel"></span>
+        </div>
+        <div class="toolbar">
+          <div id="toolbarContainer">
+            <div id="toolbarViewer">
+              <div id="toolbarViewerLeft">
+                <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="3" data-l10n-id="toggle_sidebar">
+                  <span data-l10n-id="toggle_sidebar_label">Toggle Sidebar</span>
+                </button>
+                <div class="toolbarButtonSpacer"></div>
+                <button id="viewFind" class="toolbarButton group" title="Find in Document" tabindex="4" data-l10n-id="findbar">
+                   <span data-l10n-id="findbar_label">Find</span>
+                </button>
+                <div class="splitToolbarButton">
+                  <button class="toolbarButton pageUp" title="Previous Page" id="previous" tabindex="5" data-l10n-id="previous">
+                    <span data-l10n-id="previous_label">Previous</span>
+                  </button>
+                  <div class="splitToolbarButtonSeparator"></div>
+                  <button class="toolbarButton pageDown" title="Next Page" id="next" tabindex="6" data-l10n-id="next">
+                    <span data-l10n-id="next_label">Next</span>
+                  </button>
+                </div>
+                <label id="pageNumberLabel" class="toolbarLabel" for="pageNumber" data-l10n-id="page_label">Page: </label>
+                <input type="number" id="pageNumber" class="toolbarField pageNumber" value="1" size="4" min="1" tabindex="7">
+                </input>
+                <span id="numPages" class="toolbarLabel"></span>
+              </div>
+              <div id="toolbarViewerRight">
+                <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" style="visibility: hidden; position: fixed; right: 0; top: 0" />
+
+
+                <button id="fullscreen" class="toolbarButton fullscreen" title="Switch to Presentation Mode" tabindex="11" data-l10n-id="presentation_mode">
+                  <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
+                </button>
+
+                <button id="openFile" class="toolbarButton openFile" title="Open File" tabindex="12" data-l10n-id="open_file">
+                   <span data-l10n-id="open_file_label">Open</span>
+                </button>
+
+                <button id="print" class="toolbarButton print" title="Print" tabindex="13" data-l10n-id="print">
+                  <span data-l10n-id="print_label">Print</span>
+                </button>
+
+                <button id="download" class="toolbarButton download" title="Download" tabindex="14" data-l10n-id="download">
+                  <span data-l10n-id="download_label">Download</span>
+                </button>
+                <!-- <div class="toolbarButtonSpacer"></div> -->
+                <a href="#" id="viewBookmark" class="toolbarButton bookmark" title="Current view (copy or open in new window)" tabindex="15" data-l10n-id="bookmark"><span data-l10n-id="bookmark_label">Current View</span></a>
+              </div>
+              <div class="outerCenter">
+                <div class="innerCenter" id="toolbarViewerMiddle">
+                  <div class="splitToolbarButton">
+                    <button class="toolbarButton zoomOut" id="zoom_out" title="Zoom Out" tabindex="8" data-l10n-id="zoom_out">
+                      <span data-l10n-id="zoom_out_label">Zoom Out</span>
+                    </button>
+                    <div class="splitToolbarButtonSeparator"></div>
+                    <button class="toolbarButton zoomIn" id="zoom_in" title="Zoom In" tabindex="9" data-l10n-id="zoom_in">
+                      <span data-l10n-id="zoom_in_label">Zoom In</span>
+                     </button>
+                  </div>
+                  <span id="scaleSelectContainer" class="dropdownToolbarButton">
+                     <select id="scaleSelect" title="Zoom" oncontextmenu="return false;" tabindex="10" data-l10n-id="zoom">
+                      <option id="pageAutoOption" value="auto" selected="selected" data-l10n-id="page_scale_auto">Automatic Zoom</option>
+                      <option id="pageActualOption" value="page-actual" data-l10n-id="page_scale_actual">Actual Size</option>
+                      <option id="pageFitOption" value="page-fit" data-l10n-id="page_scale_fit">Fit Page</option>
+                      <option id="pageWidthOption" value="page-width" data-l10n-id="page_scale_width">Full Width</option>
+                      <option id="customScaleOption" value="custom"></option>
+                      <option value="0.5">50%</option>
+                      <option value="0.75">75%</option>
+                      <option value="1">100%</option>
+                      <option value="1.25">125%</option>
+                      <option value="1.5">150%</option>
+                      <option value="2">200%</option>
+                    </select>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <menu type="context" id="viewerContextMenu">
+          <menuitem label="First Page" id="first_page"
+                    data-l10n-id="first_page" ></menuitem>
+          <menuitem label="Last Page" id="last_page"
+                    data-l10n-id="last_page" ></menuitem>
+          <menuitem label="Rotate Counter-Clockwise" id="page_rotate_ccw"
+                    data-l10n-id="page_rotate_ccw" ></menuitem>
+          <menuitem label="Rotate Clockwise" id="page_rotate_cw"
+                    data-l10n-id="page_rotate_cw" ></menuitem>
+        </menu>
+
+        <div id="viewerContainer">
+          <div id="viewer" contextmenu="viewerContextMenu"></div>
+        </div>
+
+        <div id="loadingBox">
+          <div id="loading"></div>
+          <div id="loadingBar"><div class="progress"></div></div>
+        </div>
+
+        <div id="errorWrapper" hidden='true'>
+          <div id="errorMessageLeft">
+            <span id="errorMessage"></span>
+            <button id="errorShowMore" onclick="" oncontextmenu="return false;" data-l10n-id="error_more_info">
+              More Information
+            </button>
+            <button id="errorShowLess" onclick="" oncontextmenu="return false;" data-l10n-id="error_less_info" hidden='true'>
+              Less Information
+            </button>
+          </div>
+          <div id="errorMessageRight">
+            <button id="errorClose" oncontextmenu="return false;" data-l10n-id="error_close">
+              Close
+            </button>
+          </div>
+          <div class="clearBoth"></div>
+          <textarea id="errorMoreInfo" hidden='true' readonly="readonly"></textarea>
+        </div>
+      </div> <!-- mainContainer -->
+
+    </div> <!-- outerContainer -->
+    <div id="printContainer"></div>
+  </body>
+</html>
+
diff --git a/common/static/js/vendor/pdfjs/viewer.js b/common/static/js/vendor/pdfjs/viewer.js
new file mode 100644
index 0000000000..06d6791884
--- /dev/null
+++ b/common/static/js/vendor/pdfjs/viewer.js
@@ -0,0 +1,3281 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* globals PDFJS, PDFBug, FirefoxCom, Stats */
+
+'use strict';
+
+var DEFAULT_URL = 'compressed.tracemonkey-pldi-09.pdf';
+var DEFAULT_SCALE = 'auto';
+var DEFAULT_SCALE_DELTA = 1.1;
+var UNKNOWN_SCALE = 0;
+var CACHE_SIZE = 20;
+var CSS_UNITS = 96.0 / 72.0;
+var SCROLLBAR_PADDING = 40;
+var VERTICAL_PADDING = 5;
+var MIN_SCALE = 0.25;
+var MAX_SCALE = 4.0;
+var IMAGE_DIR = './images/';
+var SETTINGS_MEMORY = 20;
+var ANNOT_MIN_SIZE = 10;
+var RenderingStates = {
+  INITIAL: 0,
+  RUNNING: 1,
+  PAUSED: 2,
+  FINISHED: 3
+};
+var FindStates = {
+  FIND_FOUND: 0,
+  FIND_NOTFOUND: 1,
+  FIND_WRAPPED: 2,
+  FIND_PENDING: 3
+};
+
+  PDFJS.workerSrc = '/static/js/vendor/pdfjs/pdf.js';
+
+var mozL10n = document.mozL10n || document.webL10n;
+
+function getFileName(url) {
+  var anchor = url.indexOf('#');
+  var query = url.indexOf('?');
+  var end = Math.min(
+    anchor > 0 ? anchor : url.length,
+    query > 0 ? query : url.length);
+  return url.substring(url.lastIndexOf('/', end) + 1, end);
+}
+
+function scrollIntoView(element, spot) {
+  // Assuming offsetParent is available (it's not available when viewer is in
+  // hidden iframe or object). We have to scroll: if the offsetParent is not set
+  // producing the error. See also animationStartedClosure.
+  var parent = element.offsetParent, offsetY = element.offsetTop;
+  if (!parent) {
+    console.error('offsetParent is not set -- cannot scroll');
+    return;
+  }
+  while (parent.clientHeight == parent.scrollHeight) {
+    offsetY += parent.offsetTop;
+    parent = parent.offsetParent;
+    if (!parent)
+      return; // no need to scroll
+  }
+  if (spot)
+    offsetY += spot.top;
+  parent.scrollTop = offsetY;
+}
+
+var Cache = function cacheCache(size) {
+  var data = [];
+  this.push = function cachePush(view) {
+    var i = data.indexOf(view);
+    if (i >= 0)
+      data.splice(i);
+    data.push(view);
+    if (data.length > size)
+      data.shift().destroy();
+  };
+};
+
+var ProgressBar = (function ProgressBarClosure() {
+
+  function clamp(v, min, max) {
+    return Math.min(Math.max(v, min), max);
+  }
+
+  function ProgressBar(id, opts) {
+
+    // Fetch the sub-elements for later
+    this.div = document.querySelector(id + ' .progress');
+
+    // Get options, with sensible defaults
+    this.height = opts.height || 100;
+    this.width = opts.width || 100;
+    this.units = opts.units || '%';
+
+    // Initialize heights
+    this.div.style.height = this.height + this.units;
+  }
+
+  ProgressBar.prototype = {
+
+    updateBar: function ProgressBar_updateBar() {
+      if (this._indeterminate) {
+        this.div.classList.add('indeterminate');
+        return;
+      }
+
+      var progressSize = this.width * this._percent / 100;
+
+      if (this._percent > 95)
+        this.div.classList.add('full');
+      else
+        this.div.classList.remove('full');
+      this.div.classList.remove('indeterminate');
+
+      this.div.style.width = progressSize + this.units;
+    },
+
+    get percent() {
+      return this._percent;
+    },
+
+    set percent(val) {
+      this._indeterminate = isNaN(val);
+      this._percent = clamp(val, 0, 100);
+      this.updateBar();
+    }
+  };
+
+  return ProgressBar;
+})();
+
+
+// Settings Manager - This is a utility for saving settings
+// First we see if localStorage is available
+// If not, we use FUEL in FF
+// Use asyncStorage for B2G
+var Settings = (function SettingsClosure() {
+  var isLocalStorageEnabled = (function localStorageEnabledTest() {
+    // Feature test as per http://diveintohtml5.info/storage.html
+    // The additional localStorage call is to get around a FF quirk, see
+    // bug #495747 in bugzilla
+    try {
+      return 'localStorage' in window && window['localStorage'] !== null &&
+          localStorage;
+    } catch (e) {
+      return false;
+    }
+  })();
+
+  function Settings(fingerprint) {
+    this.fingerprint = fingerprint;
+    this.initializedPromise = new PDFJS.Promise();
+
+    var resolvePromise = (function settingsResolvePromise(db) {
+      this.initialize(db || '{}');
+      this.initializedPromise.resolve();
+    }).bind(this);
+
+
+
+    if (isLocalStorageEnabled)
+      resolvePromise(localStorage.getItem('database'));
+  }
+
+  Settings.prototype = {
+    initialize: function settingsInitialize(database) {
+      database = JSON.parse(database);
+      if (!('files' in database))
+        database.files = [];
+      if (database.files.length >= SETTINGS_MEMORY)
+        database.files.shift();
+      var index;
+      for (var i = 0, length = database.files.length; i < length; i++) {
+        var branch = database.files[i];
+        if (branch.fingerprint == this.fingerprint) {
+          index = i;
+          break;
+        }
+      }
+      if (typeof index != 'number')
+        index = database.files.push({fingerprint: this.fingerprint}) - 1;
+      this.file = database.files[index];
+      this.database = database;
+    },
+
+    set: function settingsSet(name, val) {
+      if (!this.initializedPromise.isResolved)
+        return;
+
+      var file = this.file;
+      file[name] = val;
+      var database = JSON.stringify(this.database);
+
+
+
+      if (isLocalStorageEnabled)
+        localStorage.setItem('database', database);
+    },
+
+    get: function settingsGet(name, defaultValue) {
+      if (!this.initializedPromise.isResolved)
+        return defaultValue;
+
+      return this.file[name] || defaultValue;
+    }
+  };
+
+  return Settings;
+})();
+
+var cache = new Cache(CACHE_SIZE);
+var currentPageNumber = 1;
+
+var PDFFindController = {
+  startedTextExtraction: false,
+
+  extractTextPromises: [],
+
+  // If active, find results will be highlighted.
+  active: false,
+
+  // Stores the text for each page.
+  pageContents: [],
+
+  pageMatches: [],
+
+  // Currently selected match.
+  selected: {
+    pageIdx: -1,
+    matchIdx: -1
+  },
+
+  // Where find algorithm currently is in the document.
+  offset: {
+    pageIdx: null,
+    matchIdx: null
+  },
+
+  resumePageIdx: null,
+
+  resumeCallback: null,
+
+  state: null,
+
+  dirtyMatch: false,
+
+  findTimeout: null,
+
+  initialize: function() {
+    var events = [
+      'find',
+      'findagain',
+      'findhighlightallchange',
+      'findcasesensitivitychange'
+    ];
+
+    this.handleEvent = this.handleEvent.bind(this);
+
+    for (var i = 0; i < events.length; i++) {
+      window.addEventListener(events[i], this.handleEvent);
+    }
+  },
+
+  calcFindMatch: function(pageIndex) {
+    var pageContent = this.pageContents[pageIndex];
+    var query = this.state.query;
+    var caseSensitive = this.state.caseSensitive;
+    var queryLen = query.length;
+
+    if (queryLen === 0) {
+      // Do nothing the matches should be wiped out already.
+      return;
+    }
+
+    if (!caseSensitive) {
+      pageContent = pageContent.toLowerCase();
+      query = query.toLowerCase();
+    }
+
+    var matches = [];
+
+    var matchIdx = -queryLen;
+    while (true) {
+      matchIdx = pageContent.indexOf(query, matchIdx + queryLen);
+      if (matchIdx === -1) {
+        break;
+      }
+
+      matches.push(matchIdx);
+    }
+    this.pageMatches[pageIndex] = matches;
+    this.updatePage(pageIndex);
+    if (this.resumePageIdx === pageIndex) {
+      var callback = this.resumeCallback;
+      this.resumePageIdx = null;
+      this.resumeCallback = null;
+      callback();
+    }
+  },
+
+  extractText: function() {
+    if (this.startedTextExtraction) {
+      return;
+    }
+    this.startedTextExtraction = true;
+
+    this.pageContents = [];
+    for (var i = 0, ii = PDFView.pdfDocument.numPages; i < ii; i++) {
+      this.extractTextPromises.push(new PDFJS.Promise());
+    }
+
+    var self = this;
+    function extractPageText(pageIndex) {
+      PDFView.pages[pageIndex].getTextContent().then(
+        function textContentResolved(data) {
+          // Build the find string.
+          var bidiTexts = data.bidiTexts;
+          var str = '';
+
+          for (var i = 0; i < bidiTexts.length; i++) {
+            str += bidiTexts[i].str;
+          }
+
+          // Store the pageContent as a string.
+          self.pageContents.push(str);
+
+          self.extractTextPromises[pageIndex].resolve(pageIndex);
+          if ((pageIndex + 1) < PDFView.pages.length)
+            extractPageText(pageIndex + 1);
+        }
+      );
+    }
+    extractPageText(0);
+    return this.extractTextPromise;
+  },
+
+  handleEvent: function(e) {
+    if (this.state === null || e.type !== 'findagain') {
+      this.dirtyMatch = true;
+    }
+    this.state = e.detail;
+    this.updateUIState(FindStates.FIND_PENDING);
+
+    this.extractText();
+
+    clearTimeout(this.findTimeout);
+    if (e.type === 'find') {
+      // Only trigger the find action after 250ms of silence.
+      this.findTimeout = setTimeout(this.nextMatch.bind(this), 250);
+    } else {
+      this.nextMatch();
+    }
+  },
+
+  updatePage: function(idx) {
+    var page = PDFView.pages[idx];
+
+    if (this.selected.pageIdx === idx) {
+      // If the page is selected, scroll the page into view, which triggers
+      // rendering the page, which adds the textLayer. Once the textLayer is
+      // build, it will scroll onto the selected match.
+      page.scrollIntoView();
+    }
+
+    if (page.textLayer) {
+      page.textLayer.updateMatches();
+    }
+  },
+
+  nextMatch: function() {
+    var pages = PDFView.pages;
+    var previous = this.state.findPrevious;
+    var numPages = PDFView.pages.length;
+
+    this.active = true;
+
+    if (this.dirtyMatch) {
+      // Need to recalculate the matches, reset everything.
+      this.dirtyMatch = false;
+      this.selected.pageIdx = this.selected.matchIdx = -1;
+      this.offset.pageIdx = previous ? numPages - 1 : 0;
+      this.offset.matchIdx = null;
+      this.hadMatch = false;
+      this.resumeCallback = null;
+      this.resumePageIdx = null;
+      this.pageMatches = [];
+      var self = this;
+
+      for (var i = 0; i < numPages; i++) {
+        // Wipe out any previous highlighted matches.
+        this.updatePage(i);
+
+        // As soon as the text is extracted start finding the matches.
+        this.extractTextPromises[i].onData(function(pageIdx) {
+          // Use a timeout since all the pages may already be extracted and we
+          // want to start highlighting before finding all the matches.
+          setTimeout(function() {
+            self.calcFindMatch(pageIdx);
+          });
+        });
+      }
+    }
+
+    // If there's no query there's no point in searching.
+    if (this.state.query === '') {
+      this.updateUIState(FindStates.FIND_FOUND);
+      return;
+    }
+
+    // If we're waiting on a page, we return since we can't do anything else.
+    if (this.resumeCallback) {
+      return;
+    }
+
+    var offset = this.offset;
+    // If there's already a matchIdx that means we are iterating through a
+    // page's matches.
+    if (offset.matchIdx !== null) {
+      var numPageMatches = this.pageMatches[offset.pageIdx].length;
+      if ((!previous && offset.matchIdx + 1 < numPageMatches) ||
+          (previous && offset.matchIdx > 0)) {
+        // The simple case, we just have advance the matchIdx to select the next
+        // match on the page.
+        this.hadMatch = true;
+        offset.matchIdx = previous ? offset.matchIdx - 1 : offset.matchIdx + 1;
+        this.updateMatch(true);
+        return;
+      }
+      // We went beyond the current page's matches, so we advance to the next
+      // page.
+      this.advanceOffsetPage(previous);
+    }
+    // Start searching through the page.
+    this.nextPageMatch();
+  },
+
+  nextPageMatch: function() {
+    if (this.resumePageIdx !== null)
+      console.error('There can only be one pending page.');
+
+    var matchesReady = function(matches) {
+      var offset = this.offset;
+      var numMatches = matches.length;
+      var previous = this.state.findPrevious;
+      if (numMatches) {
+        // There were matches for the page, so initialize the matchIdx.
+        this.hadMatch = true;
+        offset.matchIdx = previous ? numMatches - 1 : 0;
+        this.updateMatch(true);
+      } else {
+        // No matches attempt to search the next page.
+        this.advanceOffsetPage(previous);
+        if (offset.wrapped) {
+          offset.matchIdx = null;
+          if (!this.hadMatch) {
+            // No point in wrapping there were no matches.
+            this.updateMatch(false);
+            return;
+          }
+        }
+        // Search the next page.
+        this.nextPageMatch();
+      }
+    }.bind(this);
+
+    var pageIdx = this.offset.pageIdx;
+    var pageMatches = this.pageMatches;
+    if (!pageMatches[pageIdx]) {
+      // The matches aren't ready setup a callback so we can be notified,
+      // when they are ready.
+      this.resumeCallback = function() {
+        matchesReady(pageMatches[pageIdx]);
+      };
+      this.resumePageIdx = pageIdx;
+      return;
+    }
+    // The matches are finished already.
+    matchesReady(pageMatches[pageIdx]);
+  },
+
+  advanceOffsetPage: function(previous) {
+    var offset = this.offset;
+    var numPages = this.extractTextPromises.length;
+    offset.pageIdx = previous ? offset.pageIdx - 1 : offset.pageIdx + 1;
+    offset.matchIdx = null;
+    if (offset.pageIdx >= numPages || offset.pageIdx < 0) {
+      offset.pageIdx = previous ? numPages - 1 : 0;
+      offset.wrapped = true;
+      return;
+    }
+  },
+
+  updateMatch: function(found) {
+    var state = FindStates.FIND_NOTFOUND;
+    var wrapped = this.offset.wrapped;
+    this.offset.wrapped = false;
+    if (found) {
+      var previousPage = this.selected.pageIdx;
+      this.selected.pageIdx = this.offset.pageIdx;
+      this.selected.matchIdx = this.offset.matchIdx;
+      state = wrapped ? FindStates.FIND_WRAPPED : FindStates.FIND_FOUND;
+      // Update the currently selected page to wipe out any selected matches.
+      if (previousPage !== -1 && previousPage !== this.selected.pageIdx) {
+        this.updatePage(previousPage);
+      }
+    }
+    this.updateUIState(state, this.state.findPrevious);
+    if (this.selected.pageIdx !== -1) {
+      this.updatePage(this.selected.pageIdx, true);
+    }
+  },
+
+  updateUIState: function(state, previous) {
+    if (PDFView.supportsIntegratedFind) {
+      FirefoxCom.request('updateFindControlState',
+                         {result: state, findPrevious: previous});
+      return;
+    }
+    PDFFindBar.updateUIState(state, previous);
+  }
+};
+
+var PDFFindBar = {
+  // TODO: Enable the FindBar *AFTER* the pagesPromise in the load function
+  // got resolved
+
+  opened: false,
+
+  initialize: function() {
+    this.bar = document.getElementById('findbar');
+    this.toggleButton = document.getElementById('viewFind');
+    this.findField = document.getElementById('findInput');
+    this.highlightAll = document.getElementById('findHighlightAll');
+    this.caseSensitive = document.getElementById('findMatchCase');
+    this.findMsg = document.getElementById('findMsg');
+    this.findStatusIcon = document.getElementById('findStatusIcon');
+
+    var self = this;
+    this.toggleButton.addEventListener('click', function() {
+      self.toggle();
+    });
+
+    this.findField.addEventListener('input', function() {
+      self.dispatchEvent('');
+    });
+
+    this.bar.addEventListener('keydown', function(evt) {
+      switch (evt.keyCode) {
+        case 13: // Enter
+          if (evt.target === self.findField) {
+            self.dispatchEvent('again', evt.shiftKey);
+          }
+          break;
+        case 27: // Escape
+          self.close();
+          break;
+      }
+    });
+
+    document.getElementById('findPrevious').addEventListener('click',
+      function() { self.dispatchEvent('again', true); }
+    );
+
+    document.getElementById('findNext').addEventListener('click', function() {
+      self.dispatchEvent('again', false);
+    });
+
+    this.highlightAll.addEventListener('click', function() {
+      self.dispatchEvent('highlightallchange');
+    });
+
+    this.caseSensitive.addEventListener('click', function() {
+      self.dispatchEvent('casesensitivitychange');
+    });
+  },
+
+  dispatchEvent: function(aType, aFindPrevious) {
+    var event = document.createEvent('CustomEvent');
+    event.initCustomEvent('find' + aType, true, true, {
+      query: this.findField.value,
+      caseSensitive: this.caseSensitive.checked,
+      highlightAll: this.highlightAll.checked,
+      findPrevious: aFindPrevious
+    });
+    return window.dispatchEvent(event);
+  },
+
+  updateUIState: function(state, previous) {
+    var notFound = false;
+    var findMsg = '';
+    var status = '';
+
+    switch (state) {
+      case FindStates.FIND_FOUND:
+        break;
+
+      case FindStates.FIND_PENDING:
+        status = 'pending';
+        break;
+
+      case FindStates.FIND_NOTFOUND:
+        findMsg = mozL10n.get('find_not_found', null, 'Phrase not found');
+        notFound = true;
+        break;
+
+      case FindStates.FIND_WRAPPED:
+        if (previous) {
+          findMsg = mozL10n.get('find_reached_top', null,
+                      'Reached top of document, continued from bottom');
+        } else {
+          findMsg = mozL10n.get('find_reached_bottom', null,
+                                'Reached end of document, continued from top');
+        }
+        break;
+    }
+
+    if (notFound) {
+      this.findField.classList.add('notFound');
+    } else {
+      this.findField.classList.remove('notFound');
+    }
+
+    this.findField.setAttribute('data-status', status);
+    this.findMsg.textContent = findMsg;
+  },
+
+  open: function() {
+    if (this.opened) return;
+
+    this.opened = true;
+    this.toggleButton.classList.add('toggled');
+    this.bar.classList.remove('hidden');
+    this.findField.select();
+    this.findField.focus();
+  },
+
+  close: function() {
+    if (!this.opened) return;
+
+    this.opened = false;
+    this.toggleButton.classList.remove('toggled');
+    this.bar.classList.add('hidden');
+
+    PDFFindController.active = false;
+  },
+
+  toggle: function() {
+    if (this.opened) {
+      this.close();
+    } else {
+      this.open();
+    }
+  }
+};
+
+var PDFView = {
+  pages: [],
+  thumbnails: [],
+  currentScale: UNKNOWN_SCALE,
+  currentScaleValue: null,
+  initialBookmark: document.location.hash.substring(1),
+  startedTextExtraction: false,
+  pageText: [],
+  container: null,
+  thumbnailContainer: null,
+  initialized: false,
+  fellback: false,
+  pdfDocument: null,
+  sidebarOpen: false,
+  pageViewScroll: null,
+  thumbnailViewScroll: null,
+  isFullscreen: false,
+  previousScale: null,
+  pageRotation: 0,
+  mouseScrollTimeStamp: 0,
+  mouseScrollDelta: 0,
+  lastScroll: 0,
+  previousPageNumber: 1,
+
+  // called once when the document is loaded
+  initialize: function pdfViewInitialize() {
+    var self = this;
+    var container = this.container = document.getElementById('viewerContainer');
+    this.pageViewScroll = {};
+    this.watchScroll(container, this.pageViewScroll, updateViewarea);
+
+    var thumbnailContainer = this.thumbnailContainer =
+                             document.getElementById('thumbnailView');
+    this.thumbnailViewScroll = {};
+    this.watchScroll(thumbnailContainer, this.thumbnailViewScroll,
+                     this.renderHighestPriority.bind(this));
+
+    PDFFindBar.initialize();
+    PDFFindController.initialize();
+
+    this.initialized = true;
+    container.addEventListener('scroll', function() {
+      self.lastScroll = Date.now();
+    }, false);
+  },
+
+  // Helper function to keep track whether a div was scrolled up or down and
+  // then call a callback.
+  watchScroll: function pdfViewWatchScroll(viewAreaElement, state, callback) {
+    state.down = true;
+    state.lastY = viewAreaElement.scrollTop;
+    viewAreaElement.addEventListener('scroll', function webViewerScroll(evt) {
+      var currentY = viewAreaElement.scrollTop;
+      var lastY = state.lastY;
+      if (currentY > lastY)
+        state.down = true;
+      else if (currentY < lastY)
+        state.down = false;
+      // else do nothing and use previous value
+      state.lastY = currentY;
+      callback();
+    }, true);
+  },
+
+  setScale: function pdfViewSetScale(val, resetAutoSettings, noScroll) {
+    if (val == this.currentScale)
+      return;
+
+    var pages = this.pages;
+    for (var i = 0; i < pages.length; i++)
+      pages[i].update(val * CSS_UNITS);
+
+    if (!noScroll && this.currentScale != val)
+      this.pages[this.page - 1].scrollIntoView();
+    this.currentScale = val;
+
+    var event = document.createEvent('UIEvents');
+    event.initUIEvent('scalechange', false, false, window, 0);
+    event.scale = val;
+    event.resetAutoSettings = resetAutoSettings;
+    window.dispatchEvent(event);
+  },
+
+  parseScale: function pdfViewParseScale(value, resetAutoSettings, noScroll) {
+    if ('custom' == value)
+      return;
+
+    var scale = parseFloat(value);
+    this.currentScaleValue = value;
+    if (scale) {
+      this.setScale(scale, true, noScroll);
+      return;
+    }
+
+    var container = this.container;
+    var currentPage = this.pages[this.page - 1];
+    if (!currentPage) {
+      return;
+    }
+
+    var pageWidthScale = (container.clientWidth - SCROLLBAR_PADDING) /
+                          currentPage.width * currentPage.scale / CSS_UNITS;
+    var pageHeightScale = (container.clientHeight - VERTICAL_PADDING) /
+                           currentPage.height * currentPage.scale / CSS_UNITS;
+    switch (value) {
+      case 'page-actual':
+        scale = 1;
+        break;
+      case 'page-width':
+        scale = pageWidthScale;
+        break;
+      case 'page-height':
+        scale = pageHeightScale;
+        break;
+      case 'page-fit':
+        scale = Math.min(pageWidthScale, pageHeightScale);
+        break;
+      case 'auto':
+        scale = Math.min(1.0, pageWidthScale);
+        break;
+    }
+    this.setScale(scale, resetAutoSettings, noScroll);
+
+    selectScaleOption(value);
+  },
+
+  zoomIn: function pdfViewZoomIn() {
+    var newScale = (this.currentScale * DEFAULT_SCALE_DELTA).toFixed(2);
+    newScale = Math.min(MAX_SCALE, newScale);
+    this.parseScale(newScale, true);
+  },
+
+  zoomOut: function pdfViewZoomOut() {
+    var newScale = (this.currentScale / DEFAULT_SCALE_DELTA).toFixed(2);
+    newScale = Math.max(MIN_SCALE, newScale);
+    this.parseScale(newScale, true);
+  },
+
+  set page(val) {
+    var pages = this.pages;
+    var input = document.getElementById('pageNumber');
+    var event = document.createEvent('UIEvents');
+    event.initUIEvent('pagechange', false, false, window, 0);
+
+    if (!(0 < val && val <= pages.length)) {
+      this.previousPageNumber = val;
+      event.pageNumber = this.page;
+      window.dispatchEvent(event);
+      return;
+    }
+
+    pages[val - 1].updateStats();
+    this.previousPageNumber = currentPageNumber;
+    currentPageNumber = val;
+    event.pageNumber = val;
+    window.dispatchEvent(event);
+
+    // checking if the this.page was called from the updateViewarea function:
+    // avoiding the creation of two "set page" method (internal and public)
+    if (updateViewarea.inProgress)
+      return;
+
+    // Avoid scrolling the first page during loading
+    if (this.loading && val == 1)
+      return;
+
+    pages[val - 1].scrollIntoView();
+  },
+
+  get page() {
+    return currentPageNumber;
+  },
+
+  get supportsPrinting() {
+    var canvas = document.createElement('canvas');
+    var value = 'mozPrintCallback' in canvas;
+    // shadow
+    Object.defineProperty(this, 'supportsPrinting', { value: value,
+                                                      enumerable: true,
+                                                      configurable: true,
+                                                      writable: false });
+    return value;
+  },
+
+  get supportsFullscreen() {
+    var doc = document.documentElement;
+    var support = doc.requestFullscreen || doc.mozRequestFullScreen ||
+                  doc.webkitRequestFullScreen;
+
+    // Disable fullscreen button if we're in an iframe
+    if (!!window.frameElement)
+      support = false;
+
+    Object.defineProperty(this, 'supportsFullScreen', { value: support,
+                                                        enumerable: true,
+                                                        configurable: true,
+                                                        writable: false });
+    return support;
+  },
+
+  get supportsIntegratedFind() {
+    var support = false;
+    Object.defineProperty(this, 'supportsIntegratedFind', { value: support,
+                                                            enumerable: true,
+                                                            configurable: true,
+                                                            writable: false });
+    return support;
+  },
+
+  get supportsDocumentFonts() {
+    var support = true;
+    Object.defineProperty(this, 'supportsDocumentFonts', { value: support,
+                                                           enumerable: true,
+                                                           configurable: true,
+                                                           writable: false });
+    return support;
+  },
+
+  get isHorizontalScrollbarEnabled() {
+    var div = document.getElementById('viewerContainer');
+    return div.scrollWidth > div.clientWidth;
+  },
+
+  initPassiveLoading: function pdfViewInitPassiveLoading() {
+    if (!PDFView.loadingBar) {
+      PDFView.loadingBar = new ProgressBar('#loadingBar', {});
+    }
+
+    window.addEventListener('message', function window_message(e) {
+      var args = e.data;
+
+      if (typeof args !== 'object' || !('pdfjsLoadAction' in args))
+        return;
+      switch (args.pdfjsLoadAction) {
+        case 'progress':
+          PDFView.progress(args.loaded / args.total);
+          break;
+        case 'complete':
+          if (!args.data) {
+            PDFView.error(mozL10n.get('loading_error', null,
+                          'An error occurred while loading the PDF.'), e);
+            break;
+          }
+          PDFView.open(args.data, 0);
+          break;
+      }
+    });
+    FirefoxCom.requestSync('initPassiveLoading', null);
+  },
+
+  setTitleUsingUrl: function pdfViewSetTitleUsingUrl(url) {
+    this.url = url;
+    try {
+      this.setTitle(decodeURIComponent(getFileName(url)) || url);
+    } catch (e) {
+      // decodeURIComponent may throw URIError,
+      // fall back to using the unprocessed url in that case
+      this.setTitle(url);
+    }
+  },
+
+  setTitle: function pdfViewSetTitle(title) {
+    document.title = title;
+  },
+
+  open: function pdfViewOpen(url, scale, password) {
+    var parameters = {password: password};
+    if (typeof url === 'string') { // URL
+      this.setTitleUsingUrl(url);
+      parameters.url = url;
+    } else if (url && 'byteLength' in url) { // ArrayBuffer
+      parameters.data = url;
+    }
+
+    if (!PDFView.loadingBar) {
+      PDFView.loadingBar = new ProgressBar('#loadingBar', {});
+    }
+
+    this.pdfDocument = null;
+    var self = this;
+    self.loading = true;
+    PDFJS.getDocument(parameters).then(
+      function getDocumentCallback(pdfDocument) {
+        self.load(pdfDocument, scale);
+        self.loading = false;
+      },
+      function getDocumentError(message, exception) {
+        if (exception && exception.name === 'PasswordException') {
+          if (exception.code === 'needpassword') {
+            var promptString = mozL10n.get('request_password', null,
+                                      'PDF is protected by a password:');
+            password = prompt(promptString);
+            if (password && password.length > 0) {
+              return PDFView.open(url, scale, password);
+            }
+          }
+        }
+
+        var loadingErrorMessage = mozL10n.get('loading_error', null,
+          'An error occurred while loading the PDF.');
+
+        if (exception && exception.name === 'InvalidPDFException') {
+          // change error message also for other builds
+          var loadingErrorMessage = mozL10n.get('invalid_file_error', null,
+                                        'Invalid or corrupted PDF file.');
+        }
+
+        if (exception && exception.name === 'MissingPDFException') {
+          // special message for missing PDF's
+          var loadingErrorMessage = mozL10n.get('missing_file_error', null,
+                                        'Missing PDF file.');
+
+        }
+
+        var loadingIndicator = document.getElementById('loading');
+        loadingIndicator.textContent = mozL10n.get('loading_error_indicator',
+          null, 'Error');
+        var moreInfo = {
+          message: message
+        };
+        self.error(loadingErrorMessage, moreInfo);
+        self.loading = false;
+      },
+      function getDocumentProgress(progressData) {
+        self.progress(progressData.loaded / progressData.total);
+      }
+    );
+  },
+
+  download: function pdfViewDownload() {
+    function noData() {
+      FirefoxCom.request('download', { originalUrl: url });
+    }
+    var url = this.url.split('#')[0];
+    url += '#pdfjs.action=download';
+    window.open(url, '_parent');
+  },
+
+  fallback: function pdfViewFallback() {
+    return;
+  },
+
+  navigateTo: function pdfViewNavigateTo(dest) {
+    if (typeof dest === 'string')
+      dest = this.destinations[dest];
+    if (!(dest instanceof Array))
+      return; // invalid destination
+    // dest array looks like that: <page-ref> </XYZ|FitXXX> <args..>
+    var destRef = dest[0];
+    var pageNumber = destRef instanceof Object ?
+      this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] : (destRef + 1);
+    if (pageNumber > this.pages.length)
+      pageNumber = this.pages.length;
+    if (pageNumber) {
+      this.page = pageNumber;
+      var currentPage = this.pages[pageNumber - 1];
+      currentPage.scrollIntoView(dest);
+    }
+  },
+
+  getDestinationHash: function pdfViewGetDestinationHash(dest) {
+    if (typeof dest === 'string')
+      return PDFView.getAnchorUrl('#' + escape(dest));
+    if (dest instanceof Array) {
+      var destRef = dest[0]; // see navigateTo method for dest format
+      var pageNumber = destRef instanceof Object ?
+        this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] :
+        (destRef + 1);
+      if (pageNumber) {
+        var pdfOpenParams = PDFView.getAnchorUrl('#page=' + pageNumber);
+        var destKind = dest[1];
+        if (typeof destKind === 'object' && 'name' in destKind &&
+            destKind.name == 'XYZ') {
+          var scale = (dest[4] || this.currentScale);
+          pdfOpenParams += '&zoom=' + (scale * 100);
+          if (dest[2] || dest[3]) {
+            pdfOpenParams += ',' + (dest[2] || 0) + ',' + (dest[3] || 0);
+          }
+        }
+        return pdfOpenParams;
+      }
+    }
+    return '';
+  },
+
+  /**
+   * For the firefox extension we prefix the full url on anchor links so they
+   * don't come up as resource:// urls and so open in new tab/window works.
+   * @param {String} anchor The anchor hash include the #.
+   */
+  getAnchorUrl: function getAnchorUrl(anchor) {
+    return anchor;
+  },
+
+  /**
+   * Returns scale factor for the canvas. It makes sense for the HiDPI displays.
+   * @return {Object} The object with horizontal (sx) and vertical (sy)
+                      scales. The scaled property is set to false if scaling is
+                      not required, true otherwise.
+   */
+  getOutputScale: function pdfViewGetOutputDPI() {
+    var pixelRatio = 'devicePixelRatio' in window ? window.devicePixelRatio : 1;
+    return {
+      sx: pixelRatio,
+      sy: pixelRatio,
+      scaled: pixelRatio != 1
+    };
+  },
+
+  /**
+   * Show the error box.
+   * @param {String} message A message that is human readable.
+   * @param {Object} moreInfo (optional) Further information about the error
+   *                            that is more technical.  Should have a 'message'
+   *                            and optionally a 'stack' property.
+   */
+  error: function pdfViewError(message, moreInfo) {
+    var moreInfoText = mozL10n.get('error_version_info',
+      {version: PDFJS.version || '?', build: PDFJS.build || '?'},
+      'PDF.js v{{version}} (build: {{build}})') + '\n';
+    if (moreInfo) {
+      moreInfoText +=
+        mozL10n.get('error_message', {message: moreInfo.message},
+        'Message: {{message}}');
+      if (moreInfo.stack) {
+        moreInfoText += '\n' +
+          mozL10n.get('error_stack', {stack: moreInfo.stack},
+          'Stack: {{stack}}');
+      } else {
+        if (moreInfo.filename) {
+          moreInfoText += '\n' +
+            mozL10n.get('error_file', {file: moreInfo.filename},
+            'File: {{file}}');
+        }
+        if (moreInfo.lineNumber) {
+          moreInfoText += '\n' +
+            mozL10n.get('error_line', {line: moreInfo.lineNumber},
+            'Line: {{line}}');
+        }
+      }
+    }
+
+    var loadingBox = document.getElementById('loadingBox');
+    loadingBox.setAttribute('hidden', 'true');
+
+    var errorWrapper = document.getElementById('errorWrapper');
+    errorWrapper.removeAttribute('hidden');
+
+    var errorMessage = document.getElementById('errorMessage');
+    errorMessage.textContent = message;
+
+    var closeButton = document.getElementById('errorClose');
+    closeButton.onclick = function() {
+      errorWrapper.setAttribute('hidden', 'true');
+    };
+
+    var errorMoreInfo = document.getElementById('errorMoreInfo');
+    var moreInfoButton = document.getElementById('errorShowMore');
+    var lessInfoButton = document.getElementById('errorShowLess');
+    moreInfoButton.onclick = function() {
+      errorMoreInfo.removeAttribute('hidden');
+      moreInfoButton.setAttribute('hidden', 'true');
+      lessInfoButton.removeAttribute('hidden');
+    };
+    lessInfoButton.onclick = function() {
+      errorMoreInfo.setAttribute('hidden', 'true');
+      moreInfoButton.removeAttribute('hidden');
+      lessInfoButton.setAttribute('hidden', 'true');
+    };
+    moreInfoButton.removeAttribute('hidden');
+    lessInfoButton.setAttribute('hidden', 'true');
+    errorMoreInfo.value = moreInfoText;
+
+    errorMoreInfo.rows = moreInfoText.split('\n').length - 1;
+  },
+
+  progress: function pdfViewProgress(level) {
+    var percent = Math.round(level * 100);
+    PDFView.loadingBar.percent = percent;
+  },
+
+  load: function pdfViewLoad(pdfDocument, scale) {
+    function bindOnAfterDraw(pageView, thumbnailView) {
+      // when page is painted, using the image as thumbnail base
+      pageView.onAfterDraw = function pdfViewLoadOnAfterDraw() {
+        thumbnailView.setImage(pageView.canvas);
+      };
+    }
+
+    this.pdfDocument = pdfDocument;
+
+    var errorWrapper = document.getElementById('errorWrapper');
+    errorWrapper.setAttribute('hidden', 'true');
+
+    var loadingBox = document.getElementById('loadingBox');
+    loadingBox.setAttribute('hidden', 'true');
+    var loadingIndicator = document.getElementById('loading');
+    loadingIndicator.textContent = '';
+
+    var thumbsView = document.getElementById('thumbnailView');
+    thumbsView.parentNode.scrollTop = 0;
+
+    while (thumbsView.hasChildNodes())
+      thumbsView.removeChild(thumbsView.lastChild);
+
+    if ('_loadingInterval' in thumbsView)
+      clearInterval(thumbsView._loadingInterval);
+
+    var container = document.getElementById('viewer');
+    while (container.hasChildNodes())
+      container.removeChild(container.lastChild);
+
+    var pagesCount = pdfDocument.numPages;
+    var id = pdfDocument.fingerprint;
+    document.getElementById('numPages').textContent =
+      mozL10n.get('page_of', {pageCount: pagesCount}, 'of {{pageCount}}');
+    document.getElementById('pageNumber').max = pagesCount;
+
+    PDFView.documentFingerprint = id;
+    var store = PDFView.store = new Settings(id);
+    var storePromise = store.initializedPromise;
+
+    this.pageRotation = 0;
+
+    var pages = this.pages = [];
+    this.pageText = [];
+    this.startedTextExtraction = false;
+    var pagesRefMap = {};
+    var thumbnails = this.thumbnails = [];
+    var pagePromises = [];
+    for (var i = 1; i <= pagesCount; i++)
+      pagePromises.push(pdfDocument.getPage(i));
+    var self = this;
+    var pagesPromise = PDFJS.Promise.all(pagePromises);
+    pagesPromise.then(function(promisedPages) {
+      for (var i = 1; i <= pagesCount; i++) {
+        var page = promisedPages[i - 1];
+        var pageView = new PageView(container, page, i, scale,
+                                    page.stats, self.navigateTo.bind(self));
+        var thumbnailView = new ThumbnailView(thumbsView, page, i);
+        bindOnAfterDraw(pageView, thumbnailView);
+
+        pages.push(pageView);
+        thumbnails.push(thumbnailView);
+        var pageRef = page.ref;
+        pagesRefMap[pageRef.num + ' ' + pageRef.gen + ' R'] = i;
+      }
+
+      self.pagesRefMap = pagesRefMap;
+    });
+
+    var destinationsPromise = pdfDocument.getDestinations();
+    destinationsPromise.then(function(destinations) {
+      self.destinations = destinations;
+    });
+
+    // outline and initial view depends on destinations and pagesRefMap
+    var promises = [pagesPromise, destinationsPromise, storePromise,
+                    PDFView.animationStartedPromise];
+    PDFJS.Promise.all(promises).then(function() {
+      pdfDocument.getOutline().then(function(outline) {
+        self.outline = new DocumentOutlineView(outline);
+      });
+
+      var storedHash = null;
+      if (store.get('exists', false)) {
+        var page = store.get('page', '1');
+        var zoom = store.get('zoom', PDFView.currentScale);
+        var left = store.get('scrollLeft', '0');
+        var top = store.get('scrollTop', '0');
+
+        storedHash = 'page=' + page + '&zoom=' + zoom + ',' + left + ',' + top;
+      }
+
+      self.setInitialView(storedHash, scale);
+    });
+
+    pdfDocument.getMetadata().then(function(data) {
+      var info = data.info, metadata = data.metadata;
+      self.documentInfo = info;
+      self.metadata = metadata;
+
+      // Provides some basic debug information
+      console.log('PDF ' + pdfDocument.fingerprint + ' [' +
+                  info.PDFFormatVersion + ' ' + (info.Producer || '-') +
+                  ' / ' + (info.Creator || '-') + ']' +
+                  (PDFJS.version ? ' (PDF.js: ' + PDFJS.version + ')' : ''));
+
+      var pdfTitle;
+      if (metadata) {
+        if (metadata.has('dc:title'))
+          pdfTitle = metadata.get('dc:title');
+      }
+
+      if (!pdfTitle && info && info['Title'])
+        pdfTitle = info['Title'];
+
+      if (pdfTitle)
+        self.setTitle(pdfTitle + ' - ' + document.title);
+
+      if (info.IsAcroFormPresent) {
+        // AcroForm/XFA was found
+        PDFView.fallback();
+      }
+    });
+  },
+
+  setInitialView: function pdfViewSetInitialView(storedHash, scale) {
+    // Reset the current scale, as otherwise the page's scale might not get
+    // updated if the zoom level stayed the same.
+    this.currentScale = 0;
+    this.currentScaleValue = null;
+    if (this.initialBookmark) {
+      this.setHash(this.initialBookmark);
+      this.initialBookmark = null;
+    }
+    else if (storedHash)
+      this.setHash(storedHash);
+    else if (scale) {
+      this.parseScale(scale, true);
+      this.page = 1;
+    }
+
+    if (PDFView.currentScale === UNKNOWN_SCALE) {
+      // Scale was not initialized: invalid bookmark or scale was not specified.
+      // Setting the default one.
+      this.parseScale(DEFAULT_SCALE, true);
+    }
+  },
+
+  renderHighestPriority: function pdfViewRenderHighestPriority() {
+    // Pages have a higher priority than thumbnails, so check them first.
+    var visiblePages = this.getVisiblePages();
+    var pageView = this.getHighestPriority(visiblePages, this.pages,
+                                           this.pageViewScroll.down);
+    if (pageView) {
+      this.renderView(pageView, 'page');
+      return;
+    }
+    // No pages needed rendering so check thumbnails.
+    if (this.sidebarOpen) {
+      var visibleThumbs = this.getVisibleThumbs();
+      var thumbView = this.getHighestPriority(visibleThumbs,
+                                              this.thumbnails,
+                                              this.thumbnailViewScroll.down);
+      if (thumbView)
+        this.renderView(thumbView, 'thumbnail');
+    }
+  },
+
+  getHighestPriority: function pdfViewGetHighestPriority(visible, views,
+                                                         scrolledDown) {
+    // The state has changed figure out which page has the highest priority to
+    // render next (if any).
+    // Priority:
+    // 1 visible pages
+    // 2 if last scrolled down page after the visible pages
+    // 2 if last scrolled up page before the visible pages
+    var visibleViews = visible.views;
+
+    var numVisible = visibleViews.length;
+    if (numVisible === 0) {
+      return false;
+    }
+    for (var i = 0; i < numVisible; ++i) {
+      var view = visibleViews[i].view;
+      if (!this.isViewFinished(view))
+        return view;
+    }
+
+    // All the visible views have rendered, try to render next/previous pages.
+    if (scrolledDown) {
+      var nextPageIndex = visible.last.id;
+      // ID's start at 1 so no need to add 1.
+      if (views[nextPageIndex] && !this.isViewFinished(views[nextPageIndex]))
+        return views[nextPageIndex];
+    } else {
+      var previousPageIndex = visible.first.id - 2;
+      if (views[previousPageIndex] &&
+          !this.isViewFinished(views[previousPageIndex]))
+        return views[previousPageIndex];
+    }
+    // Everything that needs to be rendered has been.
+    return false;
+  },
+
+  isViewFinished: function pdfViewNeedsRendering(view) {
+    return view.renderingState === RenderingStates.FINISHED;
+  },
+
+  // Render a page or thumbnail view. This calls the appropriate function based
+  // on the views state. If the view is already rendered it will return false.
+  renderView: function pdfViewRender(view, type) {
+    var state = view.renderingState;
+    switch (state) {
+      case RenderingStates.FINISHED:
+        return false;
+      case RenderingStates.PAUSED:
+        PDFView.highestPriorityPage = type + view.id;
+        view.resume();
+        break;
+      case RenderingStates.RUNNING:
+        PDFView.highestPriorityPage = type + view.id;
+        break;
+      case RenderingStates.INITIAL:
+        PDFView.highestPriorityPage = type + view.id;
+        view.draw(this.renderHighestPriority.bind(this));
+        break;
+    }
+    return true;
+  },
+
+  setHash: function pdfViewSetHash(hash) {
+    if (!hash)
+      return;
+
+    if (hash.indexOf('=') >= 0) {
+      var params = PDFView.parseQueryString(hash);
+      // borrowing syntax from "Parameters for Opening PDF Files"
+      if ('nameddest' in params) {
+        PDFView.navigateTo(params.nameddest);
+        return;
+      }
+      if ('page' in params) {
+        var pageNumber = (params.page | 0) || 1;
+        if ('zoom' in params) {
+          var zoomArgs = params.zoom.split(','); // scale,left,top
+          // building destination array
+
+          // If the zoom value, it has to get divided by 100. If it is a string,
+          // it should stay as it is.
+          var zoomArg = zoomArgs[0];
+          var zoomArgNumber = parseFloat(zoomArg);
+          if (zoomArgNumber)
+            zoomArg = zoomArgNumber / 100;
+
+          var dest = [null, {name: 'XYZ'}, (zoomArgs[1] | 0),
+            (zoomArgs[2] | 0), zoomArg];
+          var currentPage = this.pages[pageNumber - 1];
+          currentPage.scrollIntoView(dest);
+        } else {
+          this.page = pageNumber; // simple page
+        }
+      }
+    } else if (/^\d+$/.test(hash)) // page number
+      this.page = hash;
+    else // named destination
+      PDFView.navigateTo(unescape(hash));
+  },
+
+  switchSidebarView: function pdfViewSwitchSidebarView(view) {
+    var thumbsView = document.getElementById('thumbnailView');
+    var outlineView = document.getElementById('outlineView');
+
+    var thumbsButton = document.getElementById('viewThumbnail');
+    var outlineButton = document.getElementById('viewOutline');
+
+    switch (view) {
+      case 'thumbs':
+        var wasOutlineViewVisible = thumbsView.classList.contains('hidden');
+
+        thumbsButton.classList.add('toggled');
+        outlineButton.classList.remove('toggled');
+        thumbsView.classList.remove('hidden');
+        outlineView.classList.add('hidden');
+
+        PDFView.renderHighestPriority();
+
+        if (wasOutlineViewVisible) {
+          // Ensure that the thumbnail of the current page is visible
+          // when switching from the outline view.
+          scrollIntoView(document.getElementById('thumbnailContainer' +
+                                                 this.page));
+        }
+        break;
+
+      case 'outline':
+        thumbsButton.classList.remove('toggled');
+        outlineButton.classList.add('toggled');
+        thumbsView.classList.add('hidden');
+        outlineView.classList.remove('hidden');
+
+        if (outlineButton.getAttribute('disabled'))
+          return;
+        break;
+    }
+  },
+
+  getVisiblePages: function pdfViewGetVisiblePages() {
+    return this.getVisibleElements(this.container,
+                                   this.pages, true);
+  },
+
+  getVisibleThumbs: function pdfViewGetVisibleThumbs() {
+    return this.getVisibleElements(this.thumbnailContainer,
+                                   this.thumbnails);
+  },
+
+  // Generic helper to find out what elements are visible within a scroll pane.
+  getVisibleElements: function pdfViewGetVisibleElements(
+      scrollEl, views, sortByVisibility) {
+    var currentHeight = 0, view;
+    var top = scrollEl.scrollTop;
+
+    for (var i = 1, ii = views.length; i <= ii; ++i) {
+      view = views[i - 1];
+      currentHeight = view.el.offsetTop;
+      if (currentHeight + view.el.clientHeight > top)
+        break;
+      currentHeight += view.el.clientHeight;
+    }
+
+    var visible = [];
+
+    // Algorithm broken in fullscreen mode
+    if (this.isFullscreen) {
+      var currentPage = this.pages[this.page - 1];
+      visible.push({
+        id: currentPage.id,
+        view: currentPage
+      });
+
+      return { first: currentPage, last: currentPage, views: visible};
+    }
+
+    var bottom = top + scrollEl.clientHeight;
+    var nextHeight, hidden, percent, viewHeight;
+    for (; i <= ii && currentHeight < bottom; ++i) {
+      view = views[i - 1];
+      viewHeight = view.el.clientHeight;
+      currentHeight = view.el.offsetTop;
+      nextHeight = currentHeight + viewHeight;
+      hidden = Math.max(0, top - currentHeight) +
+               Math.max(0, nextHeight - bottom);
+      percent = Math.floor((viewHeight - hidden) * 100.0 / viewHeight);
+      visible.push({ id: view.id, y: currentHeight,
+                     view: view, percent: percent });
+      currentHeight = nextHeight;
+    }
+
+    var first = visible[0];
+    var last = visible[visible.length - 1];
+
+    if (sortByVisibility) {
+      visible.sort(function(a, b) {
+        var pc = a.percent - b.percent;
+        if (Math.abs(pc) > 0.001)
+          return -pc;
+
+        return a.id - b.id; // ensure stability
+      });
+    }
+
+    return {first: first, last: last, views: visible};
+  },
+
+  // Helper function to parse query string (e.g. ?param1=value&parm2=...).
+  parseQueryString: function pdfViewParseQueryString(query) {
+    var parts = query.split('&');
+    var params = {};
+    for (var i = 0, ii = parts.length; i < parts.length; ++i) {
+      var param = parts[i].split('=');
+      var key = param[0];
+      var value = param.length > 1 ? param[1] : null;
+      params[unescape(key)] = unescape(value);
+    }
+    return params;
+  },
+
+  beforePrint: function pdfViewSetupBeforePrint() {
+    if (!this.supportsPrinting) {
+      var printMessage = mozL10n.get('printing_not_supported', null,
+          'Warning: Printing is not fully supported by this browser.');
+      this.error(printMessage);
+      return;
+    }
+    var body = document.querySelector('body');
+    body.setAttribute('data-mozPrintCallback', true);
+    for (var i = 0, ii = this.pages.length; i < ii; ++i) {
+      this.pages[i].beforePrint();
+    }
+  },
+
+  afterPrint: function pdfViewSetupAfterPrint() {
+    var div = document.getElementById('printContainer');
+    while (div.hasChildNodes())
+      div.removeChild(div.lastChild);
+  },
+
+  fullscreen: function pdfViewFullscreen() {
+    var isFullscreen = document.fullscreenElement || document.mozFullScreen ||
+        document.webkitIsFullScreen;
+
+    if (isFullscreen) {
+      return false;
+    }
+
+    var wrapper = document.getElementById('viewerContainer');
+    if (document.documentElement.requestFullscreen) {
+      wrapper.requestFullscreen();
+    } else if (document.documentElement.mozRequestFullScreen) {
+      wrapper.mozRequestFullScreen();
+    } else if (document.documentElement.webkitRequestFullScreen) {
+      wrapper.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
+    } else {
+      return false;
+    }
+
+    this.isFullscreen = true;
+    var currentPage = this.pages[this.page - 1];
+    this.previousScale = this.currentScaleValue;
+    this.parseScale('page-fit', true);
+
+    // Wait for fullscreen to take effect
+    setTimeout(function() {
+      currentPage.scrollIntoView();
+    }, 0);
+
+    this.showPresentationControls();
+    return true;
+  },
+
+  exitFullscreen: function pdfViewExitFullscreen() {
+    this.isFullscreen = false;
+    this.parseScale(this.previousScale);
+    this.page = this.page;
+    this.clearMouseScrollState();
+    this.hidePresentationControls();
+  },
+
+  showPresentationControls: function pdfViewShowPresentationControls() {
+    var DELAY_BEFORE_HIDING_CONTROLS = 3000;
+    var wrapper = document.getElementById('viewerContainer');
+    if (this.presentationControlsTimeout) {
+      clearTimeout(this.presentationControlsTimeout);
+    } else {
+      wrapper.classList.add('presentationControls');
+    }
+    this.presentationControlsTimeout = setTimeout(function hideControls() {
+      wrapper.classList.remove('presentationControls');
+      delete PDFView.presentationControlsTimeout;
+    }, DELAY_BEFORE_HIDING_CONTROLS);
+  },
+
+  hidePresentationControls: function pdfViewShowPresentationControls() {
+    if (!this.presentationControlsTimeout) {
+      return;
+    }
+    clearTimeout(this.presentationControlsTimeout);
+    delete this.presentationControlsTimeout;
+
+    var wrapper = document.getElementById('viewerContainer');
+    wrapper.classList.remove('presentationControls');
+  },
+
+  rotatePages: function pdfViewPageRotation(delta) {
+
+    this.pageRotation = (this.pageRotation + 360 + delta) % 360;
+
+    for (var i = 0, l = this.pages.length; i < l; i++) {
+      var page = this.pages[i];
+      page.update(page.scale, this.pageRotation);
+    }
+
+    for (var i = 0, l = this.thumbnails.length; i < l; i++) {
+      var thumb = this.thumbnails[i];
+      thumb.updateRotation(this.pageRotation);
+    }
+
+    var currentPage = this.pages[this.page - 1];
+
+    this.parseScale(this.currentScaleValue, true);
+
+    this.renderHighestPriority();
+
+    // Wait for fullscreen to take effect
+    setTimeout(function() {
+      currentPage.scrollIntoView();
+    }, 0);
+  },
+
+  /**
+   * This function flips the page in presentation mode if the user scrolls up
+   * or down with large enough motion and prevents page flipping too often.
+   *
+   * @this {PDFView}
+   * @param {number} mouseScrollDelta The delta value from the mouse event.
+   */
+  mouseScroll: function pdfViewMouseScroll(mouseScrollDelta) {
+    var MOUSE_SCROLL_COOLDOWN_TIME = 50;
+
+    var currentTime = (new Date()).getTime();
+    var storedTime = this.mouseScrollTimeStamp;
+
+    // In case one page has already been flipped there is a cooldown time
+    // which has to expire before next page can be scrolled on to.
+    if (currentTime > storedTime &&
+        currentTime - storedTime < MOUSE_SCROLL_COOLDOWN_TIME)
+      return;
+
+    // In case the user decides to scroll to the opposite direction than before
+    // clear the accumulated delta.
+    if ((this.mouseScrollDelta > 0 && mouseScrollDelta < 0) ||
+        (this.mouseScrollDelta < 0 && mouseScrollDelta > 0))
+      this.clearMouseScrollState();
+
+    this.mouseScrollDelta += mouseScrollDelta;
+
+    var PAGE_FLIP_THRESHOLD = 120;
+    if (Math.abs(this.mouseScrollDelta) >= PAGE_FLIP_THRESHOLD) {
+
+      var PageFlipDirection = {
+        UP: -1,
+        DOWN: 1
+      };
+
+      // In fullscreen mode scroll one page at a time.
+      var pageFlipDirection = (this.mouseScrollDelta > 0) ?
+                                PageFlipDirection.UP :
+                                PageFlipDirection.DOWN;
+      this.clearMouseScrollState();
+      var currentPage = this.page;
+
+      // In case we are already on the first or the last page there is no need
+      // to do anything.
+      if ((currentPage == 1 && pageFlipDirection == PageFlipDirection.UP) ||
+          (currentPage == this.pages.length &&
+           pageFlipDirection == PageFlipDirection.DOWN))
+        return;
+
+      this.page += pageFlipDirection;
+      this.mouseScrollTimeStamp = currentTime;
+    }
+  },
+
+  /**
+   * This function clears the member attributes used with mouse scrolling in
+   * presentation mode.
+   *
+   * @this {PDFView}
+   */
+  clearMouseScrollState: function pdfViewClearMouseScrollState() {
+    this.mouseScrollTimeStamp = 0;
+    this.mouseScrollDelta = 0;
+  }
+};
+
+var PageView = function pageView(container, pdfPage, id, scale,
+                                 stats, navigateTo) {
+  this.id = id;
+  this.pdfPage = pdfPage;
+
+  this.rotation = 0;
+  this.scale = scale || 1.0;
+  this.viewport = this.pdfPage.getViewport(this.scale, this.pdfPage.rotate);
+
+  this.renderingState = RenderingStates.INITIAL;
+  this.resume = null;
+
+  this.textContent = null;
+  this.textLayer = null;
+
+  var anchor = document.createElement('a');
+  anchor.name = '' + this.id;
+
+  var div = this.el = document.createElement('div');
+  div.id = 'pageContainer' + this.id;
+  div.className = 'page';
+  div.style.width = Math.floor(this.viewport.width) + 'px';
+  div.style.height = Math.floor(this.viewport.height) + 'px';
+
+  container.appendChild(anchor);
+  container.appendChild(div);
+
+  this.destroy = function pageViewDestroy() {
+    this.update();
+    this.pdfPage.destroy();
+  };
+
+  this.update = function pageViewUpdate(scale, rotation) {
+    this.renderingState = RenderingStates.INITIAL;
+    this.resume = null;
+
+    if (typeof rotation !== 'undefined') {
+      this.rotation = rotation;
+    }
+
+    this.scale = scale || this.scale;
+
+    var totalRotation = (this.rotation + this.pdfPage.rotate) % 360;
+    var viewport = this.pdfPage.getViewport(this.scale, totalRotation);
+
+    this.viewport = viewport;
+    div.style.width = Math.floor(viewport.width) + 'px';
+    div.style.height = Math.floor(viewport.height) + 'px';
+
+    while (div.hasChildNodes())
+      div.removeChild(div.lastChild);
+    div.removeAttribute('data-loaded');
+
+    delete this.canvas;
+
+    this.loadingIconDiv = document.createElement('div');
+    this.loadingIconDiv.className = 'loadingIcon';
+    div.appendChild(this.loadingIconDiv);
+  };
+
+  Object.defineProperty(this, 'width', {
+    get: function PageView_getWidth() {
+      return this.viewport.width;
+    },
+    enumerable: true
+  });
+
+  Object.defineProperty(this, 'height', {
+    get: function PageView_getHeight() {
+      return this.viewport.height;
+    },
+    enumerable: true
+  });
+
+  function setupAnnotations(pdfPage, viewport) {
+    function bindLink(link, dest) {
+      link.href = PDFView.getDestinationHash(dest);
+      link.onclick = function pageViewSetupLinksOnclick() {
+        if (dest)
+          PDFView.navigateTo(dest);
+        return false;
+      };
+    }
+    function createElementWithStyle(tagName, item, rect) {
+      if (!rect) {
+        rect = viewport.convertToViewportRectangle(item.rect);
+        rect = PDFJS.Util.normalizeRect(rect);
+      }
+      var element = document.createElement(tagName);
+      element.style.left = Math.floor(rect[0]) + 'px';
+      element.style.top = Math.floor(rect[1]) + 'px';
+      element.style.width = Math.ceil(rect[2] - rect[0]) + 'px';
+      element.style.height = Math.ceil(rect[3] - rect[1]) + 'px';
+      return element;
+    }
+    function createTextAnnotation(item) {
+      var container = document.createElement('section');
+      container.className = 'annotText';
+
+      var rect = viewport.convertToViewportRectangle(item.rect);
+      rect = PDFJS.Util.normalizeRect(rect);
+      // sanity check because of OOo-generated PDFs
+      if ((rect[3] - rect[1]) < ANNOT_MIN_SIZE) {
+        rect[3] = rect[1] + ANNOT_MIN_SIZE;
+      }
+      if ((rect[2] - rect[0]) < ANNOT_MIN_SIZE) {
+        rect[2] = rect[0] + (rect[3] - rect[1]); // make it square
+      }
+      var image = createElementWithStyle('img', item, rect);
+      var iconName = item.name;
+      image.src = IMAGE_DIR + 'annotation-' +
+        iconName.toLowerCase() + '.svg';
+      image.alt = mozL10n.get('text_annotation_type', {type: iconName},
+        '[{{type}} Annotation]');
+      var content = document.createElement('div');
+      content.setAttribute('hidden', true);
+      var title = document.createElement('h1');
+      var text = document.createElement('p');
+      content.style.left = Math.floor(rect[2]) + 'px';
+      content.style.top = Math.floor(rect[1]) + 'px';
+      title.textContent = item.title;
+
+      if (!item.content && !item.title) {
+        content.setAttribute('hidden', true);
+      } else {
+        var e = document.createElement('span');
+        var lines = item.content.split(/(?:\r\n?|\n)/);
+        for (var i = 0, ii = lines.length; i < ii; ++i) {
+          var line = lines[i];
+          e.appendChild(document.createTextNode(line));
+          if (i < (ii - 1))
+            e.appendChild(document.createElement('br'));
+        }
+        text.appendChild(e);
+        image.addEventListener('mouseover', function annotationImageOver() {
+           content.removeAttribute('hidden');
+        }, false);
+
+        image.addEventListener('mouseout', function annotationImageOut() {
+           content.setAttribute('hidden', true);
+        }, false);
+      }
+
+      content.appendChild(title);
+      content.appendChild(text);
+      container.appendChild(image);
+      container.appendChild(content);
+
+      return container;
+    }
+
+    pdfPage.getAnnotations().then(function(items) {
+      for (var i = 0; i < items.length; i++) {
+        var item = items[i];
+        switch (item.type) {
+          case 'Link':
+            var link = createElementWithStyle('a', item);
+            link.href = item.url || '';
+            if (!item.url)
+              bindLink(link, ('dest' in item) ? item.dest : null);
+            div.appendChild(link);
+            break;
+          case 'Text':
+            var textAnnotation = createTextAnnotation(item);
+            if (textAnnotation)
+              div.appendChild(textAnnotation);
+            break;
+        }
+      }
+    });
+  }
+
+  this.getPagePoint = function pageViewGetPagePoint(x, y) {
+    return this.viewport.convertToPdfPoint(x, y);
+  };
+
+  this.scrollIntoView = function pageViewScrollIntoView(dest) {
+      if (!dest) {
+        scrollIntoView(div);
+        return;
+      }
+
+      var x = 0, y = 0;
+      var width = 0, height = 0, widthScale, heightScale;
+      var scale = 0;
+      switch (dest[1].name) {
+        case 'XYZ':
+          x = dest[2];
+          y = dest[3];
+          scale = dest[4];
+          break;
+        case 'Fit':
+        case 'FitB':
+          scale = 'page-fit';
+          break;
+        case 'FitH':
+        case 'FitBH':
+          y = dest[2];
+          scale = 'page-width';
+          break;
+        case 'FitV':
+        case 'FitBV':
+          x = dest[2];
+          scale = 'page-height';
+          break;
+        case 'FitR':
+          x = dest[2];
+          y = dest[3];
+          width = dest[4] - x;
+          height = dest[5] - y;
+          widthScale = (this.container.clientWidth - SCROLLBAR_PADDING) /
+            width / CSS_UNITS;
+          heightScale = (this.container.clientHeight - SCROLLBAR_PADDING) /
+            height / CSS_UNITS;
+          scale = Math.min(widthScale, heightScale);
+          break;
+        default:
+          return;
+      }
+
+      if (scale && scale !== PDFView.currentScale)
+        PDFView.parseScale(scale, true, true);
+      else if (PDFView.currentScale === UNKNOWN_SCALE)
+        PDFView.parseScale(DEFAULT_SCALE, true, true);
+
+      var boundingRect = [
+        this.viewport.convertToViewportPoint(x, y),
+        this.viewport.convertToViewportPoint(x + width, y + height)
+      ];
+      setTimeout(function pageViewScrollIntoViewRelayout() {
+        // letting page to re-layout before scrolling
+        var scale = PDFView.currentScale;
+        var x = Math.min(boundingRect[0][0], boundingRect[1][0]);
+        var y = Math.min(boundingRect[0][1], boundingRect[1][1]);
+        var width = Math.abs(boundingRect[0][0] - boundingRect[1][0]);
+        var height = Math.abs(boundingRect[0][1] - boundingRect[1][1]);
+
+        scrollIntoView(div, {left: x, top: y, width: width, height: height});
+      }, 0);
+  };
+
+  this.getTextContent = function pageviewGetTextContent() {
+    if (!this.textContent) {
+      this.textContent = this.pdfPage.getTextContent();
+    }
+    return this.textContent;
+  };
+
+  this.draw = function pageviewDraw(callback) {
+    if (this.renderingState !== RenderingStates.INITIAL) {
+      console.error('Must be in new state before drawing');
+    }
+
+    this.renderingState = RenderingStates.RUNNING;
+
+    var canvas = document.createElement('canvas');
+    canvas.id = 'page' + this.id;
+    canvas.mozOpaque = true;
+    div.appendChild(canvas);
+    this.canvas = canvas;
+
+    var textLayerDiv = null;
+    if (!PDFJS.disableTextLayer) {
+      textLayerDiv = document.createElement('div');
+      textLayerDiv.className = 'textLayer';
+      div.appendChild(textLayerDiv);
+    }
+    var textLayer = this.textLayer =
+          textLayerDiv ? new TextLayerBuilder(textLayerDiv, this.id - 1) : null;
+
+    var scale = this.scale, viewport = this.viewport;
+    var outputScale = PDFView.getOutputScale();
+    canvas.width = Math.floor(viewport.width) * outputScale.sx;
+    canvas.height = Math.floor(viewport.height) * outputScale.sy;
+
+    if (outputScale.scaled) {
+      var cssScale = 'scale(' + (1 / outputScale.sx) + ', ' +
+                                (1 / outputScale.sy) + ')';
+      CustomStyle.setProp('transform' , canvas, cssScale);
+      CustomStyle.setProp('transformOrigin' , canvas, '0% 0%');
+      if (textLayerDiv) {
+        CustomStyle.setProp('transform' , textLayerDiv, cssScale);
+        CustomStyle.setProp('transformOrigin' , textLayerDiv, '0% 0%');
+      }
+    }
+
+    var ctx = canvas.getContext('2d');
+    // TODO(mack): use data attributes to store these
+    ctx._scaleX = outputScale.sx;
+    ctx._scaleY = outputScale.sy;
+    ctx.save();
+    ctx.fillStyle = 'rgb(255, 255, 255)';
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+    ctx.restore();
+    if (outputScale.scaled) {
+      ctx.scale(outputScale.sx, outputScale.sy);
+    }
+
+    // Rendering area
+
+    var self = this;
+    var renderingWasReset = false;
+    function pageViewDrawCallback(error) {
+      if (renderingWasReset) {
+        return;
+      }
+
+      self.renderingState = RenderingStates.FINISHED;
+
+      if (self.loadingIconDiv) {
+        div.removeChild(self.loadingIconDiv);
+        delete self.loadingIconDiv;
+      }
+
+      if (error) {
+        PDFView.error(mozL10n.get('rendering_error', null,
+          'An error occurred while rendering the page.'), error);
+      }
+
+      self.stats = pdfPage.stats;
+      self.updateStats();
+      if (self.onAfterDraw)
+        self.onAfterDraw();
+
+      cache.push(self);
+      callback();
+    }
+
+    var renderContext = {
+      canvasContext: ctx,
+      viewport: this.viewport,
+      textLayer: textLayer,
+      continueCallback: function pdfViewcContinueCallback(cont) {
+        if (self.renderingState === RenderingStates.INITIAL) {
+          // The page update() was called, we just need to abort any rendering.
+          renderingWasReset = true;
+          return;
+        }
+
+        if (PDFView.highestPriorityPage !== 'page' + self.id) {
+          self.renderingState = RenderingStates.PAUSED;
+          self.resume = function resumeCallback() {
+            self.renderingState = RenderingStates.RUNNING;
+            cont();
+          };
+          return;
+        }
+        cont();
+      }
+    };
+    this.pdfPage.render(renderContext).then(
+      function pdfPageRenderCallback() {
+        pageViewDrawCallback(null);
+      },
+      function pdfPageRenderError(error) {
+        pageViewDrawCallback(error);
+      }
+    );
+
+    if (textLayer) {
+      this.getTextContent().then(
+        function textContentResolved(textContent) {
+          textLayer.setTextContent(textContent);
+        }
+      );
+    }
+
+    setupAnnotations(this.pdfPage, this.viewport);
+    div.setAttribute('data-loaded', true);
+  };
+
+  this.beforePrint = function pageViewBeforePrint() {
+    var pdfPage = this.pdfPage;
+    var viewport = pdfPage.getViewport(1);
+    // Use the same hack we use for high dpi displays for printing to get better
+    // output until bug 811002 is fixed in FF.
+    var PRINT_OUTPUT_SCALE = 2;
+    var canvas = this.canvas = document.createElement('canvas');
+    canvas.width = Math.floor(viewport.width) * PRINT_OUTPUT_SCALE;
+    canvas.height = Math.floor(viewport.height) * PRINT_OUTPUT_SCALE;
+    canvas.style.width = (PRINT_OUTPUT_SCALE * viewport.width) + 'pt';
+    canvas.style.height = (PRINT_OUTPUT_SCALE * viewport.height) + 'pt';
+    var cssScale = 'scale(' + (1 / PRINT_OUTPUT_SCALE) + ', ' +
+                              (1 / PRINT_OUTPUT_SCALE) + ')';
+    CustomStyle.setProp('transform' , canvas, cssScale);
+    CustomStyle.setProp('transformOrigin' , canvas, '0% 0%');
+
+    var printContainer = document.getElementById('printContainer');
+    printContainer.appendChild(canvas);
+
+    var self = this;
+    canvas.mozPrintCallback = function(obj) {
+      var ctx = obj.context;
+
+      ctx.save();
+      ctx.fillStyle = 'rgb(255, 255, 255)';
+      ctx.fillRect(0, 0, canvas.width, canvas.height);
+      ctx.restore();
+      ctx.scale(PRINT_OUTPUT_SCALE, PRINT_OUTPUT_SCALE);
+
+      var renderContext = {
+        canvasContext: ctx,
+        viewport: viewport
+      };
+
+      pdfPage.render(renderContext).then(function() {
+        // Tell the printEngine that rendering this canvas/page has finished.
+        obj.done();
+        self.pdfPage.destroy();
+      }, function(error) {
+        console.error(error);
+        // Tell the printEngine that rendering this canvas/page has failed.
+        // This will make the print proces stop.
+        if ('abort' in obj)
+          obj.abort();
+        else
+          obj.done();
+        self.pdfPage.destroy();
+      });
+    };
+  };
+
+  this.updateStats = function pageViewUpdateStats() {
+    if (PDFJS.pdfBug && Stats.enabled) {
+      var stats = this.stats;
+      Stats.add(this.id, stats);
+    }
+  };
+};
+
+var ThumbnailView = function thumbnailView(container, pdfPage, id) {
+  var anchor = document.createElement('a');
+  anchor.href = PDFView.getAnchorUrl('#page=' + id);
+  anchor.title = mozL10n.get('thumb_page_title', {page: id}, 'Page {{page}}');
+  anchor.onclick = function stopNavigation() {
+    PDFView.page = id;
+    return false;
+  };
+
+  var rotation = 0;
+  var totalRotation = (rotation + pdfPage.rotate) % 360;
+  var viewport = pdfPage.getViewport(1, totalRotation);
+  var pageWidth = this.width = viewport.width;
+  var pageHeight = this.height = viewport.height;
+  var pageRatio = pageWidth / pageHeight;
+  this.id = id;
+
+  var canvasWidth = 98;
+  var canvasHeight = canvasWidth / this.width * this.height;
+  var scaleX = this.scaleX = (canvasWidth / pageWidth);
+  var scaleY = this.scaleY = (canvasHeight / pageHeight);
+
+  var div = this.el = document.createElement('div');
+  div.id = 'thumbnailContainer' + id;
+  div.className = 'thumbnail';
+
+  if (id === 1) {
+    // Highlight the thumbnail of the first page when no page number is
+    // specified (or exists in cache) when the document is loaded.
+    div.classList.add('selected');
+  }
+
+  var ring = document.createElement('div');
+  ring.className = 'thumbnailSelectionRing';
+  ring.style.width = canvasWidth + 'px';
+  ring.style.height = canvasHeight + 'px';
+
+  div.appendChild(ring);
+  anchor.appendChild(div);
+  container.appendChild(anchor);
+
+  this.hasImage = false;
+  this.renderingState = RenderingStates.INITIAL;
+
+  this.updateRotation = function(rot) {
+
+    rotation = rot;
+    totalRotation = (rotation + pdfPage.rotate) % 360;
+    viewport = pdfPage.getViewport(1, totalRotation);
+    pageWidth = this.width = viewport.width;
+    pageHeight = this.height = viewport.height;
+    pageRatio = pageWidth / pageHeight;
+
+    canvasHeight = canvasWidth / this.width * this.height;
+    scaleX = this.scaleX = (canvasWidth / pageWidth);
+    scaleY = this.scaleY = (canvasHeight / pageHeight);
+
+    div.removeAttribute('data-loaded');
+    ring.textContent = '';
+    ring.style.width = canvasWidth + 'px';
+    ring.style.height = canvasHeight + 'px';
+
+    this.hasImage = false;
+    this.renderingState = RenderingStates.INITIAL;
+    this.resume = null;
+  };
+
+  function getPageDrawContext() {
+    var canvas = document.createElement('canvas');
+    canvas.id = 'thumbnail' + id;
+    canvas.mozOpaque = true;
+
+    canvas.width = canvasWidth;
+    canvas.height = canvasHeight;
+    canvas.className = 'thumbnailImage';
+    canvas.setAttribute('aria-label', mozL10n.get('thumb_page_canvas',
+      {page: id}, 'Thumbnail of Page {{page}}'));
+
+    div.setAttribute('data-loaded', true);
+
+    ring.appendChild(canvas);
+
+    var ctx = canvas.getContext('2d');
+    ctx.save();
+    ctx.fillStyle = 'rgb(255, 255, 255)';
+    ctx.fillRect(0, 0, canvasWidth, canvasHeight);
+    ctx.restore();
+    return ctx;
+  }
+
+  this.drawingRequired = function thumbnailViewDrawingRequired() {
+    return !this.hasImage;
+  };
+
+  this.draw = function thumbnailViewDraw(callback) {
+    if (this.renderingState !== RenderingStates.INITIAL) {
+      console.error('Must be in new state before drawing');
+    }
+
+    this.renderingState = RenderingStates.RUNNING;
+    if (this.hasImage) {
+      callback();
+      return;
+    }
+
+    var self = this;
+    var ctx = getPageDrawContext();
+    var drawViewport = pdfPage.getViewport(scaleX, totalRotation);
+    var renderContext = {
+      canvasContext: ctx,
+      viewport: drawViewport,
+      continueCallback: function(cont) {
+        if (PDFView.highestPriorityPage !== 'thumbnail' + self.id) {
+          self.renderingState = RenderingStates.PAUSED;
+          self.resume = function() {
+            self.renderingState = RenderingStates.RUNNING;
+            cont();
+          };
+          return;
+        }
+        cont();
+      }
+    };
+    pdfPage.render(renderContext).then(
+      function pdfPageRenderCallback() {
+        self.renderingState = RenderingStates.FINISHED;
+        callback();
+      },
+      function pdfPageRenderError(error) {
+        self.renderingState = RenderingStates.FINISHED;
+        callback();
+      }
+    );
+    this.hasImage = true;
+  };
+
+  this.setImage = function thumbnailViewSetImage(img) {
+    if (this.hasImage || !img)
+      return;
+    this.renderingState = RenderingStates.FINISHED;
+    var ctx = getPageDrawContext();
+    ctx.drawImage(img, 0, 0, img.width, img.height,
+                  0, 0, ctx.canvas.width, ctx.canvas.height);
+
+    this.hasImage = true;
+  };
+};
+
+var DocumentOutlineView = function documentOutlineView(outline) {
+  var outlineView = document.getElementById('outlineView');
+  while (outlineView.firstChild)
+    outlineView.removeChild(outlineView.firstChild);
+
+  function bindItemLink(domObj, item) {
+    domObj.href = PDFView.getDestinationHash(item.dest);
+    domObj.onclick = function documentOutlineViewOnclick(e) {
+      PDFView.navigateTo(item.dest);
+      return false;
+    };
+  }
+
+  if (!outline) {
+    var noOutline = document.createElement('div');
+    noOutline.classList.add('noOutline');
+    noOutline.textContent = mozL10n.get('no_outline', null,
+      'No Outline Available');
+    outlineView.appendChild(noOutline);
+    return;
+  }
+
+  var queue = [{parent: outlineView, items: outline}];
+  while (queue.length > 0) {
+    var levelData = queue.shift();
+    var i, n = levelData.items.length;
+    for (i = 0; i < n; i++) {
+      var item = levelData.items[i];
+      var div = document.createElement('div');
+      div.className = 'outlineItem';
+      var a = document.createElement('a');
+      bindItemLink(a, item);
+      a.textContent = item.title;
+      div.appendChild(a);
+
+      if (item.items.length > 0) {
+        var itemsDiv = document.createElement('div');
+        itemsDiv.className = 'outlineItems';
+        div.appendChild(itemsDiv);
+        queue.push({parent: itemsDiv, items: item.items});
+      }
+
+      levelData.parent.appendChild(div);
+    }
+  }
+};
+
+// optimised CSS custom property getter/setter
+var CustomStyle = (function CustomStyleClosure() {
+
+  // As noted on: http://www.zachstronaut.com/posts/2009/02/17/
+  //              animate-css-transforms-firefox-webkit.html
+  // in some versions of IE9 it is critical that ms appear in this list
+  // before Moz
+  var prefixes = ['ms', 'Moz', 'Webkit', 'O'];
+  var _cache = { };
+
+  function CustomStyle() {
+  }
+
+  CustomStyle.getProp = function get(propName, element) {
+    // check cache only when no element is given
+    if (arguments.length == 1 && typeof _cache[propName] == 'string') {
+      return _cache[propName];
+    }
+
+    element = element || document.documentElement;
+    var style = element.style, prefixed, uPropName;
+
+    // test standard property first
+    if (typeof style[propName] == 'string') {
+      return (_cache[propName] = propName);
+    }
+
+    // capitalize
+    uPropName = propName.charAt(0).toUpperCase() + propName.slice(1);
+
+    // test vendor specific properties
+    for (var i = 0, l = prefixes.length; i < l; i++) {
+      prefixed = prefixes[i] + uPropName;
+      if (typeof style[prefixed] == 'string') {
+        return (_cache[propName] = prefixed);
+      }
+    }
+
+    //if all fails then set to undefined
+    return (_cache[propName] = 'undefined');
+  };
+
+  CustomStyle.setProp = function set(propName, element, str) {
+    var prop = this.getProp(propName);
+    if (prop != 'undefined')
+      element.style[prop] = str;
+  };
+
+  return CustomStyle;
+})();
+
+var TextLayerBuilder = function textLayerBuilder(textLayerDiv, pageIdx) {
+  var textLayerFrag = document.createDocumentFragment();
+
+  this.textLayerDiv = textLayerDiv;
+  this.layoutDone = false;
+  this.divContentDone = false;
+  this.pageIdx = pageIdx;
+  this.matches = [];
+
+  this.beginLayout = function textLayerBuilderBeginLayout() {
+    this.textDivs = [];
+    this.textLayerQueue = [];
+    this.renderingDone = false;
+  };
+
+  this.endLayout = function textLayerBuilderEndLayout() {
+    this.layoutDone = true;
+    this.insertDivContent();
+  };
+
+  this.renderLayer = function textLayerBuilderRenderLayer() {
+    var self = this;
+    var textDivs = this.textDivs;
+    var textLayerDiv = this.textLayerDiv;
+    var canvas = document.createElement('canvas');
+    var ctx = canvas.getContext('2d');
+
+    // No point in rendering so many divs as it'd make the browser unusable
+    // even after the divs are rendered
+    var MAX_TEXT_DIVS_TO_RENDER = 100000;
+    if (textDivs.length > MAX_TEXT_DIVS_TO_RENDER)
+      return;
+
+    for (var i = 0, ii = textDivs.length; i < ii; i++) {
+      var textDiv = textDivs[i];
+      textLayerFrag.appendChild(textDiv);
+
+      ctx.font = textDiv.style.fontSize + ' ' + textDiv.style.fontFamily;
+      var width = ctx.measureText(textDiv.textContent).width;
+
+      if (width > 0) {
+        var textScale = textDiv.dataset.canvasWidth / width;
+
+        CustomStyle.setProp('transform' , textDiv,
+          'scale(' + textScale + ', 1)');
+        CustomStyle.setProp('transformOrigin' , textDiv, '0% 0%');
+
+        textLayerDiv.appendChild(textDiv);
+      }
+    }
+
+    this.renderingDone = true;
+    this.updateMatches();
+
+    textLayerDiv.appendChild(textLayerFrag);
+  };
+
+  this.setupRenderLayoutTimer = function textLayerSetupRenderLayoutTimer() {
+    // Schedule renderLayout() if user has been scrolling, otherwise
+    // run it right away
+    var RENDER_DELAY = 200; // in ms
+    var self = this;
+    if (Date.now() - PDFView.lastScroll > RENDER_DELAY) {
+      // Render right away
+      this.renderLayer();
+    } else {
+      // Schedule
+      if (this.renderTimer)
+        clearTimeout(this.renderTimer);
+      this.renderTimer = setTimeout(function() {
+        self.setupRenderLayoutTimer();
+      }, RENDER_DELAY);
+    }
+  };
+
+  this.appendText = function textLayerBuilderAppendText(geom) {
+    var textDiv = document.createElement('div');
+
+    // vScale and hScale already contain the scaling to pixel units
+    var fontHeight = geom.fontSize * geom.vScale;
+    textDiv.dataset.canvasWidth = geom.canvasWidth * geom.hScale;
+    textDiv.dataset.fontName = geom.fontName;
+
+    textDiv.style.fontSize = fontHeight + 'px';
+    textDiv.style.fontFamily = geom.fontFamily;
+    textDiv.style.left = geom.x + 'px';
+    textDiv.style.top = (geom.y - fontHeight) + 'px';
+
+    // The content of the div is set in the `setTextContent` function.
+
+    this.textDivs.push(textDiv);
+  };
+
+  this.insertDivContent = function textLayerUpdateTextContent() {
+    // Only set the content of the divs once layout has finished, the content
+    // for the divs is available and content is not yet set on the divs.
+    if (!this.layoutDone || this.divContentDone || !this.textContent)
+      return;
+
+    this.divContentDone = true;
+
+    var textDivs = this.textDivs;
+    var bidiTexts = this.textContent.bidiTexts;
+
+    for (var i = 0; i < bidiTexts.length; i++) {
+      var bidiText = bidiTexts[i];
+      var textDiv = textDivs[i];
+
+      textDiv.textContent = bidiText.str;
+      textDiv.dir = bidiText.ltr ? 'ltr' : 'rtl';
+    }
+
+    this.setupRenderLayoutTimer();
+  };
+
+  this.setTextContent = function textLayerBuilderSetTextContent(textContent) {
+    this.textContent = textContent;
+    this.insertDivContent();
+  };
+
+  this.convertMatches = function textLayerBuilderConvertMatches(matches) {
+    var i = 0;
+    var iIndex = 0;
+    var bidiTexts = this.textContent.bidiTexts;
+    var end = bidiTexts.length - 1;
+    var queryLen = PDFFindController.state.query.length;
+
+    var lastDivIdx = -1;
+    var pos;
+
+    var ret = [];
+
+    // Loop over all the matches.
+    for (var m = 0; m < matches.length; m++) {
+      var matchIdx = matches[m];
+      // # Calculate the begin position.
+
+      // Loop over the divIdxs.
+      while (i !== end && matchIdx >= (iIndex + bidiTexts[i].str.length)) {
+        iIndex += bidiTexts[i].str.length;
+        i++;
+      }
+
+      // TODO: Do proper handling here if something goes wrong.
+      if (i == bidiTexts.length) {
+        console.error('Could not find matching mapping');
+      }
+
+      var match = {
+        begin: {
+          divIdx: i,
+          offset: matchIdx - iIndex
+        }
+      };
+
+      // # Calculate the end position.
+      matchIdx += queryLen;
+
+      // Somewhat same array as above, but use a > instead of >= to get the end
+      // position right.
+      while (i !== end && matchIdx > (iIndex + bidiTexts[i].str.length)) {
+        iIndex += bidiTexts[i].str.length;
+        i++;
+      }
+
+      match.end = {
+        divIdx: i,
+        offset: matchIdx - iIndex
+      };
+      ret.push(match);
+    }
+
+    return ret;
+  };
+
+  this.renderMatches = function textLayerBuilder_renderMatches(matches) {
+    // Early exit if there is nothing to render.
+    if (matches.length === 0) {
+      return;
+    }
+
+    var bidiTexts = this.textContent.bidiTexts;
+    var textDivs = this.textDivs;
+    var prevEnd = null;
+    var isSelectedPage = this.pageIdx === PDFFindController.selected.pageIdx;
+    var selectedMatchIdx = PDFFindController.selected.matchIdx;
+    var highlightAll = PDFFindController.state.highlightAll;
+
+    var infty = {
+      divIdx: -1,
+      offset: undefined
+    };
+
+    function beginText(begin, className) {
+      var divIdx = begin.divIdx;
+      var div = textDivs[divIdx];
+      div.textContent = '';
+
+      var content = bidiTexts[divIdx].str.substring(0, begin.offset);
+      var node = document.createTextNode(content);
+      if (className) {
+        var isSelected = isSelectedPage &&
+                          divIdx === selectedMatchIdx;
+        var span = document.createElement('span');
+        span.className = className + (isSelected ? ' selected' : '');
+        span.appendChild(node);
+        div.appendChild(span);
+        return;
+      }
+      div.appendChild(node);
+    }
+
+    function appendText(from, to, className) {
+      var divIdx = from.divIdx;
+      var div = textDivs[divIdx];
+
+      var content = bidiTexts[divIdx].str.substring(from.offset, to.offset);
+      var node = document.createTextNode(content);
+      if (className) {
+        var span = document.createElement('span');
+        span.className = className;
+        span.appendChild(node);
+        div.appendChild(span);
+        return;
+      }
+      div.appendChild(node);
+    }
+
+    function highlightDiv(divIdx, className) {
+      textDivs[divIdx].className = className;
+    }
+
+    var i0 = selectedMatchIdx, i1 = i0 + 1, i;
+
+    if (highlightAll) {
+      i0 = 0;
+      i1 = matches.length;
+    } else if (!isSelectedPage) {
+      // Not highlighting all and this isn't the selected page, so do nothing.
+      return;
+    }
+
+    for (i = i0; i < i1; i++) {
+      var match = matches[i];
+      var begin = match.begin;
+      var end = match.end;
+
+      var isSelected = isSelectedPage && i === selectedMatchIdx;
+      var highlightSuffix = (isSelected ? ' selected' : '');
+      if (isSelected)
+        scrollIntoView(textDivs[begin.divIdx], {top: -50});
+
+      // Match inside new div.
+      if (!prevEnd || begin.divIdx !== prevEnd.divIdx) {
+        // If there was a previous div, then add the text at the end
+        if (prevEnd !== null) {
+          appendText(prevEnd, infty);
+        }
+        // clears the divs and set the content until the begin point.
+        beginText(begin);
+      } else {
+        appendText(prevEnd, begin);
+      }
+
+      if (begin.divIdx === end.divIdx) {
+        appendText(begin, end, 'highlight' + highlightSuffix);
+      } else {
+        appendText(begin, infty, 'highlight begin' + highlightSuffix);
+        for (var n = begin.divIdx + 1; n < end.divIdx; n++) {
+          highlightDiv(n, 'highlight middle' + highlightSuffix);
+        }
+        beginText(end, 'highlight end' + highlightSuffix);
+      }
+      prevEnd = end;
+    }
+
+    if (prevEnd) {
+      appendText(prevEnd, infty);
+    }
+  };
+
+  this.updateMatches = function textLayerUpdateMatches() {
+    // Only show matches, once all rendering is done.
+    if (!this.renderingDone)
+      return;
+
+    // Clear out all matches.
+    var matches = this.matches;
+    var textDivs = this.textDivs;
+    var bidiTexts = this.textContent.bidiTexts;
+    var clearedUntilDivIdx = -1;
+
+    // Clear out all current matches.
+    for (var i = 0; i < matches.length; i++) {
+      var match = matches[i];
+      var begin = Math.max(clearedUntilDivIdx, match.begin.divIdx);
+      for (var n = begin; n <= match.end.divIdx; n++) {
+        var div = textDivs[n];
+        div.textContent = bidiTexts[n].str;
+        div.className = '';
+      }
+      clearedUntilDivIdx = match.end.divIdx + 1;
+    }
+
+    if (!PDFFindController.active)
+      return;
+
+    // Convert the matches on the page controller into the match format used
+    // for the textLayer.
+    this.matches = matches =
+      this.convertMatches(PDFFindController.pageMatches[this.pageIdx] || []);
+
+    this.renderMatches(this.matches);
+  };
+};
+
+document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) {
+  PDFView.initialize();
+  var params = PDFView.parseQueryString(document.location.search.substring(1));
+
+  var file = params.file || DEFAULT_URL;
+
+  if (!window.File || !window.FileReader || !window.FileList || !window.Blob) {
+    document.getElementById('openFile').setAttribute('hidden', 'true');
+  } else {
+    document.getElementById('fileInput').value = null;
+  }
+
+  // Special debugging flags in the hash section of the URL.
+  var hash = document.location.hash.substring(1);
+  var hashParams = PDFView.parseQueryString(hash);
+
+  if ('disableWorker' in hashParams)
+    PDFJS.disableWorker = (hashParams['disableWorker'] === 'true');
+
+  var locale = navigator.language;
+  if ('locale' in hashParams)
+    locale = hashParams['locale'];
+  mozL10n.setLanguage(locale);
+
+  if ('textLayer' in hashParams) {
+    switch (hashParams['textLayer']) {
+      case 'off':
+        PDFJS.disableTextLayer = true;
+        break;
+      case 'visible':
+      case 'shadow':
+      case 'hover':
+        var viewer = document.getElementById('viewer');
+        viewer.classList.add('textLayer-' + hashParams['textLayer']);
+        break;
+    }
+  }
+
+  if ('pdfBug' in hashParams) {
+    PDFJS.pdfBug = true;
+    var pdfBug = hashParams['pdfBug'];
+    var enabled = pdfBug.split(',');
+    PDFBug.enable(enabled);
+    PDFBug.init();
+  }
+
+  if (!PDFView.supportsPrinting) {
+    document.getElementById('print').classList.add('hidden');
+  }
+
+  if (!PDFView.supportsFullscreen) {
+    document.getElementById('fullscreen').classList.add('hidden');
+  }
+
+  if (PDFView.supportsIntegratedFind) {
+    document.querySelector('#viewFind').classList.add('hidden');
+  }
+
+  // Listen for warnings to trigger the fallback UI.  Errors should be caught
+  // and call PDFView.error() so we don't need to listen for those.
+  PDFJS.LogManager.addLogger({
+    warn: function() {
+      PDFView.fallback();
+    }
+  });
+
+  var mainContainer = document.getElementById('mainContainer');
+  var outerContainer = document.getElementById('outerContainer');
+  mainContainer.addEventListener('transitionend', function(e) {
+    if (e.target == mainContainer) {
+      var event = document.createEvent('UIEvents');
+      event.initUIEvent('resize', false, false, window, 0);
+      window.dispatchEvent(event);
+      outerContainer.classList.remove('sidebarMoving');
+    }
+  }, true);
+
+  document.getElementById('sidebarToggle').addEventListener('click',
+    function() {
+      this.classList.toggle('toggled');
+      outerContainer.classList.add('sidebarMoving');
+      outerContainer.classList.toggle('sidebarOpen');
+      PDFView.sidebarOpen = outerContainer.classList.contains('sidebarOpen');
+      PDFView.renderHighestPriority();
+    });
+
+  document.getElementById('viewThumbnail').addEventListener('click',
+    function() {
+      PDFView.switchSidebarView('thumbs');
+    });
+
+  document.getElementById('viewOutline').addEventListener('click',
+    function() {
+      PDFView.switchSidebarView('outline');
+    });
+
+  document.getElementById('previous').addEventListener('click',
+    function() {
+      PDFView.page--;
+    });
+
+  document.getElementById('next').addEventListener('click',
+    function() {
+      PDFView.page++;
+    });
+
+  document.querySelector('.zoomIn').addEventListener('click',
+    function() {
+      PDFView.zoomIn();
+    });
+
+  document.querySelector('.zoomOut').addEventListener('click',
+    function() {
+      PDFView.zoomOut();
+    });
+
+  document.getElementById('fullscreen').addEventListener('click',
+    function() {
+      PDFView.fullscreen();
+    });
+
+  document.getElementById('openFile').addEventListener('click',
+    function() {
+      document.getElementById('fileInput').click();
+    });
+
+  document.getElementById('print').addEventListener('click',
+    function() {
+      window.print();
+    });
+
+  document.getElementById('download').addEventListener('click',
+    function() {
+      PDFView.download();
+    });
+
+  document.getElementById('pageNumber').addEventListener('click',
+    function() {
+      this.select();
+    });
+
+  document.getElementById('pageNumber').addEventListener('change',
+    function() {
+      // Handle the user inputting a floating point number.
+      PDFView.page = (this.value | 0);
+
+      if (this.value !== (this.value | 0).toString()) {
+        this.value = PDFView.page;
+      }
+    });
+
+  document.getElementById('scaleSelect').addEventListener('change',
+    function() {
+      PDFView.parseScale(this.value);
+    });
+
+  document.getElementById('first_page').addEventListener('click',
+    function() {
+      PDFView.page = 1;
+    });
+
+  document.getElementById('last_page').addEventListener('click',
+    function() {
+      PDFView.page = PDFView.pdfDocument.numPages;
+    });
+
+  document.getElementById('page_rotate_ccw').addEventListener('click',
+    function() {
+      PDFView.rotatePages(-90);
+    });
+
+  document.getElementById('page_rotate_cw').addEventListener('click',
+    function() {
+      PDFView.rotatePages(90);
+    });
+
+
+  PDFView.open(file, 0);
+}, true);
+
+function updateViewarea() {
+
+  if (!PDFView.initialized)
+    return;
+  var visible = PDFView.getVisiblePages();
+  var visiblePages = visible.views;
+  if (visiblePages.length === 0) {
+    return;
+  }
+
+  PDFView.renderHighestPriority();
+
+  var currentId = PDFView.page;
+  var firstPage = visible.first;
+
+  for (var i = 0, ii = visiblePages.length, stillFullyVisible = false;
+       i < ii; ++i) {
+    var page = visiblePages[i];
+
+    if (page.percent < 100)
+      break;
+
+    if (page.id === PDFView.page) {
+      stillFullyVisible = true;
+      break;
+    }
+  }
+
+  if (!stillFullyVisible) {
+    currentId = visiblePages[0].id;
+  }
+
+  if (!PDFView.isFullscreen) {
+    updateViewarea.inProgress = true; // used in "set page"
+    PDFView.page = currentId;
+    updateViewarea.inProgress = false;
+  }
+
+  var currentScale = PDFView.currentScale;
+  var currentScaleValue = PDFView.currentScaleValue;
+  var normalizedScaleValue = currentScaleValue == currentScale ?
+    currentScale * 100 : currentScaleValue;
+
+  var pageNumber = firstPage.id;
+  var pdfOpenParams = '#page=' + pageNumber;
+  pdfOpenParams += '&zoom=' + normalizedScaleValue;
+  var currentPage = PDFView.pages[pageNumber - 1];
+  var topLeft = currentPage.getPagePoint(PDFView.container.scrollLeft,
+    (PDFView.container.scrollTop - firstPage.y));
+  pdfOpenParams += ',' + Math.round(topLeft[0]) + ',' + Math.round(topLeft[1]);
+
+  var store = PDFView.store;
+  store.initializedPromise.then(function() {
+    store.set('exists', true);
+    store.set('page', pageNumber);
+    store.set('zoom', normalizedScaleValue);
+    store.set('scrollLeft', Math.round(topLeft[0]));
+    store.set('scrollTop', Math.round(topLeft[1]));
+  });
+  var href = PDFView.getAnchorUrl(pdfOpenParams);
+  document.getElementById('viewBookmark').href = href;
+}
+
+window.addEventListener('resize', function webViewerResize(evt) {
+  if (PDFView.initialized &&
+      (document.getElementById('pageWidthOption').selected ||
+      document.getElementById('pageFitOption').selected ||
+      document.getElementById('pageAutoOption').selected))
+      PDFView.parseScale(document.getElementById('scaleSelect').value);
+  updateViewarea();
+});
+
+window.addEventListener('hashchange', function webViewerHashchange(evt) {
+  PDFView.setHash(document.location.hash.substring(1));
+});
+
+window.addEventListener('change', function webViewerChange(evt) {
+  var files = evt.target.files;
+  if (!files || files.length === 0)
+    return;
+
+  // Read the local file into a Uint8Array.
+  var fileReader = new FileReader();
+  fileReader.onload = function webViewerChangeFileReaderOnload(evt) {
+    var buffer = evt.target.result;
+    var uint8Array = new Uint8Array(buffer);
+    PDFView.open(uint8Array, 0);
+  };
+
+  var file = files[0];
+  fileReader.readAsArrayBuffer(file);
+  PDFView.setTitleUsingUrl(file.name);
+
+  // URL does not reflect proper document location - hiding some icons.
+  document.getElementById('viewBookmark').setAttribute('hidden', 'true');
+  document.getElementById('download').setAttribute('hidden', 'true');
+}, true);
+
+function selectScaleOption(value) {
+  var options = document.getElementById('scaleSelect').options;
+  var predefinedValueFound = false;
+  for (var i = 0; i < options.length; i++) {
+    var option = options[i];
+    if (option.value != value) {
+      option.selected = false;
+      continue;
+    }
+    option.selected = true;
+    predefinedValueFound = true;
+  }
+  return predefinedValueFound;
+}
+
+window.addEventListener('localized', function localized(evt) {
+  document.getElementsByTagName('html')[0].dir = mozL10n.getDirection();
+
+  // Adjust the width of the zoom box to fit the content.
+  var container = document.getElementById('scaleSelectContainer');
+  var select = document.getElementById('scaleSelect');
+
+  select.setAttribute('style', 'min-width: inherit;');
+  var width = select.clientWidth + 8;
+  container.setAttribute('style', 'min-width: ' + width + 'px; ' +
+                                  'max-width: ' + width + 'px;');
+  select.setAttribute('style', 'min-width: ' + (width + 20) + 'px;');
+}, true);
+
+window.addEventListener('scalechange', function scalechange(evt) {
+  var customScaleOption = document.getElementById('customScaleOption');
+  customScaleOption.selected = false;
+
+  if (!evt.resetAutoSettings &&
+       (document.getElementById('pageWidthOption').selected ||
+        document.getElementById('pageFitOption').selected ||
+        document.getElementById('pageAutoOption').selected)) {
+      updateViewarea();
+      return;
+  }
+
+  var predefinedValueFound = selectScaleOption('' + evt.scale);
+  if (!predefinedValueFound) {
+    customScaleOption.textContent = Math.round(evt.scale * 10000) / 100 + '%';
+    customScaleOption.selected = true;
+  }
+  
+  document.getElementById('zoom_out').disabled = (evt.scale === MIN_SCALE);
+  document.getElementById('zoom_in').disabled = (evt.scale === MAX_SCALE);
+
+  updateViewarea();
+}, true);
+
+window.addEventListener('pagechange', function pagechange(evt) {
+  var page = evt.pageNumber;
+  if (PDFView.previousPageNumber !== page) {
+    document.getElementById('pageNumber').value = page;
+    var selected = document.querySelector('.thumbnail.selected');
+    if (selected)
+      selected.classList.remove('selected');
+    var thumbnail = document.getElementById('thumbnailContainer' + page);
+    thumbnail.classList.add('selected');
+    var visibleThumbs = PDFView.getVisibleThumbs();
+    var numVisibleThumbs = visibleThumbs.views.length;
+    // If the thumbnail isn't currently visible scroll it into view.
+    if (numVisibleThumbs > 0) {
+      var first = visibleThumbs.first.id;
+      // Account for only one thumbnail being visible.
+      var last = numVisibleThumbs > 1 ?
+                  visibleThumbs.last.id : first;
+      if (page <= first || page >= last)
+        scrollIntoView(thumbnail);
+    }
+
+  }
+  document.getElementById('previous').disabled = (page <= 1);
+  document.getElementById('next').disabled = (page >= PDFView.pages.length);
+}, true);
+
+// Firefox specific event, so that we can prevent browser from zooming
+window.addEventListener('DOMMouseScroll', function(evt) {
+  if (evt.ctrlKey) {
+    evt.preventDefault();
+
+    var ticks = evt.detail;
+    var direction = (ticks > 0) ? 'zoomOut' : 'zoomIn';
+    for (var i = 0, length = Math.abs(ticks); i < length; i++)
+      PDFView[direction]();
+  } else if (PDFView.isFullscreen) {
+    var FIREFOX_DELTA_FACTOR = -40;
+    PDFView.mouseScroll(evt.detail * FIREFOX_DELTA_FACTOR);
+  }
+}, false);
+
+window.addEventListener('mousemove', function keydown(evt) {
+  if (PDFView.isFullscreen) {
+    PDFView.showPresentationControls();
+  }
+}, false);
+
+window.addEventListener('mousedown', function mousedown(evt) {
+  if (PDFView.isFullscreen && evt.button === 0) {
+    // Mouse click in fullmode advances a page
+    evt.preventDefault();
+
+    PDFView.page++;
+  }
+}, false);
+
+window.addEventListener('keydown', function keydown(evt) {
+  var handled = false;
+  var cmd = (evt.ctrlKey ? 1 : 0) |
+            (evt.altKey ? 2 : 0) |
+            (evt.shiftKey ? 4 : 0) |
+            (evt.metaKey ? 8 : 0);
+
+  // First, handle the key bindings that are independent whether an input
+  // control is selected or not.
+  if (cmd == 1 || cmd == 8) { // either CTRL or META key.
+    switch (evt.keyCode) {
+      case 70:
+        if (!PDFView.supportsIntegratedFind) {
+          PDFFindBar.toggle();
+          handled = true;
+        }
+        break;
+      case 61: // FF/Mac '='
+      case 107: // FF '+' and '='
+      case 187: // Chrome '+'
+      case 171: // FF with German keyboard
+        PDFView.zoomIn();
+        handled = true;
+        break;
+      case 173: // FF/Mac '-'
+      case 109: // FF '-'
+      case 189: // Chrome '-'
+        PDFView.zoomOut();
+        handled = true;
+        break;
+      case 48: // '0'
+      case 96: // '0' on Numpad of Swedish keyboard
+        PDFView.parseScale(DEFAULT_SCALE, true);
+        handled = true;
+        break;
+    }
+  }
+
+  // CTRL or META with or without SHIFT.
+  if (cmd == 1 || cmd == 8 || cmd == 5 || cmd == 12) {
+    switch (evt.keyCode) {
+      case 71: // g
+        if (!PDFView.supportsIntegratedFind) {
+          PDFFindBar.dispatchEvent('again', cmd == 5 || cmd == 12);
+          handled = true;
+        }
+        break;
+    }
+  }
+
+  if (handled) {
+    evt.preventDefault();
+    return;
+  }
+
+  // Some shortcuts should not get handled if a control/input element
+  // is selected.
+  var curElement = document.activeElement;
+  if (curElement && (curElement.tagName == 'INPUT' ||
+                     curElement.tagName == 'SELECT')) {
+    return;
+  }
+  var controlsElement = document.getElementById('toolbar');
+  while (curElement) {
+    if (curElement === controlsElement && !PDFView.isFullscreen)
+      return; // ignoring if the 'toolbar' element is focused
+    curElement = curElement.parentNode;
+  }
+
+  if (cmd === 0) { // no control key pressed at all.
+    switch (evt.keyCode) {
+      case 38: // up arrow
+      case 33: // pg up
+      case 8: // backspace
+        if (!PDFView.isFullscreen && PDFView.currentScaleValue !== 'page-fit') {
+          break;
+        }
+        /* in fullscreen mode */
+        /* falls through */
+      case 37: // left arrow
+        // horizontal scrolling using arrow keys
+        if (PDFView.isHorizontalScrollbarEnabled) {
+          break;
+        }
+        /* falls through */
+      case 75: // 'k'
+      case 80: // 'p'
+        PDFView.page--;
+        handled = true;
+        break;
+      case 27: // esc key
+        if (!PDFView.supportsIntegratedFind && PDFFindBar.opened) {
+          PDFFindBar.close();
+          handled = true;
+        }
+        break;
+      case 40: // down arrow
+      case 34: // pg down
+      case 32: // spacebar
+        if (!PDFView.isFullscreen && PDFView.currentScaleValue !== 'page-fit') {
+          break;
+        }
+        /* falls through */
+      case 39: // right arrow
+        // horizontal scrolling using arrow keys
+        if (PDFView.isHorizontalScrollbarEnabled) {
+          break;
+        }
+        /* falls through */
+      case 74: // 'j'
+      case 78: // 'n'
+        PDFView.page++;
+        handled = true;
+        break;
+
+      case 36: // home
+        if (PDFView.isFullscreen) {
+          PDFView.page = 1;
+          handled = true;
+        }
+        break;
+      case 35: // end
+        if (PDFView.isFullscreen) {
+          PDFView.page = PDFView.pdfDocument.numPages;
+          handled = true;
+        }
+        break;
+
+      case 82: // 'r'
+        PDFView.rotatePages(90);
+        break;
+    }
+  }
+
+  if (cmd == 4) { // shift-key
+    switch (evt.keyCode) {
+      case 82: // 'r'
+        PDFView.rotatePages(-90);
+        break;
+    }
+  }
+
+  if (handled) {
+    evt.preventDefault();
+    PDFView.clearMouseScrollState();
+  }
+});
+
+window.addEventListener('beforeprint', function beforePrint(evt) {
+  PDFView.beforePrint();
+});
+
+window.addEventListener('afterprint', function afterPrint(evt) {
+  PDFView.afterPrint();
+});
+
+(function fullscreenClosure() {
+  function fullscreenChange(e) {
+    var isFullscreen = document.fullscreenElement || document.mozFullScreen ||
+        document.webkitIsFullScreen;
+
+    if (!isFullscreen) {
+      PDFView.exitFullscreen();
+    }
+  }
+
+  window.addEventListener('fullscreenchange', fullscreenChange, false);
+  window.addEventListener('mozfullscreenchange', fullscreenChange, false);
+  window.addEventListener('webkitfullscreenchange', fullscreenChange, false);
+})();
+
+(function animationStartedClosure() {
+  // The offsetParent is not set until the pdf.js iframe or object is visible.
+  // Waiting for first animation.
+  var requestAnimationFrame = window.requestAnimationFrame ||
+                              window.mozRequestAnimationFrame ||
+                              window.webkitRequestAnimationFrame ||
+                              window.oRequestAnimationFrame ||
+                              window.msRequestAnimationFrame ||
+                              function startAtOnce(callback) { callback(); };
+  PDFView.animationStartedPromise = new PDFJS.Promise();
+  requestAnimationFrame(function onAnimationFrame() {
+    PDFView.animationStartedPromise.resolve();
+  });
+})();
+
+
diff --git a/common/test/data/simple/course.xml b/common/test/data/simple/course.xml
index 86dc8df45c..660411384f 100644
--- a/common/test/data/simple/course.xml
+++ b/common/test/data/simple/course.xml
@@ -15,7 +15,7 @@
   <chapter name="Chapter 2">
     <section name="Problem Set 1">
       <sequential>
-        <problem type="lecture" showanswer="attempted" rerandomize="true" display_name="A simple coding problem" name="Simple coding problem" filename="ps01-simple"/>
+        <problem type="lecture" showanswer="attempted" rerandomize="true" display_name="A simple coding problem" name="Simple coding problem" filename="ps01-simple" url_name="ps01-simple"/>
       </sequential>
     </section>
     <video name="Lost Video" youtube="1.0:TBvX7HzxexQ"/>
diff --git a/distribute-0.6.32.tar.gz b/distribute-0.6.32.tar.gz
new file mode 100644
index 0000000000..2438db60fa
Binary files /dev/null and b/distribute-0.6.32.tar.gz differ
diff --git a/distribute-0.6.34.tar.gz b/distribute-0.6.34.tar.gz
new file mode 100644
index 0000000000..4e91b3af62
Binary files /dev/null and b/distribute-0.6.34.tar.gz differ
diff --git a/doc/public/Makefile b/doc/public/Makefile
new file mode 100644
index 0000000000..f162e1b05c
--- /dev/null
+++ b/doc/public/Makefile
@@ -0,0 +1,153 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.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/doc/public/conf.py b/doc/public/conf.py
new file mode 100644
index 0000000000..5bb6ffad9b
--- /dev/null
+++ b/doc/public/conf.py
@@ -0,0 +1,245 @@
+# -*- coding: utf-8 -*-
+#
+# edX Docs documentation build configuration file, created by
+# sphinx-quickstart on Mon Feb 25 16:55:22 2013.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.mathjax']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'edX Data'
+copyright = u'2013, edX Team'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.1'
+# The full version, including alpha/beta/rc tags.
+release = '0.1'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'sphinxdoc'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# 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 = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'edXDocsdoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'edXDocs.tex', u'edX Data Documentation',
+   u'edX Team', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'edxdocs', u'edX Data Documentation',
+     [u'edX Team'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output ------------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+  ('index', 'edXDocs', u'edX Data Documentation',
+   u'edX Team', 'edXDocs', 'One line description of project.',
+   'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {'http://docs.python.org/': None}
diff --git a/doc/public/course_data_formats/course_xml.rst b/doc/public/course_data_formats/course_xml.rst
new file mode 100644
index 0000000000..51c5f2a872
--- /dev/null
+++ b/doc/public/course_data_formats/course_xml.rst
@@ -0,0 +1,571 @@
+###################
+Course XML Tutorial
+###################
+EdX uses an XML format to describe the structure and contents of its courses. While much of this is abstracted away by the Studio authoring interface, it is still helpful to understand how the edX platform renders a course.
+
+This guide was written with the assumption that you've dived straight into the edX platform without necessarily having any prior programming/CS knowledge. It will be especially valuable to you if your course is being authored with XML files rather than Studio -- in which case you're likely using functionality that is not yet fully supported in Studio.
+
+*****
+Goals
+*****
+After reading this, you should be able to:
+
+* Organize your course content into the files and folders the edX platform expects.
+* Add new content to a course and make sure it shows up in the courseware.
+
+*Prerequisites:* it would be helpful to know a little bit about xml.  Here is a 
+`simple example <http://www.ultraslavonic.info/intro-to-xml/>`_ if you've never seen it before. 
+
+************
+Introduction
+************
+
+A course is organized hierarchically. We start by describing course-wide parameters, then break the course into chapters, and then go deeper and deeper until we reach a specific pset, video, etc. You could make an analogy to finding a green shirt in your house -> bedroom -> closet -> drawer -> shirts -> green shirt.
+
+We'll begin with a sample course structure as a case study of how XML and files in a course are organized. More technical details will follow, including discussion of some special cases.
+
+**********
+Case Study
+**********
+Let's jump right in by looking at the directory structure of a very simple toy course::
+
+  toy/
+      course/
+      course.xml
+      problem/
+      policies/
+      roots/
+
+The only top level file is `course.xml`, which should contain one line, looking something like this:
+
+.. code-block:: xml
+
+  <course org="edX" course="toy" url_name="2012_Fall"/>
+
+This gives all the information to uniquely identify a particular run of any course -- which organization is producing the course, what the course name is, and what "run" this is, specified via the `url_name` attribute.
+
+Obviously, this doesn't actually specify any of the course content, so we need to find that next.  To know where to look, you need to know the standard organizational structure of our system: course elements are uniquely identified by the combination `(category, url_name)`. In this case, we are looking for a `course` element with the `url_name` "2012_Fall". The definition of this element will be in `course/2012_Fall.xml`. Let's look there next::
+
+  toy/
+      course/
+             2012_Fall.xml # <-- Where we look for category="course", url_name="2012_Fall"
+
+.. code-block:: xml
+
+  <!-- Contents of course/2012_Fall.xml -->
+  <course>
+    <chapter url_name="Overview">
+      <videosequence url_name="Toy_Videos">
+        <problem url_name="warmup"/>
+        <video url_name="Video_Resources" youtube="1.0:1bK-WdDi6Qw"/>
+      </videosequence>
+      <video url_name="Welcome" youtube="1.0:p2Q6BrNhdh8"/>
+    </chapter>
+  </course>
+
+Aha. Now we've found some content. We can see that the course is organized hierarchically, in this case with only one chapter, with `url_name` "Overview". The chapter contains a `videosequence` and a `video`, with the sequence containing a problem and another video. When viewed in the courseware, chapters are shown at the top level of the navigation accordion on the left, with any elements directly included in the chapter below.
+
+Looking at this file, we can see the course structure, and the youtube urls for the videos, but what about the "warmup" problem?  There is no problem content here! Where should we look? This is a good time to pause and try to answer that question based on our organizational structure above.
+
+As you hopefully guessed, the problem would be in `problem/warmup.xml`.  (Note: This tutorial doesn't discuss the xml format for problems -- there are chapters of edx4edx that describe it.)  This is an instance of a *pointer tag*: any xml tag with only the category and a url_name attribute will point to the file `{category}/{url_name}.xml`.  For example, this means that our toy `course.xml` could have also been written as
+
+.. code-block:: xml
+
+  <!-- Contents of course/2012_Fall.xml -->
+  <course>
+    <chapter url_name="Overview"/>
+  </course>
+
+with `chapter/Overview.xml` containing
+
+.. code-block:: xml
+
+  <chapter>
+    <videosequence url_name="Toy_Videos">
+      <problem url_name="warmup"/>
+      <video url_name="Video_Resources" youtube="1.0:1bK-WdDi6Qw"/>
+    </videosequence>
+    <video url_name="Welcome" youtube="1.0:p2Q6BrNhdh8"/>
+  </chapter>
+
+In fact, this is the recommended structure for real courses -- putting each chapter into its own file makes it easy to have different people work on each without conflicting or having to merge.  Similarly, as sequences get large, it can be handy to split them out as well (in `sequence/{url_name}.xml`, of course).
+
+Note that the `url_name` is only specified once per element -- either the inline definition, or in the pointer tag.
+
+Policy Files
+============
+
+We still haven't looked at two of the directories in the top-level listing above: `policies` and `roots`.  Let's look at policies next.  The policy directory contains one file::
+
+  toy/
+      policies/
+               2012_Fall.json
+
+and that file is named `{course-url_name}.json`.  As you might expect, this file contains a policy for the course. In our example, it looks like this:
+
+.. code-block:: json
+
+    {
+        "course/2012_Fall": {
+            "graceperiod": "2 days 5 hours 59 minutes 59 seconds",
+            "start": "2015-07-17T12:00",
+            "display_name": "Toy Course"
+        },
+        "chapter/Overview": {
+            "display_name": "Overview"
+        },
+        "videosequence/Toy_Videos": {
+            "display_name": "Toy Videos",
+            "format": "Lecture Sequence"
+        },
+        "problem/warmup": {
+            "display_name": "Getting ready for the semester"
+        },
+        "video/Video_Resources": {
+            "display_name": "Video Resources"
+        },
+        "video/Welcome": {
+            "display_name": "Welcome"
+        }
+    }
+
+The policy specifies metadata about the content elements -- things which are not inherent to the definition of the content, but which describe how the content is presented to the user and used in the course.  See below for a full list of metadata attributes; as the example shows, they include `display_name`, which is what is shown when this piece of content is referenced or shown in the courseware, and various dates and times, like `start`, which specifies when the content becomes visible to students, and various problem-specific parameters like the allowed number of attempts.  One important point is that some metadata is inherited: for example, specifying the start date on the course makes it the default for every element in the course.  See below for more details.
+
+It is possible to put metadata directly in the XML, as attributes of the appropriate tag, but using a policy file has two benefits: it puts all the policy in one place, making it easier to check that things like due dates are set properly, and it allows the content definitions to be easily used in another run of the same course, with the same or similar content, but different policy.
+
+Roots
+=====
+The last directory in the top level listing is `roots`.  In our toy course, it contains a single file::
+
+  roots/
+        2012_Fall.xml
+
+This file is identical to the top-level `course.xml`, containing
+
+.. code-block:: xml
+
+  <course org="edX" course="toy" url_name="2012_Fall"/>
+
+In fact, the top level `course.xml` is a symbolic link to this file.  When there is only one run of a course, the roots directory is not really necessary, and the top-level course.xml file can just specify the `url_name` of the course.  However, if we wanted to make a second run of our toy course, we could add another file called, e.g., `roots/2013_Spring.xml`, containing
+
+.. code-block:: xml
+
+  <course org="edX" course="toy" url_name="2013_Spring"/>
+
+After creating `course/2013_Spring.xml` with the course structure (possibly as a symbolic link or copy of `course/2012_Fall.xml` if no content was changing), and `policies/2013_Spring.json`, we would have two different runs of the toy course in the course repository.  Our build system understands this roots structure, and will build a course package for each root.
+
+.. note::
+   If you're using a local development environment, make the top level `course.xml` point to the desired root, and check out the repo multiple times if you need multiple runs simultaneously).
+
+That's basically all there is to the organizational structure.  Read the next section for details on the tags we support, including some special case tags like `customtag` and `html` invariants, and look at the end for some tips that will make the editing process easier.
+
+****
+Tags
+****
+
+  .. list-table::
+     :widths: 10 80
+     :header-rows: 0
+     
+     * - `abtest`
+       - Support for A/B testing.  TODO: add details..
+     * - `chapter`
+       - Top level organization unit of a course. The courseware display code currently expects the top level `course` element to contain only chapters, though there is no philosophical reason why this is required, so we may change it to properly display non-chapters at the top level.
+     * - `conditional`
+       - Conditional element, which shows one or more modules only if certain conditions are satisfied.
+     * - `course`
+       - Top level tag.  Contains everything else.
+     * - `customtag` 
+       - Render an html template, filling in some parameters, and return the resulting html. See below for details.
+     * - `discussion`
+       - Inline discussion forum.
+     * - `html`
+       - A reference to an html file.
+     * - `error`
+       - Don't put these in by hand :) The internal representation of content that has an error, such as malformed XML or some broken invariant.
+     * - `problem`
+       - See elsewhere in edx4edx for documentation on the format.
+     * - `problemset`
+       - Logically, a series of related problems. Currently displayed vertically. May contain explanatory html, videos, etc.
+     * - `sequential`
+       - A sequence of content, currently displayed with a horizontal list of tabs. If possible, use a more semantically meaningful tag (currently, we only have `videosequence`).
+     * - `vertical`
+       - A sequence of content, displayed vertically. Content will be accessed all at once, on the right part of the page. No navigational bar. May have to use browser scroll bars. Content split with separators. If possible, use a more semantically meaningful tag (currently, we only have `problemset`).
+     * - `video`
+       - A link to a video, currently expected to be hosted on youtube.
+     * - `videosequence`
+       - A sequence of videos.  This can contain various non-video content; it just signals to the system that this is logically part of an explanatory sequence of content, as opposed to say an exam sequence.
+
+Container Tags
+==============
+Container tags include `chapter`, `sequential`, `videosequence`, `vertical`, and `problemset`. They are all specified in the same way in the xml, as shown in the tutorial above.
+
+`course`
+========
+`course` is also a container, and is similar, with one extra wrinkle: the top level pointer tag *must* have  `org` and `course` attributes specified--the organization name, and course name. Note that `course` is referring to the platonic ideal of this course (e.g. "6.002x"), not to any particular run of this course. The `url_name` should be the particular run of this course.
+
+`conditional`
+=============
+`conditional` is as special kind of container tag as well.  Here are two examples:
+
+  .. code-block:: xml
+  
+    <conditional condition="require_completed" required="problem/choiceprob">
+      <video url_name="secret_video" />
+    </conditional>
+  
+    <conditional condition="require_attempted" required="problem/choiceprob&problem/sumprob">
+      <html url_name="secret_page" />
+    </conditional>
+
+The condition can be either `require_completed`, in which case the required modules must be completed, or `require_attempted`, in which case the required modules must have been attempted.
+
+The required modules are specified as a set of `tag`/`url_name`, joined by an ampersand.
+
+`customtag`
+===========
+When we see:
+
+  .. code-block:: xml
+
+    <customtag impl="special" animal="unicorn" hat="blue"/>
+
+We will:
+
+#. Look for a file called `custom_tags/special`  in your course dir.
+#. Render it as a mako template, passing parameters {'animal':'unicorn', 'hat':'blue'}, generating html.  (Google `mako` for template syntax, or look at existing examples).
+
+Since `customtag` is already a pointer, there is generally no need to put it into a separate file--just use it in place:
+
+  .. code-block:: xml
+
+    <customtag url_name="my_custom_tag" impl="blah" attr1="..."/>
+
+`discussion`
+============
+The discussion tag embeds an inline discussion module. The XML format is:
+
+  .. code-block:: xml
+
+    <discussion for="Course overview" id="6002x_Fall_2012_Overview" discussion_category="Week 1/Overview" />
+
+The meaning of each attribute is as follows:
+
+  .. list-table::
+     :widths: 10 80
+     :header-rows: 0
+
+     * - `for`
+       - A string that describes the discussion. Purely for descriptive purposes (to the student).
+     * - `id`
+       - The identifier that the discussion forum service uses to refer to this inline discussion module. Since the `id` must be unique and lives in a common namespace with all other courses, the preferred convention is to use `<course_name>_<course_run>_<descriptor>` as in the above example. The `id` should be "machine-friendly", e.g. use alphanumeric characters, underscores. Do **not** use a period (e.g. `6.002x_Fall_2012_Overview`).
+     * - `discussion_category`
+       - The inline module will be indexed in the main "Discussion" tab of the course. The inline discussions are organized into a directory-like hierarchy. Note that the forward slash indicates depth, as in conventional filesytems. In the above example, this discussion module will show up in the following "directory": `Week 1/Overview/Course overview`
+
+Note that the `for` tag has been appended to the end of the `discussion_category`. This can often lead into deeply nested subforums, which may not be intended. In the above example, if we were to use instead:
+
+  .. code-block:: xml
+
+   <discussion for="Course overview" id="6002x_Fall_2012_Overview" discussion_category="Week 1" />
+
+This discussion module would show up in the main forums as `Week 1 / Course overview`, which is more succinct.
+
+`html`
+======
+Most of our content is in XML, but some HTML content may not be proper xml (all tags matched, single top-level tag, etc), since browsers are fairly lenient in what they'll display.  So, there are two ways to include HTML content:
+
+* If your HTML content is in a proper XML format, just put it in `html/{url_name}.xml`.
+* If your HTML content is not in proper XML format, you can put it in `html/{filename}.html`, and put `<html filename={filename} />` in `html/{filename}.xml`.  This allows another level of indirection, and makes sure that we can read the XML file and then just return the actual HTML content without trying to parse it.
+
+`video`
+=======
+Videos have an attribute `youtube`, which specifies a series of speeds + youtube video IDs:
+
+  .. code-block:: xml
+
+    <video youtube="0.75:1yk1A8-FPbw,1.0:vNMrbPvwhU4,1.25:gBW_wqe7rDc,1.50:7AE_TKgaBwA" 
+           url_name="S15V14_Response_to_impulse_limit_case"/>
+
+This video has been encoded at 4 different speeds: `0.75x`, `1x`, `1.25x`, and `1.5x`.
+
+More on `url_name`
+==================
+Every content element (within a course) should have a unique id.  This id is formed as `{category}/{url_name}`, or automatically generated from the content if `url_name` is not specified.  Categories are the different tag types ('chapter', 'problem', 'html', 'sequential', etc).  Url_name is a string containing a-z, A-Z, dot (.), underscore (_), and ':'.  This is what appears in urls that point to this object.
+
+Colon (':') is special--when looking for the content definition in an xml, ':' will be replaced with '/'.  This allows organizing content into folders.  For example, given the pointer tag
+
+  .. code-block:: xml
+
+    <problem url_name="conceptual:add_apples_and_oranges"/>
+
+we would look for the problem definition in `problem/conceptual/add_apples_and_oranges.xml`. (There is a technical reason why we can't just allow '/' in the url_name directly.)
+
+.. important::
+  A student's state for a particular content element is tied to the element ID, so automatic ID generation is only ok for elements that do not need to store any student state (e.g. verticals or customtags).  For problems, sequentials, and videos, and any other element where we keep track of what the student has done and where they are at, you should specify a unique `url_name`. Of course, any content element that is split out into a file will need a `url_name` to specify where to find the definition.
+
+
+************
+Policy Files
+************
+* A policy file is useful when running different versions of a course e.g. internal, external, fall, spring, etc. as you can change due dates, etc, by creating multiple policy files.
+* A policy file provides information on the metadata of the course--things that are not inherent to the definitions of the contents, but that may vary from run to run.
+* Note: We will be expanding our understanding and format for metadata in the not-too-distant future, but for now it is simply a set of key-value pairs.
+
+Locations
+=========
+* The policy for a course run `some_url_name` should live in `policies/some_url_name/policy.json`  (NOTE: the old format of putting it in `policies/some_url_name.json` will also work, but we suggest using the subdirectory to have all the per-course policy files in one place)
+* Grading policy files go in `policies/some_url_name/grading_policy.json`   (if there's only one course run, can also put it directly in the course root: `/grading_policy.json`)
+
+Contents
+========
+* The file format is JSON, and is best shown by example, as in the tutorial above.
+* The expected contents are a dictionary mapping from keys to values (syntax `{ key : value, key2 : value2, etc}`)
+* Keys are in the form `{category}/{url_name}`, which should uniquely identify a content element. Values are dictionaries of the form `{"metadata-key" : "metadata-value"}`.
+* The order in which things appear does not matter, though it may be helpful to organize the file in the same order as things appear in the content.
+* NOTE: JSON is picky about commas.  If you have trailing commas before closing braces, it will complain and refuse to parse the file.  This can be irritating at first.
+
+Supported fields at the course level
+====================================
+
+  .. list-table::
+     :widths: 10 80
+     :header-rows: 0
+
+     * - `start`
+       - specify the start date for the course.  Format-by-example: `"2012-09-05T12:00"`.
+     * - `advertised_start`
+       - specify what you want displayed as the start date of the course in the course listing and course about pages. This can be useful if you want to let people in early before the formal start. Format-by-example: `"2012-09-05T12:"00`.
+     * - `disable_policy_graph`
+       - set to true (or "Yes"), if the policy graph should be disabled (ie not shown).
+     * - `enrollment_start`, `enrollment_end`
+       - -- when can students enroll?  (if not specified, can enroll anytime). Same format as `start`.
+     * - `end`
+       - specify the end date for the course.  Format-by-example: `"2012-11-05T12:00"`.
+     * - `end_of_course_survey_url`
+       - a url for an end of course survey -- shown after course is over, next to certificate download links.
+     * - `tabs`
+       - have custom tabs in the courseware.  See below for details on config.
+     * - `discussion_blackouts`
+       - An array of time intervals during which you want to disable a student's ability to create or edit posts in the forum. Moderators, Community TAs, and Admins are unaffected. You might use this during exam periods, but please be aware that the forum is often a very good place to catch mistakes and clarify points to students. The better long term solution would be to have better flagging/moderation mechanisms, but this is the hammer we have today. Format by example: `[["2012-10-29T04:00", "2012-11-03T04:00"], ["2012-12-30T04:00", "2013-01-02T04:00"]]`
+     * - `show_calculator`
+       - (value "Yes" if desired)
+     * - `days_early_for_beta`
+       - number of days (floating point ok) early that students in the beta-testers group get to see course content.  Can also be specified for any other course element, and overrides values set at higher levels.
+     * - `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`: Truthy.
+          * `auto_cohort_groups`: `["group name 1", "group name 2", ...]` If `cohorted` and `auto_cohort` is true, automatically put each student into a random group from the `auto_cohort_groups` list, creating the group if needed.  
+
+
+Available metadata
+==================
+
+Not Inherited
+--------------
+`display_name`
+  Name that will appear when this content is displayed in the courseware.  Useful for all tag types.
+
+`format`
+  Subheading under display name -- currently only displayed for chapter sub-sections.  Also used by the the grader to know how to process students assessments that the section contains. New formats can be defined as a 'type' in the GRADER variable in course_settings.json. Optional.  (TODO: double check this--what's the current behavior?)
+
+`hide_from_toc`
+  If set to true for a chapter or chapter subsection, will hide that element from the courseware navigation accordion.  This is useful if you'd like to link to the content directly instead (e.g. for tutorials)
+
+`ispublic`
+  Specify whether the course is public.  You should be able to use start dates instead (?)
+
+Inherited
+---------
+
+`start`
+  When this content should be shown to students.  Note that anyone with staff access to the course will always see everything.
+
+`showanswer`
+  When to show answer. For 'attempted', will show answer after first attempt. Values: never, attempted, answered, closed. Default: closed. Optional.
+
+`graded`
+  Whether this section will count towards the students grade. "true" or "false". Defaults to "false".
+
+`rerandomize`
+  Randomize question on each attempt. Optional. Possible values:
+  
+  `always` (default)
+    Students see a different version of the problem after each attempt to solve it.
+  `onreset`
+    Randomize question when reset button is pressed by the student.
+  `never`
+    All students see the same version of the problem.
+  `per_student`
+    Individual students see the same version of the problem each time the look at it, but that version is different from what other students see.
+  `due`
+    Due date for assignment. Assignment will be closed after that.  Values: valid date. Default: none. Optional.
+  `attempts`
+    Number of allowed attempts. Values: integer. Default: infinite. Optional.
+  `graceperiod`
+    A default length of time that the problem is still accessible after the due date in the format `"2 days 3 hours"` or `"1 day 15 minutes"`.  Note, graceperiods are currently the easiest way to handle time zones. Due dates are all expressed in UTC.
+  `xqa_key`
+    For integration with Ike's content QA server. -- should typically be specified at the course level.
+
+Inheritance example
+-------------------
+This is a sketch ("tue" is not a valid start date), that should help illustrate how metadata inheritance works.
+
+  .. code-block:: xml
+
+    <course start="tue">
+      <chap1> -- start tue
+        <problem>   --- start tue
+      </chap1>
+      <chap2 start="wed">  -- start wed
+       <problem2 start="thu">  -- start thu
+       <problem3>      -- start wed
+      </chap2>
+    </course>
+
+
+Specifying metadata in the XML file
+-----------------------------------
+Metadata can also live in the xml files, but anything defined in the policy file overrides anything in the XML.  This is primarily for backwards compatibility, and you should probably  not use both.  If you do leave some metadata tags in the xml, you should be consistent (e.g. if `display_name` stays in XML, they should all stay in XML. Note `display_name` should be specified in the problem xml definition itself, ie, `<problem display_name="Title">Problem Text</problem>`, in file `ProblemFoo.xml`).
+
+.. note::
+   Some xml attributes are not metadata.  e.g. in `<video youtube="xyz987293487293847"/>`, the `youtube` attribute specifies what video this is, and is logically part of the content, not the policy, so it should stay in the xml.
+
+Another example policy file::
+
+    {
+        "course/2012": {
+            "graceperiod": "1 day",
+            "start": "2012-10-15T12:00",
+            "display_name": "Introduction to Computer Science I",
+            "xqa_key": "z1y4vdYcy0izkoPeihtPClDxmbY1ogDK"
+        },
+        "chapter/Week_0": {
+            "display_name": "Week 0"
+        },
+        "sequential/Pre-Course_Survey": {
+            "display_name": "Pre-Course Survey",
+            "format": "Survey"
+        }
+    }
+
+
+
+Deprecated Formats
+------------------
+If you look at some older xml, you may see some tags or metadata attributes that aren't listed above.  They are deprecated, and should not be used in new content.  We include them here so that you can understand how old-format content works.
+
+Obsolete Tags
+^^^^^^^^^^^^^
+`section`
+  This used to be necessary within chapters.  Now, you can just use any standard tag inside a chapter, so use the container tag that makes the most sense for grouping content--e.g. `problemset`, `videosequence`, and just include content directly if it belongs inside a chapter (e.g. `html`, `video`, `problem`)
+
+`videodev, book, slides, image, discuss`
+  There used to be special purpose tags that all basically did the same thing, and have been subsumed by `customtag`.  The list is `videodev, book, slides, image, discuss`.  Use `customtag` in new content.  (e.g. instead of `<book page="12"/>`, use `<customtag impl="book" page="12"/>`)
+
+Obsolete Attributes
+^^^^^^^^^^^^^^^^^^^
+`slug`
+  Old term for `url_name`.  Use `url_name`
+
+`name`
+  We didn't originally have a distinction between `url_name` and `display_name` -- this made content element ids fragile, so please use `url_name` as a stable unique identifier for the content, and `display_name` as the particular string you'd like to display for it.
+
+************
+Static links
+************
+If your content links (e.g. in an html file)  to `"static/blah/ponies.jpg"`, we will look for this...
+
+* If your course dir has a `static/` subdirectory, we will look in `YOUR_COURSE_DIR/static/blah/ponies.jpg`.   This is the prefered organization, as it does not expose anything except what's in `static/` to the world.
+*  If your course dir does not have a `static/` subdirectory, we will look in `YOUR_COURSE_DIR/blah/ponies.jpg`.  This is the old organization, and requires that the web server allow access to everything in the couse dir.  To switch to the new organization, move all your static content into a new `static/` dir  (e.g. if you currently have things in `images/`, `css/`, and `special/`, create a dir called `static/`, and move `images/, css/, and special/` there).
+
+Links that include `/course` will be rewritten to the root of your course in the courseware (e.g. `courses/{org}/{course}/{url_name}/` in the current url structure).  This is useful for linking to the course wiki, for example.
+
+****
+Tabs
+****
+
+If you want to customize the courseware tabs displayed for your course, specify a "tabs" list in the course-level policy, like the following example:
+
+.. code-block:: json
+
+  "tabs" : [
+    {"type": "courseware"},
+    {
+      "type": "course_info",
+      "name": "Course Info"
+    },
+    {
+      "type": "external_link",
+      "name": "My Discussion",
+      "link": "http://www.mydiscussion.org/blah"
+    },
+    {"type": "progress", "name": "Progress"},
+    {"type": "wiki", "name": "Wonderwiki"},
+    {
+      "type": "static_tab",
+      "url_slug": "news",
+      "name": "Exciting news"
+    },
+    {"type": "textbooks"}
+  ]
+
+* If you specify any tabs, you must specify all tabs.  They will appear in the order given.
+* The first two tabs must have types `"courseware"` and `"course_info"`, in that order, or the course will not load.
+* The `courseware` tab never has a name attribute -- it's always rendered as "Courseware" for consistency between courses.
+* The `textbooks` tab will actually generate one tab per textbook, using the textbook titles as names.
+* For static tabs, the `url_slug` will be the url that points to the tab.  It can not be one of the existing courseware url types (even if those aren't used in your course).  The static content will come from `tabs/{course_url_name}/{url_slug}.html`, or `tabs/{url_slug}.html` if that doesn't exist.
+* An Instructor tab will be automatically added at the end for course staff users.
+
+.. list-table:: Supported Tabs and Parameters
+   :widths: 10 80
+   :header-rows: 0
+
+   * - `courseware`
+     - No other parameters.
+   * - `course_info`
+     - Parameter `name`.
+   * - `wiki`
+     - arameter `name`.
+   * - `discussion`
+     - Parameter `name`.
+   * - `external_link`
+     - Parameters `name`, `link`.
+   * - `textbooks`
+     - No parameters--generates tab names from book titles.
+   * - `progress`
+     - Parameter `name`.
+   * - `static_tab`
+     - Parameters `name`, `url_slug`--will look for tab contents in 'tabs/{course_url_name}/{tab url_slug}.html'
+   * - `staff_grading`
+     - No parameters.  If specified, displays the staff grading tab for instructors.
+
+*************************************
+Other file locations (info and about)
+*************************************
+With different course runs, we may want different course info and about materials.  This is now supported by putting files in as follows::
+
+    / 
+      about/
+           foo.html      -- shared default for all runs
+           url_name1/
+                foo.html   -- version used for url_name1
+                bar.html   -- bar for url_name1
+           url_name2/
+                bar.html   -- bar for url_name2
+                           -- url_name2 will use default foo.html
+
+and the same works for the `info` directory.
+
+
+***************************
+Tips for content developers
+***************************
+
+#. We will be making better tools for managing policy files soon.  In the meantime, you can add dummy definitions to make it easier to search and separate the file visually.  For example, you could add `"WEEK 1" : "###################"`, before the week 1 material to make it easy to find in the file.
+
+#. Come up with a consistent pattern for url_names, so that it's easy to know where to look for any piece of content.  It will also help to come up with a standard way of splitting your content files.  As a point of departure, we suggest splitting chapters, sequences, html, and problems into separate files.
+
+#. Prefer the most "semantic" name for containers: e.g., use problemset rather than sequential for a problem set. That way, if we decide to display problem sets differently, we don't have to change the XML.
+
diff --git a/doc/public/course_data_formats/drag_and_drop/drag-n-drop-demo.xml b/doc/public/course_data_formats/drag_and_drop/drag-n-drop-demo.xml
new file mode 100644
index 0000000000..67712407a1
--- /dev/null
+++ b/doc/public/course_data_formats/drag_and_drop/drag-n-drop-demo.xml
@@ -0,0 +1,526 @@
+<problem display_name="Drag and drop demos: drag and drop icons or labels
+    to proper positions." >
+
+<customresponse>
+    <text>
+        <h4>[Anyof rule example]</h4><br/>
+        <h4>Please label hydrogen  atoms connected with left carbon atom.</h4>
+        <br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/images_list/ethglycol.jpg" target_outline="true"
+        one_per_target="true" no_labels="true" label_bg_color="rgb(222, 139, 238)">
+        <draggable id="1" label="Hydrogen" />
+        <draggable id="2" label="Hydrogen" />
+
+        <target id="t1_o" x="10" y="67" w="100" h="100"/>
+        <target id="t2" x="133" y="3" w="70" h="70"/>
+        <target id="t3" x="2" y="384" w="70" h="70"/>
+        <target id="t4" x="95" y="386" w="70" h="70"/>
+        <target id="t5_c" x="94" y="293" w="91" h="91"/>
+        <target id="t6_c" x="328" y="294" w="91" h="91"/>
+        <target id="t7" x="393" y="463" w="70" h="70"/>
+        <target id="t8" x="344" y="214" w="70" h="70"/>
+        <target id="t9_o" x="445" y="162" w="100" h="100"/>
+        <target id="t10" x="591" y="132" w="70" h="70"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{'draggables': ['1', '2'],
+'targets': ['t2', 't3', 't4' ],
+'rule':'anyof'
+}]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Complex grading example]</h4><br/>
+        <h4>Describe carbon molecule in LCAO-MO.</h4>
+        <br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/images_list/lcao-mo/lcao-mo.jpg" target_outline="true" >
+
+        <!-- filled bond -->
+        <draggable id="1" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="2" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="3" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="4" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="5" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="6" icon="/static/images/images_list/lcao-mo/u_d.png" />
+
+        <!-- up bond -->
+        <draggable id="7"  icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="8"  icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="9"  icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="10" icon="/static/images/images_list/lcao-mo/up.png"/>
+
+        <!-- sigma -->
+        <draggable id="11" icon="/static/images/images_list/lcao-mo/sigma.png"/>
+        <draggable id="12" icon="/static/images/images_list/lcao-mo/sigma.png"/>
+
+        <!-- sigma* -->
+        <draggable id="13" icon="/static/images/images_list/lcao-mo/sigma_s.png"/>
+        <draggable id="14" icon="/static/images/images_list/lcao-mo/sigma_s.png"/>
+
+        <!-- pi -->
+        <draggable id="15" icon="/static/images/images_list/lcao-mo/pi.png" />
+
+        <!-- pi* -->
+        <draggable id="16" icon="/static/images/images_list/lcao-mo/pi_s.png" />
+
+        <!-- images that should not be dragged -->
+        <draggable id="17" icon="/static/images/images_list/lcao-mo/d.png" />
+        <draggable id="18" icon="/static/images/images_list/lcao-mo/d.png" />
+
+        <!-- positions of electrons and electron pairs -->
+        <target id="s_left"       x="130" y="360"    w="32" h="32"/>
+        <target id="s_right"      x="505" y="360"    w="32" h="32"/>
+        <target id="s_sigma"      x="320" y="425"    w="32" h="32"/>
+        <target id="s_sigma_star" x="320" y="290"    w="32" h="32"/>
+        <target id="p_left_1"     x="80"  y="100"    w="32" h="32"/>
+        <target id="p_left_2"     x="125" y="100"    w="32" h="32"/>
+        <target id="p_left_3"     x="175" y="100"    w="32" h="32"/>
+        <target id="p_right_1"    x="465" y="100"    w="32" h="32"/>
+        <target id="p_right_2"    x="515" y="100"    w="32" h="32"/>
+        <target id="p_right_3"    x="560" y="100"    w="32" h="32"/>
+        <target id="p_pi_1"       x="290" y="220"    w="32" h="32"/>
+        <target id="p_pi_2"       x="335" y="220"    w="32" h="32"/>
+        <target id="p_sigma"      x="315" y="170"    w="32" h="32"/>
+        <target id="p_pi_star_1"  x="290" y="40"     w="32" h="32"/>
+        <target id="p_pi_star_2"  x="340" y="40"     w="32" h="32"/>
+        <target id="p_sigma_star" x="315" y="0"      w="32" h="32"/>
+
+        <!-- positions of names of energy levels -->
+        <target id="s_sigma_name"      x="400" y="425"  w="32" h="32"/>
+        <target id="s_sigma_star_name" x="400" y="290"  w="32" h="32"/>
+        <target id="p_pi_name"         x="400" y="220"  w="32" h="32"/>
+        <target id="p_sigma_name"      x="400" y="170"  w="32" h="32"/>
+        <target id="p_pi_star_name"    x="400" y="40"   w="32" h="32"/>
+        <target id="p_sigma_star_name" x="400" y="0"    w="32" h="32"/>
+
+  </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+  'draggables': ['1', '2', '3', '4', '5', '6'],
+  'targets': [
+    's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'
+  ],
+  'rule': 'unordered_equal'
+}, {
+  'draggables': ['7','8', '9', '10'],
+  'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
+  'rule': 'unordered_equal'
+}, {
+  'draggables': ['11', '12'],
+  'targets': ['s_sigma_name', 'p_sigma_name'],
+  'rule': 'unordered_equal'
+}, {
+  'draggables': ['13', '14'],
+  'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
+  'rule': 'unordered_equal'
+}, {
+  'draggables': ['15'],
+  'targets': ['p_pi_name'],
+  'rule': 'unordered_equal'
+}, {
+  'draggables': ['16'],
+  'targets': ['p_pi_star_name'],
+  'rule': 'unordered_equal'
+}]
+
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Another complex grading example]</h4><br/>
+        <h4>Describe oxygen molecule in LCAO-MO</h4>
+        <br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/images_list/lcao-mo/lcao-mo.jpg" target_outline="true" one_per_target="true">
+        <!-- filled bond -->
+        <draggable id="1" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="2" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="3" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="4" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="5" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="6" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="v_fb_1" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="v_fb_2" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="v_fb_3" icon="/static/images/images_list/lcao-mo/u_d.png" />
+
+        <!-- up bond -->
+        <draggable id="7"  icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="8"  icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="9"  icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="10" icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="v_ub_1" icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="v_ub_2" icon="/static/images/images_list/lcao-mo/up.png"/>
+
+        <!-- sigma -->
+        <draggable id="11" icon="/static/images/images_list/lcao-mo/sigma.png"/>
+        <draggable id="12" icon="/static/images/images_list/lcao-mo/sigma.png"/>
+
+        <!-- sigma* -->
+        <draggable id="13" icon="/static/images/images_list/lcao-mo/sigma_s.png"/>
+        <draggable id="14" icon="/static/images/images_list/lcao-mo/sigma_s.png"/>
+
+        <!-- pi -->
+        <draggable id="15" icon="/static/images/images_list/lcao-mo/pi.png" />
+
+        <!-- pi* -->
+        <draggable id="16" icon="/static/images/images_list/lcao-mo/pi_s.png" />
+
+        <!-- images that should not be dragged -->
+        <draggable id="17" icon="/static/images/images_list/lcao-mo/d.png" />
+        <draggable id="18" icon="/static/images/images_list/lcao-mo/d.png" />
+
+        <!-- positions of electrons and electron pairs -->
+        <target id="s_left"       x="130" y="360"    w="32" h="32"/>
+        <target id="s_right"      x="505" y="360"    w="32" h="32"/>
+        <target id="s_sigma"      x="320" y="425"    w="32" h="32"/>
+        <target id="s_sigma_star" x="320" y="290"   w="32" h="32"/>
+        <target id="p_left_1"     x="80"  y="100"   w="32" h="32"/>
+        <target id="p_left_2"     x="125" y="100"   w="32" h="32"/>
+        <target id="p_left_3"     x="175" y="100"   w="32" h="32"/>
+        <target id="p_right_1"    x="465" y="100"   w="32" h="32"/>
+        <target id="p_right_2"    x="515" y="100"   w="32" h="32"/>
+        <target id="p_right_3"    x="560" y="100"   w="32" h="32"/>
+        <target id="p_pi_1"       x="290" y="220"  w="32" h="32"/>
+        <target id="p_pi_2"       x="335" y="220"  w="32" h="32"/>
+        <target id="p_sigma"      x="315" y="170"  w="32" h="32"/>
+        <target id="p_pi_star_1"  x="290" y="40"  w="32" h="32"/>
+        <target id="p_pi_star_2"  x="340" y="40"  w="32" h="32"/>
+        <target id="p_sigma_star" x="315" y="0"  w="32" h="32"/>
+
+        <!-- positions of names of energy levels -->
+        <target id="s_sigma_name" x="400" y="425"  w="32" h="32"/>
+        <target id="s_sigma_star_name" x="400" y="290"  w="32" h="32"/>
+        <target id="p_pi_name" x="400" y="220"  w="32" h="32"/>
+        <target id="p_pi_star_name" x="400" y="40"  w="32" h="32"/>
+        <target id="p_sigma_name" x="400" y="170"  w="32" h="32"/>
+        <target id="p_sigma_star_name" x="400" y="0"  w="32" h="32"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [{
+  'draggables': ['1', '2', '3', '4', '5', '6', 'v_fb_1', 'v_fb_2', 'v_fb_3'],
+  'targets': [
+    's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2',
+    'p_sigma', 'p_left_1', 'p_right_3'
+  ],
+  'rule': 'anyof'
+}, {
+  'draggables': ['7', '8', '9', '10', 'v_ub_1', 'v_ub_2'],
+  'targets': [
+    'p_left_2', 'p_left_3', 'p_right_1', 'p_right_2', 'p_pi_star_1',
+    'p_pi_star_2'
+  ],
+  'rule': 'anyof'
+}, {
+  'draggables': ['11', '12'],
+  'targets': ['s_sigma_name', 'p_sigma_name'],
+  'rule': 'anyof'
+}, {
+  'draggables': ['13', '14'],
+  'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
+  'rule': 'anyof'
+}, {
+  'draggables': ['15'],
+  'targets': ['p_pi_name'],
+  'rule': 'anyof'
+}, {
+  'draggables': ['16'],
+  'targets': ['p_pi_star_name'],
+  'rule': 'anyof'
+}]
+
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Individual targets with outlines, One draggable per target]</h4><br/>
+        <h4>
+        Drag -Ant- to first position and -Star- to third position </h4><br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow.png" target_outline="true">
+        <draggable id="1" label="Label 1"/>
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" />
+        <draggable id="5" label="Label2" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" />
+        <draggable id="7" label="Label3" />
+
+        <target id="t1" x="20" y="20" w="90" h="90"/>
+        <target id="t2" x="300" y="100" w="90" h="90"/>
+        <target id="t3" x="150" y="40" w="50" h="50"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {'name_with_icon': 't1', 'name4': 't2'}
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[SMALL IMAGE,  Individual targets WITHOUT outlines, One draggable
+            per target]</h4><br/>
+        <h4>
+            Move -Star- to the volcano opening, and -Label3- on to
+            the right ear of the cow.
+        </h4><br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow3.png" target_outline="false">
+        <draggable id="1" label="Label 1"/>
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" />
+        <draggable id="5" label="Label2" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" />
+        <draggable id="7" label="Label3" />
+
+        <target id="t1" x="111" y="58" w="90" h="90"/>
+        <target id="t2" x="212" y="90" w="90" h="90"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {'name4': 't1',
+                '7': 't2'}
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Many draggables per target]</h4><br/>
+        <h4>Move -Star- and -Ant- to most left target
+            and -Label3- and -Label2- to most right target.</h4><br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow.png" target_outline="true" one_per_target="false">
+        <draggable id="1" label="Label 1"/>
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" />
+        <draggable id="5" label="Label2" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" />
+        <draggable id="7" label="Label3" />
+
+        <target id="t1" x="20" y="20" w="90" h="90"/>
+        <target id="t2" x="300" y="100" w="90" h="90"/>
+        <target id="t3" x="150" y="40" w="50" h="50"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {'name4': 't1',
+                'name_with_icon': 't1',
+                '5': 't2',
+                '7':'t2'}
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Draggables can be placed anywhere on base image]</h4><br/>
+        <h4>
+            Place -Grass- in the middle of the image and -Ant- in the
+            right upper corner.</h4><br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow.png" >
+        <draggable id="1" label="Label 1"/>
+        <draggable id="ant" label="Ant" icon="/static/images/images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" />
+        <draggable id="5" label="Label2" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" />
+        <draggable id="grass" label="Grass" icon="/static/images/images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" />
+        <draggable id="7" label="Label3" />
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {'grass':     [[300, 200], 200],
+                  'ant': [[500, 0], 200]}
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Another anyof example]</h4><br/>
+        <h4>Please identify the Carbon and Oxygen atoms in the molecule.</h4><br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/images_list/ethglycol.jpg" target_outline="true" one_per_target="true">
+        <draggable id="l1_c" label="Carbon" />
+        <draggable id="l2" label="Methane"/>
+        <draggable id="l3_o" label="Oxygen" />
+        <draggable id="l4" label="Calcium" />
+        <draggable id="l5" label="Methane"/>
+        <draggable id="l6" label="Calcium" />
+        <draggable id="l7" label="Hydrogen" />
+        <draggable id="l8_c" label="Carbon" />
+        <draggable id="l9" label="Hydrogen" />
+        <draggable id="l10_o" label="Oxygen" />
+
+        <target id="t1_o" x="10" y="67" w="100" h="100"/>
+        <target id="t2" x="133" y="3" w="70" h="70"/>
+        <target id="t3" x="2" y="384" w="70" h="70"/>
+        <target id="t4" x="95" y="386" w="70" h="70"/>
+        <target id="t5_c" x="94" y="293" w="91" h="91"/>
+        <target id="t6_c" x="328" y="294" w="91" h="91"/>
+        <target id="t7" x="393" y="463" w="70" h="70"/>
+        <target id="t8" x="344" y="214" w="70" h="70"/>
+        <target id="t9_o" x="445" y="162" w="100" h="100"/>
+        <target id="t10" x="591" y="132" w="70" h="70"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+    'draggables':  ['l3_o', 'l10_o'],
+    'targets':  ['t1_o', 't9_o'],
+    'rule': 'anyof'
+},
+{
+    'draggables': ['l1_c','l8_c'],
+    'targets': ['t5_c','t6_c'],
+    'rule': 'anyof'
+}
+]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Again another anyof example]</h4><br/>
+        <h4>If the element appears in this molecule, drag the label onto it</h4>
+        <br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/images_list/ethglycol.jpg" target_outline="true"
+        one_per_target="true" no_labels="true" label_bg_color="rgb(222, 139, 238)">
+        <draggable id="1" label="Hydrogen" />
+        <draggable id="2" label="Hydrogen" />
+        <draggable id="3" label="Nytrogen" />
+        <draggable id="4" label="Nytrogen" />
+        <draggable id="5" label="Boron" />
+        <draggable id="6" label="Boron" />
+        <draggable id="7" label="Carbon" />
+        <draggable id="8" label="Carbon" />
+
+        <target id="t1_o" x="10" y="67" w="100" h="100"/>
+        <target id="t2_h" x="133" y="3" w="70" h="70"/>
+        <target id="t3_h" x="2" y="384" w="70" h="70"/>
+        <target id="t4_h" x="95" y="386" w="70" h="70"/>
+        <target id="t5_c" x="94" y="293" w="91" h="91"/>
+        <target id="t6_c" x="328" y="294" w="91" h="91"/>
+        <target id="t7_h" x="393" y="463" w="70" h="70"/>
+        <target id="t8_h" x="344" y="214" w="70" h="70"/>
+        <target id="t9_o" x="445" y="162" w="100" h="100"/>
+        <target id="t10_h" x="591" y="132" w="70" h="70"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+    'draggables':   ['7', '8'],
+    'targets':  ['t5_c', 't6_c'],
+    'rule': 'anyof'
+},
+{
+    'draggables': ['1', '2'],
+    'targets': ['t2_h', 't3_h', 't4_h', 't7_h', 't8_h', 't10_h'],
+    'rule': 'anyof'
+}]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Wrong base image url example]
+        </h4><br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow3_bad.png" target_outline="false">
+        <draggable id="1" label="Label 1"/>
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" />
+        <draggable id="5" label="Label2" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" />
+        <draggable id="7" label="Label3" />
+
+        <target id="t1" x="111" y="58" w="90" h="90"/>
+        <target id="t2" x="212" y="90" w="90" h="90"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {'name4': 't1',
+                '7': 't2'}
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+</problem>
diff --git a/doc/public/course_data_formats/drag_and_drop/drag-n-drop-demo2.xml b/doc/public/course_data_formats/drag_and_drop/drag-n-drop-demo2.xml
new file mode 100644
index 0000000000..6ffac18e44
--- /dev/null
+++ b/doc/public/course_data_formats/drag_and_drop/drag-n-drop-demo2.xml
@@ -0,0 +1,373 @@
+<problem display_name="Drag and drop demos: drag and drop icons or labels
+    to proper positions." >
+
+<customresponse>
+    <text>
+        <h4>[Draggable is reusable example]</h4>
+        <br/>
+        <h4>Please label all hydrogen atoms.</h4>
+        <br/>
+    </text>
+
+    <drag_and_drop_input
+        img="/static/images/images_list/ethglycol.jpg"
+        target_outline="true"
+        one_per_target="true"
+        no_labels="true"
+        label_bg_color="rgb(222, 139, 238)"
+    >
+        <draggable id="1" label="Hydrogen" can_reuse='true' />
+
+        <target id="t1_o" x="10" y="67" w="100" h="100" />
+        <target id="t2" x="133" y="3" w="70" h="70" />
+        <target id="t3" x="2" y="384" w="70" h="70" />
+        <target id="t4" x="95" y="386" w="70" h="70" />
+        <target id="t5_c" x="94" y="293" w="91" h="91" />
+        <target id="t6_c" x="328" y="294" w="91" h="91" />
+        <target id="t7" x="393" y="463" w="70" h="70" />
+        <target id="t8" x="344" y="214" w="70" h="70" />
+        <target id="t9_o" x="445" y="162" w="100" h="100" />
+        <target id="t10" x="591" y="132" w="70" h="70" />
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python">
+    <![CDATA[
+correct_answer = [{
+    'draggables': ['1'],
+    'targets': ['t2', 't3', 't4', 't7', 't8', 't10'],
+    'rule': 'exact'
+}]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+    ]]>
+    </answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Complex grading example]</h4><br/>
+        <h4>Describe carbon molecule in LCAO-MO.</h4>
+        <br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/images_list/lcao-mo/lcao-mo.jpg" target_outline="true" >
+
+        <!-- filled bond -->
+        <draggable id="1" icon="/static/images/images_list/lcao-mo/u_d.png" can_reuse="true" />
+
+        <!-- up bond -->
+        <draggable id="7"  icon="/static/images/images_list/lcao-mo/up.png" can_reuse="true" />
+
+        <!-- sigma -->
+        <draggable id="11" icon="/static/images/images_list/lcao-mo/sigma.png" can_reuse="true" />
+
+        <!-- sigma* -->
+        <draggable id="13" icon="/static/images/images_list/lcao-mo/sigma_s.png" can_reuse="true" />
+
+        <!-- pi -->
+        <draggable id="15" icon="/static/images/images_list/lcao-mo/pi.png" can_reuse="true" />
+
+        <!-- pi* -->
+        <draggable id="16" icon="/static/images/images_list/lcao-mo/pi_s.png" can_reuse="true" />
+
+        <!-- images that should not be dragged -->
+        <draggable id="17" icon="/static/images/images_list/lcao-mo/d.png" can_reuse="true" />
+
+        <!-- positions of electrons and electron pairs -->
+        <target id="s_left"       x="130" y="360"    w="32" h="32"/>
+        <target id="s_right"      x="505" y="360"    w="32" h="32"/>
+        <target id="s_sigma"      x="320" y="425"    w="32" h="32"/>
+        <target id="s_sigma_star" x="320" y="290"    w="32" h="32"/>
+        <target id="p_left_1"     x="80"  y="100"    w="32" h="32"/>
+        <target id="p_left_2"     x="125" y="100"    w="32" h="32"/>
+        <target id="p_left_3"     x="175" y="100"    w="32" h="32"/>
+        <target id="p_right_1"    x="465" y="100"    w="32" h="32"/>
+        <target id="p_right_2"    x="515" y="100"    w="32" h="32"/>
+        <target id="p_right_3"    x="560" y="100"    w="32" h="32"/>
+        <target id="p_pi_1"       x="290" y="220"    w="32" h="32"/>
+        <target id="p_pi_2"       x="335" y="220"    w="32" h="32"/>
+        <target id="p_sigma"      x="315" y="170"    w="32" h="32"/>
+        <target id="p_pi_star_1"  x="290" y="40"     w="32" h="32"/>
+        <target id="p_pi_star_2"  x="340" y="40"     w="32" h="32"/>
+        <target id="p_sigma_star" x="315" y="0"      w="32" h="32"/>
+
+        <!-- positions of names of energy levels -->
+        <target id="s_sigma_name"      x="400" y="425"  w="32" h="32"/>
+        <target id="s_sigma_star_name" x="400" y="290"  w="32" h="32"/>
+        <target id="p_pi_name"         x="400" y="220"  w="32" h="32"/>
+        <target id="p_sigma_name"      x="400" y="170"  w="32" h="32"/>
+        <target id="p_pi_star_name"    x="400" y="40"   w="32" h="32"/>
+        <target id="p_sigma_star_name" x="400" y="0"    w="32" h="32"/>
+
+  </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+  'draggables': ['1'],
+  'targets': [
+    's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'
+  ],
+  'rule': 'exact'
+}, {
+  'draggables': ['7'],
+  'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
+  'rule': 'exact'
+}, {
+  'draggables': ['11'],
+  'targets': ['s_sigma_name', 'p_sigma_name'],
+  'rule': 'exact'
+}, {
+  'draggables': ['13'],
+  'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
+  'rule': 'exact'
+}, {
+  'draggables': ['15'],
+  'targets': ['p_pi_name'],
+  'rule': 'exact'
+}, {
+  'draggables': ['16'],
+  'targets': ['p_pi_star_name'],
+  'rule': 'exact'
+}]
+
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Many draggables per target]</h4><br/>
+        <h4>Move two Stars and three Ants to most left target
+            and one Label3 and four Label2 to most right target.</h4><br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow.png" target_outline="true" one_per_target="false">
+        <draggable id="1" label="Label 1" can_reuse="true" />
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg" can_reuse="true" />
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" can_reuse="true" />
+        <draggable id="5" label="Label2" can_reuse="true" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" can_reuse="true" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" can_reuse="true" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" can_reuse="true" />
+        <draggable id="7" label="Label3" can_reuse="true" />
+
+        <target id="t1" x="20" y="20" w="90" h="90"/>
+        <target id="t2" x="300" y="100" w="90" h="90"/>
+        <target id="t3" x="150" y="40" w="50" h="50"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+    'draggables': ['name4'],
+    'targets': [
+        't1', 't1'
+    ],
+    'rule': 'exact'
+},
+{
+    'draggables': ['name_with_icon'],
+    'targets': [
+        't1', 't1', 't1'
+    ],
+    'rule': 'exact'
+},
+{
+    'draggables': ['5'],
+    'targets': [
+        't2', 't2', 't2', 't2'
+    ],
+    'rule': 'exact'
+},
+{
+    'draggables': ['7'],
+    'targets': [
+        't2'
+    ],
+    'rule': 'exact'
+}
+]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Draggables can be placed anywhere on base image]</h4><br/>
+        <h4>
+            Place -Grass- in the middle of the image and -Ant- in the
+            right upper corner.</h4><br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow.png" >
+        <draggable id="1" label="Label 1" can_reuse="true" />
+        <draggable id="ant" label="Ant" icon="/static/images/images_list/ant.jpg" can_reuse="true" />
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" can_reuse="true" />
+        <draggable id="5" label="Label2" can_reuse="true" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" can_reuse="true" />
+        <draggable id="grass" label="Grass" icon="/static/images/images_list/grass.jpg" can_reuse="true" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" can_reuse="true" />
+        <draggable id="7" label="Label3" can_reuse="true" />
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {
+    'grass': [[300, 200], 200],
+    'ant': [[500, 0], 200]
+}
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Another anyof example]</h4><br/>
+        <h4>Please identify the Carbon and Oxygen atoms in the molecule.</h4><br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/images_list/ethglycol.jpg" target_outline="true" one_per_target="true">
+        <draggable id="l1_c" label="Carbon" can_reuse="true" />
+        <draggable id="l2" label="Methane" can_reuse="true" />
+        <draggable id="l3_o" label="Oxygen" can_reuse="true" />
+        <draggable id="l4" label="Calcium" can_reuse="true" />
+        <draggable id="l7" label="Hydrogen" can_reuse="true" />
+
+        <target id="t1_o" x="10" y="67" w="100" h="100"/>
+        <target id="t2" x="133" y="3" w="70" h="70"/>
+        <target id="t3" x="2" y="384" w="70" h="70"/>
+        <target id="t4" x="95" y="386" w="70" h="70"/>
+        <target id="t5_c" x="94" y="293" w="91" h="91"/>
+        <target id="t6_c" x="328" y="294" w="91" h="91"/>
+        <target id="t7" x="393" y="463" w="70" h="70"/>
+        <target id="t8" x="344" y="214" w="70" h="70"/>
+        <target id="t9_o" x="445" y="162" w="100" h="100"/>
+        <target id="t10" x="591" y="132" w="70" h="70"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+    'draggables': ['l3_o'],
+    'targets': ['t1_o', 't9_o'],
+    'rule': 'exact'
+},
+{
+    'draggables': ['l1_c'],
+    'targets': ['t5_c', 't6_c'],
+    'rule': 'exact'
+}
+]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Exact number of draggables for a set of targets.]</h4><br/>
+        <h4>Drag two Grass and one Star to first or second positions, and three Cloud to any of the three positions.</h4>
+        <br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow.png" target_outline="true" one_per_target="false">
+        <draggable id="1" label="Label 1" can_reuse="true" />
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg" can_reuse="true" />
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" can_reuse="true" />
+        <draggable id="5" label="Label2" can_reuse="true" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" can_reuse="true" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" can_reuse="true" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" can_reuse="true" />
+        <draggable id="7" label="Label3" can_reuse="true" />
+
+        <target id="t1" x="20" y="20" w="90" h="90"/>
+        <target id="t2" x="300" y="100" w="90" h="90"/>
+        <target id="t3" x="150" y="40" w="50" h="50"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+    'draggables': ['name_label_icon3', 'name_label_icon3'],
+    'targets': ['t1', 't3'],
+    'rule': 'unordered_equal+number'
+},
+{
+    'draggables': ['name4'],
+    'targets': ['t1', 't3'],
+    'rule': 'anyof+number'
+},
+{
+    'draggables': ['with_icon', 'with_icon', 'with_icon'],
+    'targets': ['t1', 't2', 't3'],
+    'rule': 'anyof+number'
+}
+]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[As many as you like draggables for a set of targets.]</h4><br/>
+        <h4>Drag some Grass to any of the targets, and some Stars to either first or last target.</h4>
+        <br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow.png" target_outline="true" one_per_target="false">
+        <draggable id="1" label="Label 1" can_reuse="true" />
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg" can_reuse="true" />
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" can_reuse="true" />
+        <draggable id="5" label="Label2" can_reuse="true" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" can_reuse="true" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" can_reuse="true" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" can_reuse="true" />
+        <draggable id="7" label="Label3" can_reuse="true" />
+
+        <target id="t1" x="20" y="20" w="90" h="90"/>
+        <target id="t2" x="300" y="100" w="90" h="90"/>
+        <target id="t3" x="150" y="40" w="50" h="50"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+    'draggables': ['name_label_icon3'],
+    'targets': ['t1', 't2', 't3'],
+    'rule': 'anyof'
+},
+{
+    'draggables': ['name4'],
+    'targets': ['t1', 't2'],
+    'rule': 'anyof'
+}
+]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+</problem>
diff --git a/doc/public/course_data_formats/drag_and_drop/drag_and_drop_input.rst b/doc/public/course_data_formats/drag_and_drop/drag_and_drop_input.rst
new file mode 100644
index 0000000000..4d61038054
--- /dev/null
+++ b/doc/public/course_data_formats/drag_and_drop/drag_and_drop_input.rst
@@ -0,0 +1,323 @@
+**********************************************
+XML format of drag and drop input [inputtypes]
+**********************************************
+
+.. module:: drag_and_drop_input
+
+Format description
+==================
+
+The main tag of Drag and Drop (DnD) input is::
+
+    <drag_and_drop_input> ... </drag_and_drop_input>
+
+``drag_and_drop_input`` can include any number of the following 2 tags:
+``draggable`` and ``target``.
+
+drag_and_drop_input tag
+-----------------------
+
+The main container for a single instance of DnD. The following attributes can
+be specified for this tag::
+
+    img - Relative path to an image that will be the base image. All draggables
+          can be dragged onto it.
+    target_outline - Specify 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 default value is
+          'false'.
+    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 - 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.
+
+draggable tag
+-------------
+
+Draggable tag specifies a single draggable object which has the following
+attributes::
+
+    id - Unique identifier of the draggable object.
+    label - Human readable label that will be shown to the user.
+    icon - Relative path to an image that will be shown to the user.
+    can_reuse - true or false, default is false. If true, same draggable can be
+    used multiple times.
+
+A draggable is what the user must drag out of the slider and place onto the
+base image. After a drag operation, if the center of the draggable ends up
+outside the rectangular dimensions of the image, it will be returned back
+to the slider.
+
+In order for the grader to work, it is essential that a unique ID
+is provided. Otherwise, there will be no way to tell which draggable is at what
+coordinate, or over what target. Label and icon attributes are optional. If
+they are provided they will be used, otherwise, you can have an empty
+draggable. The path is relative to 'course_folder' folder, for example,
+/static/images/img1.png.
+
+target tag
+----------
+
+Target tag specifies a single target object which has the following required
+attributes::
+
+    id - 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.
+    h - Height of the target.
+
+A target specifies a place on the base image where a draggable can be
+positioned. 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]], then it is within
+the target. Otherwise, it is outside.
+
+If at lest one target is provided, the behavior of the client side logic
+changes. If a draggable is not dragged on to a target, it is returned back to
+the slider.
+
+If no targets are provided, then a draggable can be dragged and placed anywhere
+on the base image.
+
+correct answer format
+---------------------
+
+There are two correct answer formats: short and long
+If short from correct answer is mapping of 'draggable_id' to 'target_id'::
+
+    correct_answer = {'grass':     [[300, 200], 200], 'ant': [[500, 0], 200]}
+    correct_answer = {'name4': 't1', '7': 't2'}
+
+In long form correct answer is list of dicts. Every dict has 3 keys:
+draggables, targets and rule. For example::
+
+    correct_answer = [
+    {
+    'draggables':   ['7', '8'],
+    'targets':  ['t5_c', 't6_c'],
+    'rule': 'anyof'
+    },
+    {
+    'draggables': ['1', '2'],
+    'targets': ['t2_h', 't3_h', 't4_h', 't7_h', 't8_h', 't10_h'],
+    'rule': 'anyof'
+    }]
+
+Draggables is list of draggables id. Target is list of targets id, draggables
+must be dragged to with considering rule. Rule is string.
+
+Draggables in dicts inside correct_answer list must not intersect!!!
+
+Wrong (for draggable id 7)::
+
+    correct_answer = [
+    {
+    'draggables':   ['7', '8'],
+    'targets':  ['t5_c', 't6_c'],
+    'rule': 'anyof'
+    },
+    {
+    'draggables': ['7', '2'],
+    'targets': ['t2_h', 't3_h', 't4_h', 't7_h', 't8_h', 't10_h'],
+    'rule': 'anyof'
+    }]
+
+Rules are: exact, anyof, unordered_equal, anyof+number, unordered_equal+number
+
+
+.. such long lines are needed for sphinx to display lists correctly
+
+- Exact rule means that targets for draggable id's in user_answer are the same that targets from correct answer. For example, for draggables 7 and 8 user must drag 7 to target1 and 8 to target2 if correct_answer is::
+
+    correct_answer = [
+    {
+    'draggables':   ['7', '8'],
+    'targets':  ['tartget1', 'target2'],
+    'rule': 'exact'
+    }]
+
+
+- unordered_equal rule allows draggables be dragged to targets unordered. If one want to allow for student to drag 7 to target1 or target2 and 8 to target2 or target 1 and 7 and 8 must be in different targets, then correct answer must be::
+
+    correct_answer = [
+    {
+    'draggables':   ['7', '8'],
+    'targets':  ['tartget1', 'target2'],
+    'rule': 'unordered_equal'
+    }]
+
+
+- Anyof rule allows draggables to be dragged to any of targets. If one want to allow for student to drag 7 and 8 to target1 or target2, which means that if 7 is on target1 and 8 is on target1 or 7 on target2 and 8 on target2 or 7 on target1 and 8 on target2. Any of theese are correct which anyof rule::
+
+    correct_answer = [
+    {
+    'draggables':   ['7', '8'],
+    'targets':  ['tartget1', 'target2'],
+    'rule': 'anyof'
+    }]
+
+
+- If you have can_reuse true, then you, for example, have draggables a,b,c and 10 targets. These will allow you to drag 4 'a' draggables to ['target1',  'target4', 'target7', 'target10'] , you do not need to write 'a' four times. Also this will allow you to drag 'b' draggable to target2 or target5 for target5 and target2 etc..::
+
+    correct_answer = [
+        {
+            'draggables': ['a'],
+            'targets': ['target1',  'target4', 'target7', 'target10'],
+            'rule': 'unordered_equal'
+        },
+        {
+            'draggables': ['b'],
+            'targets': ['target2', 'target5', 'target8'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['c'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'unordered_equal'
+        }]
+
+- And sometimes you want to allow drag only two 'b' draggables, in these case you sould use 'anyof+number' of 'unordered_equal+number' rule::
+
+    correct_answer = [
+        {
+            'draggables': ['a', 'a', 'a'],
+            'targets': ['target1',  'target4', 'target7'],
+            'rule': 'unordered_equal+numbers'
+        },
+        {
+            'draggables': ['b', 'b'],
+            'targets': ['target2', 'target5', 'target8'],
+            'rule': 'anyof+numbers'
+        },
+        {
+            'draggables': ['c'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'unordered_equal'
+        }]
+
+In case if we have no multiple draggables per targets (one_per_target="true"),
+for same number of draggables, anyof is equal to unordered_equal
+
+If we have can_reuse=true, than one must use only long form of correct answer.
+
+
+Grading logic
+-------------
+
+1. User answer (that comes from browser) and correct answer (from xml) are parsed to the same format::
+
+    group_id: group_draggables, group_targets, group_rule
+
+
+Group_id is ordinal number, for every dict in correct answer incremental
+group_id is assigned: 0, 1, 2, ...
+
+Draggables from user answer are added to same group_id where identical draggables
+from correct answer are, for example::
+
+    If correct_draggables[group_0] = [t1, t2] then
+    user_draggables[group_0] are all draggables t1 and t2 from user answer:
+    [t1] or [t1, t2] or [t1, t2, t2] etc..
+
+2. For every group from user answer, for that group draggables, if 'number' is in  group rule, set() is applied,
+if 'number' is not in rule, set is not applied::
+
+    set() : [t1, t2, t3, t3] -> [t1, t2, ,t3]
+
+For every group, at this step, draggables lists are equal.
+
+
+3. For every group, lists of targets are compared using rule for that group.
+
+
+Set and '+number' cases
+.......................
+
+Set() and '+number' are needed only for case of reusable draggables,
+for other cases there are no equal draggables in list, so set() does nothing.
+
+.. such long lines needed for sphinx to display nicely
+
+* Usage of set() operation allows easily create rule for case of "any number of same draggable can be dragged to some targets"::
+
+        {
+                'draggables': ['draggable_1'],
+                'targets': ['target3', 'target6', 'target9'],
+                'rule': 'anyof'
+        }
+
+
+
+
+* 'number' rule is used for the case of reusable draggables, when one want to fix number of draggable to drag. In this example only two instances of draggables_1 are allowed to be dragged::
+
+    {
+            'draggables': ['draggable_1', 'draggable_1'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'anyof+number'
+    }
+
+
+* Note, that in using rule 'exact', one does not need 'number', because you can't recognize from user interface which reusable draggable is on which target. Absurd example::
+
+    {
+            'draggables': ['draggable_1', 'draggable_1', 'draggable_2'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'exact'
+    }
+
+
+    Correct handling of this example is to create different rules for draggable_1 and
+    draggable_2
+
+* For 'unordered_equal' (or 'exact' too) we don't need 'number' if you have only same draggable in group, as targets length will provide constraint for the number of draggables::
+
+    {
+            'draggables': ['draggable_1'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'unordered_equal'
+    }
+
+
+    This means that only three draggaggables 'draggable_1' can be dragged.
+
+* But if you have more that one different reusable draggable in list, you may use 'number' rule::
+
+    {
+            'draggables': ['draggable_1', 'draggable_1', 'draggable_2'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'unordered_equal+number'
+    }
+
+
+    If not use number, draggables list will be setted to  ['draggable_1', 'draggable_2']
+
+
+
+
+Logic flow
+----------
+
+(Click on image to see full size version.)
+
+.. image:: draganddrop_logic_flow.png
+    :width: 100%
+    :target: _images/draganddrop_logic_flow.png
+
+
+Example
+=======
+
+Examples of draggables that can't be reused
+-------------------------------------------
+
+.. literalinclude:: drag-n-drop-demo.xml
+
+Draggables can be reused
+------------------------
+
+.. literalinclude:: drag-n-drop-demo2.xml
diff --git a/doc/public/course_data_formats/drag_and_drop/draganddrop_logic_flow.png b/doc/public/course_data_formats/drag_and_drop/draganddrop_logic_flow.png
new file mode 100644
index 0000000000..2bb1c11a41
Binary files /dev/null and b/doc/public/course_data_formats/drag_and_drop/draganddrop_logic_flow.png differ
diff --git a/doc/course_grading.md b/doc/public/course_data_formats/grading.rst
similarity index 79%
rename from doc/course_grading.md
rename to doc/public/course_data_formats/grading.rst
index 5c668df5d9..b00ca8d500 100644
--- a/doc/course_grading.md
+++ b/doc/public/course_data_formats/grading.rst
@@ -1,5 +1,6 @@
-# Course Grading
-
+##############
+Course Grading
+##############
 This document is written to help professors understand how a final grade for a
 course is computed.
 
@@ -8,42 +9,46 @@ in a course and generating a final score (and corresponding letter grade). This
 grading process can be split into two phases - totaling sections and section 
 weighting.
 
-## Totaling sections
-
+*****************
+Totaling sections
+*****************
 The process of totaling sections is to get a percentage score (between 0.0 and
 1.0) for every section in the course. A section is any module that is a direct
 child of a chapter. For example, psets, labs, and sequences are all common
 sections. Only the *percentage* on the section will be available to compute the
 final grade, *not* the final number of points earned / possible.
 
-
-**For a section to be included in the final grade, the policies file must set
-graded = True for the section.**
+.. important::
+  For a section to be included in the final grade, the policies file must set
+  `graded = True` for the section.
 
 For each section, the grading function retrieves all problems within the
 section. The section percentage is computed as (total points earned) / (total
 points possible).
 
-
-### Weighting Problems
+******************
+Weighting Problems
+******************
 In some cases, one might want to give weights to problems within a section. For
-example, a final exam might contain 4 questions each worth 1 point by default.
+example, a final exam might contain four questions each worth 1 point by default.
 This means each question would by default have the same weight. If one wanted
 the first problem to be worth 50% of the final exam, the policy file could specify
-weights of 30, 10, 10, and 10 to the 4 problems, respectively.
+weights of 30, 10, 10, and 10 to the four problems, respectively.
 
-Note that the default weight of a problem **is not 1.** The default weight of a
-problem is the module's max_grade.
+Note that the default weight of a problem **is not 1**. The default weight of a
+problem is the module's `max_grade`.
 
 If weighting is set, each problem is worth the number of points assigned, regardless of the number of responses it contains.
 
 Consider a Homework section that contains two problems.
 
+.. code-block:: xml
+
     <problem display_name=”Problem 1”>
       <numericalresponse> ... </numericalreponse>
     </problem>
 
-and
+.. code-block:: xml
 
     <problem display_name=”Problem 2”>
       <numericalresponse> ... </numericalreponse>
@@ -51,41 +56,40 @@ and
       <numericalresponse> ... </numericalreponse>
     </problem>
 
-
-
-
-
 Without weighting, Problem 1 is worth 25% of the assignment, and Problem 2 is worth 75% of the assignment.
 
 Weighting for the problems can be set in the policy.json file.
 
+.. code-block:: json
+
     "problem/problem1": {
-       "weight": 2
-       },
+      "weight": 2
+    },
     "problem/problem2": {
-       "weight": 2
-        },
+      "weight": 2
+    },
 
 With the above weighting, Problems 1 and 2 are each worth 50% of the assignment.
 
-Please note: When problems have weight, the point value is automatically included in the display name *except* when “weight”: 1.When “weight”: 1, no visual change occurs in the display name, leaving the point value open to interpretation to the student.
+Please note: When problems have weight, the point value is automatically included in the display name *except* when `"weight": 1`. When the weight is 1, no visual change occurs in the display name, leaving the point value open to interpretation to the student.
 
 
-
-## Section Weighting
-
+******************
+Weighting Sections
+******************
 Once each section has a percentage score, we must total those sections into a
 final grade. Of course, not every section has equal weight in the final grade.
 The policies for weighting sections into a final grade are specified in the
 grading_policy.json file.
 
-The grading_policy.json file specifies several sub-graders that are each given
+The `grading_policy.json` file specifies several sub-graders that are each given
 a weight and factored into the final grade. There are currently two types of
 sub-graders, section format graders and single section graders.
 
 We will use this simple example of a grader with one section format grader and
 one single section grader.
 
+.. code-block:: json
 
     "GRADER" : [
         {
@@ -103,13 +107,14 @@ one single section grader.
         }
     ]
 
-### Section Format Graders
-
+Section Format Graders
+======================
 A section format grader grades a set of sections with the same format, as
 defined in the course policy file. To make a vertical named Homework1 be graded
 by the Homework section format grader, the following definition would be in the
 course policy file.
 
+.. code-block:: json
 
     "vertical/Homework1": {
         "display_name": "Homework 1", 
@@ -132,25 +137,26 @@ A section format grader will also show the average of that section in the grade
 breakdown (shown on the Progress page, gradebook, etc.).
 
 
-### Single Section Graders
-
+Single Section Graders
+======================
 A single section grader grades exactly that - a single section. If a section
 is found with a matching format and display name then the score of that section
 is used. If not, a score of 0% is assumed.
 
 
-### Combining sub-graders
-
+Combining sub-graders
+=====================
 The final grade is computed by taking the score and weight of each sub grader.
 In the above example, homework will be 40% of the final grade. The final exam
 will be 60% of the final grade.
 
-## Displaying the final grade
-
+**************************
+Displaying the final grade
+**************************
 The final grade is then rounded up to the nearest percentage point. This is so
 the system can consistently display a percentage without worrying whether the
 displayed percentage has been rounded up or down (potentially misleading the
-student). The formula for the rounding is
+student). The formula for the rounding is::
 
     rounded_percent = round(computed_percent * 100 + 0.05) / 100
 
diff --git a/doc/public/course_data_formats/graphical_slider_tool/graphical_slider_tool.rst b/doc/public/course_data_formats/graphical_slider_tool/graphical_slider_tool.rst
new file mode 100644
index 0000000000..3fac46e873
--- /dev/null
+++ b/doc/public/course_data_formats/graphical_slider_tool/graphical_slider_tool.rst
@@ -0,0 +1,563 @@
+*********************************************
+XML format of graphical slider tool [xmodule]
+*********************************************
+
+.. 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/doc/public/course_data_formats/graphical_slider_tool/gst_example_bars.xml b/doc/public/course_data_formats/graphical_slider_tool/gst_example_bars.xml
new file mode 100644
index 0000000000..f0a197bb79
--- /dev/null
+++ b/doc/public/course_data_formats/graphical_slider_tool/gst_example_bars.xml
@@ -0,0 +1,64 @@
+<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/doc/public/course_data_formats/graphical_slider_tool/gst_example_dynamic_labels.xml b/doc/public/course_data_formats/graphical_slider_tool/gst_example_dynamic_labels.xml
new file mode 100644
index 0000000000..05cbe407fb
--- /dev/null
+++ b/doc/public/course_data_formats/graphical_slider_tool/gst_example_dynamic_labels.xml
@@ -0,0 +1,40 @@
+<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/doc/public/course_data_formats/graphical_slider_tool/gst_example_dynamic_range.xml b/doc/public/course_data_formats/graphical_slider_tool/gst_example_dynamic_range.xml
new file mode 100644
index 0000000000..0ce4263d62
--- /dev/null
+++ b/doc/public/course_data_formats/graphical_slider_tool/gst_example_dynamic_range.xml
@@ -0,0 +1,37 @@
+<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/doc/public/course_data_formats/graphical_slider_tool/gst_example_html_element_output.xml b/doc/public/course_data_formats/graphical_slider_tool/gst_example_html_element_output.xml
new file mode 100644
index 0000000000..340783871a
--- /dev/null
+++ b/doc/public/course_data_formats/graphical_slider_tool/gst_example_html_element_output.xml
@@ -0,0 +1,40 @@
+<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/doc/public/course_data_formats/graphical_slider_tool/gst_example_with_documentation.xml b/doc/public/course_data_formats/graphical_slider_tool/gst_example_with_documentation.xml
new file mode 100644
index 0000000000..addada5b10
--- /dev/null
+++ b/doc/public/course_data_formats/graphical_slider_tool/gst_example_with_documentation.xml
@@ -0,0 +1,91 @@
+<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/doc/public/index.rst b/doc/public/index.rst
new file mode 100644
index 0000000000..cd0136d192
--- /dev/null
+++ b/doc/public/index.rst
@@ -0,0 +1,44 @@
+..
+    Public facing docs for non-developers go here. Please do not add any Python
+    dependencies for code introspection here (we may temporarily host it some
+    place where those dependencies are cumbersome to build).
+
+edX Data Documentation
+======================
+The following documents are targetted at those who are working with various data formats consumed and produced by the edX platform -- primarily course authors and those who are conducting research on data in our system. Developer oriented discussion of architecture and strictly internal APIs should be documented elsewhere.
+
+Course Data Formats
+-------------------
+These are data formats written by people to specify course structure and content. Some of this is abstracted away if you are using the Studio authoring user interface.
+
+.. toctree::
+   :maxdepth: 2
+
+   course_data_formats/course_xml.rst
+   course_data_formats/grading.rst
+
+Specific Problem Types
+^^^^^^^^^^^^^^^^^^^^^^
+.. toctree::
+   :maxdepth: 1
+
+   course_data_formats/drag_and_drop/drag_and_drop_input.rst
+   course_data_formats/graphical_slider_tool/graphical_slider_tool.rst
+
+
+Internal Data Formats
+---------------------
+These document describe how we store course structure, student state/progress, and events internally. Useful for developers or researchers who interact with our raw data exports.
+
+.. toctree::
+   :maxdepth: 2
+
+   internal_data_formats/sql_schema.rst
+   internal_data_formats/discussion_data.rst
+   internal_data_formats/tracking_logs.rst
+
+Indices and tables
+==================
+
+* :ref:`search`
+
diff --git a/doc/public/internal_data_formats/discussion_data.rst b/doc/public/internal_data_formats/discussion_data.rst
new file mode 100644
index 0000000000..12929ae7b4
--- /dev/null
+++ b/doc/public/internal_data_formats/discussion_data.rst
@@ -0,0 +1,123 @@
+######################
+Discussion Forums Data
+######################
+Discussions in edX are stored in a MongoDB database as collections of JSON documents.
+
+The primary collection holding all posts and comments written by users is `contents`. There are two types of objects stored here, though they share much of the same structure. A `CommentThread` represents a comment that opens a new thread -- usually a student question of some sort. A `Comment` is a reply in the conversation started by a `CommentThread`.
+
+*****************
+Shared Attributes
+*****************
+
+The attributes that `Comment` and `CommentThread` objects share are listed below.
+
+`_id`
+-----
+  The 12-byte MongoDB unique ID for this collection. Like all MongoDB IDs, they 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 `Comment` or `CommentThread` will show up as written by anonymous, even to those who have moderator privileges in the forums.
+
+`anonymous_to_peers`
+--------------------
+  The idea behind this field was that `anonymous_to_peers = true` would make the the comment appear anonymous to your fellow students, but would allow the course staff to see who you were. However, that was never implemented in the UI, and only `anonymous` is actually used. The `anonymous_to_peers` field is always false.
+
+`at_position_list`
+------------------
+  No longer used. Child comments (replies) are just sorted by their `created_at` timestamp instead. 
+
+`author_id`
+-----------
+  The user who wrote this. Corresponds to the user IDs we store in our MySQL database as `auth_user.id`
+
+`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`
+
+`created_at`
+------------
+  Timestamp in UTC. Example: `ISODate("2013-02-21T03:03:04.587Z")`
+
+`updated_at`
+------------
+  Timestamp in UTC. Example: `ISODate("2013-02-21T03:03:04.587Z")`
+
+`votes`
+-------
+  Both `CommentThread` and `Comment` objects support voting. `Comment` objects that are replies to other comments still have this attribute, even though there is no way to actually vote on them in the UI. This attribute is a dictionary that has the following 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` = total downvotes received (no longer used).
+* `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
+*************
+The following fields are specific to `CommentThread` objects. Each thread in the forums is represented by one `CommentThread`.
+
+`closed`
+--------
+  If true, this thread was closed by a forum moderator/admin.
+
+`comment_count`
+---------------
+  The number of comment replies in this thread. This includes all replies to replies, but does not include the original comment that started the thread. So if we had::
+
+    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."
+
+  In that exchange, the `comment_count` for the `CommentThread` is `4`.
+
+`commentable_id`
+----------------
+  We can attach a discussion to any piece of content in the course, or to top level categories like "General" and "Troubleshooting". When the `commentable_id` is a high level category, it's specified in the course's policy file. When it's a specific content piece (e.g. `600x_l5_p8`, meaning 6.00x, Lecture Sequence 5, Problem 8), it's taken from a discussion module in the course.
+
+`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. 
+
+`tags_array`
+------------
+  Meant to be a list of tags that were user definable, but no longer used.
+
+`title`
+-------
+  Title of the thread, UTF-8 string.
+
+*******
+Comment
+*******
+The following fields are specific to `Comment` objects. A `Comment` is a reply to a `CommentThread` (so an answer to the question), or a reply to another `Comment` (a comment about somebody's answer). It used to be the case that `Comment` replies could nest much more deeply, but we later capped it at just these three levels (question, answer, comment) much in the way that StackOverflow does.
+
+`endorsed`
+----------
+  Boolean value, true if a forum moderator or instructor has marked that this `Comment` is a correct answer for whatever question the thread was asking. Exists for `Comments` that are replies to other `Comments`, but in that case `endorsed` is always false because there's no way to endorse such comments through the UI.
+
+`comment_thread_id`
+-------------------
+  What `CommentThread` are we a part of? All `Comment` objects have this.
+
+`parent_id`
+-----------
+  The `parent_id` is the `_id` of the `Comment` that this comment was made in reply to. Note that this only occurs 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` attribute 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's an empty list.
diff --git a/doc/public/internal_data_formats/sql_schema.rst b/doc/public/internal_data_formats/sql_schema.rst
new file mode 100644
index 0000000000..409ec1c065
--- /dev/null
+++ b/doc/public/internal_data_formats/sql_schema.rst
@@ -0,0 +1,627 @@
+##############################
+Student Info and Progress Data
+##############################
+
+The following sections detail how edX stores student state data internally, and is useful for developers and researchers who are examining database exports. This information includes demographic information collected at signup, course enrollment, course progress, and certificate status.
+
+Conventions to keep in mind:
+
+* We currently use MySQL 5.1 with InnoDB tables
+* All strings are stored as UTF-8.
+* All datetimes are stored as UTC.
+* Tables that are built into the Django framework are not documented here unless we use them in unconventional ways.
+
+All of our tables will be described below, first in summary form with field types and constraints, and then with a detailed explanation of each field. For those not familiar with the MySQL schema terminology in the table summaries:
+
+`Type`
+  This is the kind of data it is, along with the size of the field. When a numeric field has a length specified, it just means that's how many digits we want displayed -- it has no affect on the number of bytes used.
+
+  .. list-table::
+     :widths: 10 80
+     :header-rows: 1
+  
+     * - Value
+       - Meaning
+     * - `int`
+       - 4 byte integer.
+     * - `smallint`
+       - 2 byte integer, sometimes used for enumerated values.
+     * - `tinyint`
+       - 1 byte integer, but usually just used to indicate a boolean field with 0 = False and 1 = True.
+     * - `varchar`
+       - String, typically short and indexable. The length is the number of chars, not bytes (so unicode friendly).
+     * - `longtext`
+       - A long block of text, usually not indexed.
+     * - `date`
+       - Date
+     * - `datetime`
+       - Datetime in UTC, precision in seconds.
+  
+`Null`
+
+  .. list-table::
+     :widths: 10 80
+     :header-rows: 1
+  
+     * - Value
+       - Meaning
+     * - `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 used more meaningful for numeric and date fields.
+
+`Key`
+  .. list-table::
+     :widths: 10 80
+     :header-rows: 1
+  
+     * - Value
+       - Meaning
+     * - `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 Information
+****************
+
+`auth_user`
+===========
+
+The `auth_user` table is built into the Django web framework that we use. It holds generic information necessary for basic login and permissions information. It has the following fields::
+
+  +------------------------------+--------------+------+-----+
+  | Field                        | Type         | Null | Key |
+  +------------------------------+--------------+------+-----+
+  | 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   |     | # No longer used
+  | email_key                    | varchar(32)  | YES  |     | # No longer used
+  | avatar_type                  | varchar(1)   | NO   |     | # No longer used
+  | country                      | varchar(2)   | NO   |     | # No longer used
+  | show_country                 | tinyint(1)   | NO   |     | # No longer used
+  | date_of_birth                | date         | YES  |     | # No longer used
+  | interesting_tags             | longtext     | NO   |     | # No longer used
+  | ignored_tags                 | longtext     | NO   |     | # No longer used
+  | email_tag_filter_strategy    | smallint(6)  | NO   |     | # No longer used
+  | display_tag_filter_strategy  | smallint(6)  | NO   |     | # No longer used
+  | consecutive_days_visit_count | int(11)      | NO   |     | # No longer used
+  +------------------------------+--------------+------+-----+
+
+`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 may contain alphanumeric, _, @, +, . and - characters. The username is the only information that the students give about themselves that we currently expose to other students. We have never allowed people to change their usernames so far, but that's not something we guarantee going forward.
+
+`first_name`
+------------
+  .. note::
+     Not used; we store a user's full name in `auth_userprofile.name` instead.
+
+`last_name`
+-----------
+  .. note::
+     Not used; we store a user's full name in `auth_userprofile.name` instead.
+
+`email`
+-------
+  Their email address. While Django by default makes this optional, we make it required, since it's the primary mechanism through which people log in. Must be unique to each user. 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`
+----------
+  This value is `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. People who have `is_staff = 1` get instructor privileges on all courses, along with having additional debug information show up in the instructor tab.
+
+  Note that this designation has no bearing with a user's role in the forums, and confers no elevated privileges there.
+
+  Most users have a `0` for this value.
+
+`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 their account, they are automatically logged in even though they are not active. This is to let them experience the site immediately without having to check their email. They just get a little banner at the top of their dashboard reminding them to check their email and activate their account when they have time. If they log out, they won't be able to log back in again until they've activated. However, because our sessions last a long time, it is theoretically possible for someone to use the site as a student for days without being "active".
+
+  Once `is_active` is set to `1`, the only circumstance where it would be set back to `0` would be if we decide to ban the user (which is very rare, manual operation).
+
+`is_superuser`
+--------------
+  Value is `1` if the user has admin privileges. Only the earliest developers of the system have this set to `1`, and it's no longer really used in the codebase. Set to 0 for almost everybody.
+
+`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 (NOT when it was activated).
+
+`(obsolete fields)`
+-------------------
+  All the following fields were added by an application called Askbot, a discussion forum package that is no longer part of the system:
+
+  * `status`
+  * `email_key`
+  * `avatar_type`
+  * `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 would have any information in these fields. Even with those users, most of this information was never collected. Only the fields that are automatically generated have any values in them, such as tag settings.
+
+  These fields are completely unrelated to the discussion forums we currently use, and will eventually be dropped from this table.
+
+
+`auth_userprofile`
+==================
+The `auth_userprofile` table is mostly used to store user demographic information collected during the signup process. We also use it to store certain additional metadata relating to certificates. Every row in this table corresponds to one row in `auth_user`::
+
+  +--------------------+--------------+------+-----+
+  | Field              | Type         | Null | Key |
+  +--------------------+--------------+------+-----+
+  | id                 | int(11)      | NO   | PRI |
+  | user_id            | int(11)      | NO   | UNI |
+  | name               | varchar(255) | NO   | MUL |
+  | language           | varchar(255) | NO   | MUL | # Prototype course users only
+  | location           | varchar(255) | NO   | MUL | # Prototype course users only
+  | meta               | longtext     | NO   |     |
+  | courseware         | varchar(255) | NO   |     | # No longer used
+  | 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   |     |
+  +--------------------+--------------+------+-----+
+
+There is an important split in demographic data gathered for the students who signed up during the MITx prototype phase in the spring of 2012, and those that signed up afterwards.
+
+`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. We make no constraints on language or breakdown into first/last name. The names are never shown to other students. Foreign students usually enter a romanized version of their names, but not always.
+
+  It used to be our policy to require manual approval of name changes to guard the integrity of the certificates. Students would submit a name change request and someone from the team would approve or reject as appropriate. Later, we decided to allow the name changes to take place automatically, but to log previous names in the `meta` field.
+
+`language`
+----------
+  User's preferred language, asked during the sign up process for the 6.002x prototype course given in the Spring of 2012. This information stopped being collected after the transition from MITx to edX happened, but we never removed the values from our first group of students. Sometimes written in those languages.
+
+`location`
+----------
+  User's location, asked during the sign up process for the 6.002x prototype course given in the Spring of 2012. We weren't specific, so people tended to put the city they were in, though some just specified their country and some got as specific as their street address. Again, sometimes romanized and sometimes written in their native language. Like `language`, we stopped collecting this field when we transitioned from MITx to edX, so it's only available for our first batch of students.
+
+`meta`
+------
+  An optional, freeform text field that stores JSON data. This was a hack to allow us to associate arbitrary metadata with a user. An example of the JSON that can be stored here is::
+
+    {
+      "old_names" : [
+     ["David Ormsbee", "I want to add my middle name as well.", "2012-11-15T17:28:12.658126"],
+     ["Dave Ormsbee", "Dave's too informal for a certificate.", "2013-02-07T11:15:46.524331"]
+      ],
+      "old_emails" : [["dormsbee@mitx.mit.edu", "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."]
+      }
+    }
+
+  The following are details about this metadata. Please note that the fields described below are found as JSON attributes *inside* the `meta` field, and are *not* separate database fields 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 we still record their previous names.
+  
+    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`
+------------
+  This can be ignored. 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`
+--------
+  Dropdown field collected during student signup. We only started collecting this information after the transition from MITx to edX, so prototype course students will have `NULL` for this field.
+
+  .. list-table::
+     :widths: 10 80
+     :header-rows: 1
+  
+     * - Value
+       - Meaning
+     * - `NULL`
+       - This student signed up before this information was collected
+     * - `''` (blank)
+       - User did not specify gender
+     * - `'f'`
+       - Female
+     * - `'m'`
+       - Male
+     * - `'o'`
+       - Other
+
+`mailing_address`
+-----------------
+  Text field collected during student signup. We only started collecting this information after the transition from MITx to edX, so prototype course students will have `NULL` for this field. Students who elected not to enter anything will have a blank string.
+
+`year_of_birth`
+---------------
+  Dropdown field collected during student signup. We only started collecting this information after the transition from MITx to edX, so prototype course students will have `NULL` for this field. Students who decided not to fill this in will also have NULL.
+
+`level_of_education`
+--------------------
+  Dropdown field collected during student signup. We only started collecting this information after the transition from MITx to edX, so prototype course students will have `NULL` for this field.
+
+  .. list-table::
+     :widths: 10 80
+     :header-rows: 1
+  
+     * - Value
+       - Meaning
+     * - `NULL` 
+       - This student signed up before this information was collected
+     * - `''` (blank)
+       - User did not specify level of education.
+     * - `'p_se'`
+       - Doctorate in science or engineering
+     * - `'p_oth'`
+       - Doctorate in another field
+     * - `'m'`
+       - Master's or professional degree
+     * - `'b'`
+       - Bachelor's degree
+     * - `'hs'`
+       - Secondary/high school
+     * - `'jhs'`
+       - Junior secondary/junior high/middle school
+     * - `'el'`
+       - Elementary/primary school
+     * - `'none'`
+       - None
+     * - `'other'`
+       - Other
+     
+`goals`
+-------
+  Text field collected during student signup in response to the prompt, "Goals in signing up for edX". We only started collecting this information after the transition from MITx to edX, so prototype course students will have `NULL` for this field. Students who elected not to enter anything will have a blank string.
+
+`allow_certificate`
+-------------------
+  Set to `1` for most students. This field is set to `0` if log analysis has revealed that this student is accessing our site from a country that the US has an embargo against. At this time, we do not issue certificates to students from those countries.
+
+
+`student_courseenrollment`
+==========================
+A row in this table represents a student's enrollment for a particular course run. If they decide to unenroll in the course, we delete their entry in this table, but we still leave all their state in `courseware_studentmodule` untouched.
+
+`id`
+----
+  Primary key.
+
+`user_id`
+---------
+  Student's ID in `auth_user.id`
+
+`course_id`
+-----------
+  The ID of the course run they're enrolling in (e.g. `MITx/6.002x/2012_Fall`). You can get this from the URL when you're viewing courseware on your browser.
+
+`created`
+---------
+  Datetime of enrollment, UTC.
+
+
+
+*******************
+Courseware Progress
+*******************
+
+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 (e.g. HW=50%, Final=25%, etc.).
+
+.. warning::
+   **Modules might not be what you expect!**
+   
+   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 is up to the implemenation for that particular kind of module. When a user loads page, we look up all the modules they need to render in order to display it, and then we ask the database to look up state for those modules for that user. If there is corresponding entry for that user for a given module, we create a new row and set the state to an empty JSON dictionary.
+
+
+`courseware_studentmodule`
+==========================
+
+The `courseware_studentmodule` table holds all courseware state for a given user. Every student has a separate row for every piece of content in the course, making this by far our largest table::
+
+  +-------------+--------------+------+-----+
+  | Field       | Type         | Null | Key |
+  +-------------+--------------+------+-----+
+  | id          | int(11)      | NO   | PRI |
+  | module_type | varchar(32)  | NO   | MUL |
+  | module_id   | varchar(255) | NO   | MUL |
+  | student_id  | int(11)      | NO   | MUL |
+  | state       | longtext     | YES  |     |
+  | grade       | double       | YES  | MUL | # problem, selfassessment, and combinedopenended use this
+  | created     | datetime     | NO   | MUL |
+  | modified    | datetime     | NO   | MUL |
+  | max_grade   | double       | YES  |     | # problem, selfassessment, and combinedopenended use this
+  | done        | varchar(8)   | NO   | MUL | # ignore this
+  | course_id   | varchar(255) | NO   | MUL |
+  +-------------+--------------+------+-----+
+
+
+`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: 10 80
+     :header-rows: 0
+  
+     * - `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 new module type developed for grading open ended questions via self assessment, peer assessment, and machine learning.
+     * - `conditional`
+       - A new module type recently developed for 8.02x, this 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.
+     * - `problem`
+       - A problem that the user can submit solutions for. We have 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.
+     * - `selfassessment`
+       - Self assessment problems. An early test of the open ended grading system that is not in widespread use yet. Recently deprecated in favor of `combinedopenended`.
+     * - `sequential`
+       - A collection of videos, problems, and other materials, rendered as a horizontal icon bar in the courseware.
+     * - `timelimit`
+       - A special module that records the time you start working on a piece of courseware and enforces time limits, used for Pearson exams. This hasn't been completely generalized yet, so is not available for widespread use.
+     * - `videosequence`
+       - A collection of videos, exercise problems, and other materials, rendered as a horizontal icon bar in the courseware. Use is inconsistent, and some courses use a `sequential` instead.
+
+  There's been substantial muddling of our container types, particularly between sequentials, problemsets, and videosequences. In the beginning we only had sequentials, and these ended up being used primarily for two purposes: creating a sequence of lecture videos and exercises for instruction, and creating homework problem sets. The `problemset` and `videosequence` types were created with the hope that our system would have a better semantic understanding of what a sequence actually represented, and could at a later point choose to render them differently to the user if it was appropriate. Due to a variety of reasons, migration over to this has been spotty. They all render the same way at the moment.
+
+`module_id`
+-----------
+  Unique ID for a distinct piece of content in a course, these are recorded as URLs of the form `i4x://{org}/{course_num}/{module_type}/{module_name}`. Having URLs of this form allows us to give content a canonical representation even as we are in a state of transition between backend data stores.
+
+  .. list-table:: Breakdown of example `module_id`: `i4x://MITx/3.091x/problemset/Sample_Problems`
+     :widths: 10 20 70
+     :header-rows: 1
+     
+     * - Part
+       - Example
+       - Definition
+     * - `i4x://`
+       - 
+       - Just a convention we ran with. We had plans for the domain `i4x.org` at one point.
+     * - `org`
+       - `MITx`
+       - The organization part of the ID, indicating what organization created this piece of content.
+     * - `course_num` 
+       - `3.091x`
+       - The course number this content was created for. Note that there is no run information here, so you can't know what runs of the course this content is being used for from the `module_id` alone; you have to look at the `courseware_studentmodule.course_id` field.
+     * - `module_type` 
+       - `problemset`
+       - The module type, same value as what's in the `courseware_studentmodule.module_type` field.
+     * - `module_name`
+       - `Sample_Problems`
+       - The name given for this module by the content creators. If the module was not named, the system will generate a name based on the type and a hash of its contents (ex: `selfassessment_03c483062389`).
+
+`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.
+
+  Container Modules: `course`, `chapter`, `problemset`, `sequential`, `videosequence`
+    The state for all of these is a JSON dictionary indicating the user's last known position within this container. This is 1-indexed, not 0-indexed, mostly because it went out that way at one point and we didn't want to later break saved navigation state for users.
+
+    Example: `{"position" : 3}`
+      When this user last interacted with this course/chapter/etc., they had 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 goes: `course > chapter > (problemset | sequential | videosequence)`
+
+  `combinedopenended`
+    TODO: More details to come.
+
+  `conditional`
+    Conditionals don't actually store any state, so this value is always an empty JSON dictionary (`'{}'`). We should probably remove these entries altogether.
+
+  `problem`
+    There are many kinds of problems supported by the system, and they all have different state requirements. Note that one 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`.
+
+    TODO: Write out different problem types and their state.
+
+  `selfassessment`
+    TODO: More details to come.
+
+  `timelimit`
+    This very uncommon type was only used in one Pearson exam for one course, and the format may change significantly in the future. It is currently a JSON dictionary with fields:
+
+    .. list-table::
+       :widths: 10 20 70
+       :header-rows: 1
+
+       * - JSON field
+         - Example
+         - Definition
+       * - `beginning_at`
+         - `1360590255.488154`
+         - UTC time as measured in seconds since UNIX epoch representing when the exam was started.
+       * - `ending_at`
+         - `1360596632.559758`
+         - UTC time as measured in seconds since UNIX epoch representing the time the exam will close.
+       * - `accomodation_codes`
+         - `DOUBLE`
+         - (optional) Sometimes students are given more time for accessibility reasons. Possible values are:
+         
+           * `NONE`: no time accommodation
+           * `ADDHALFTIME`: 1.5X normal time allowance
+           * `ADD30MIN`: normal time allowance + 30 minutes
+           * `DOUBLE`: 2X normal time allowance
+           * `TESTING`: extra long period (for testing/debugging)
+
+
+`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 field. 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 will trigger two writes, the first of which will set the `grade` to `NULL`, and the second of which will set it to `0`.
+
+`created`
+---------
+  Datetime when this row was created (i.e. when the student first accessed this piece of content).
+
+`modified`
+----------
+  Datetime when we last updated this row. 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. The problems are dynamic enough where you could create a random number of responses if you wanted. This a bad idea and will probably cause grading errors, but it is possible.
+
+  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`.
+
+  These complexities in our grading system are a high priority target for refactoring in the near future.
+
+  Only `problem` and `selfassessment` types use this field. All other modules set this to `NULL`.
+
+`done`
+------
+  Ignore this field. It was supposed to be an indication whether something was finished, but was never properly used and is just `'na'` in every row.
+
+`course_id`
+-----------
+  The course that this row applies to, represented in the form org/course/run (ex: `MITx/6.002x/2012_Fall`). The same course content (same `module_id`) can be used in different courses, and a student's state needs to be tracked separately for each course.
+
+
+
+************
+Certificates
+************
+
+`certificates_generatedcertificate`
+===================================
+
+The generatedcertificate table tracks certificate state for students who have been graded after a course completes. Currently the table is only populated when a course ends and a script is run to grade students who have completed the course::
+
+  +---------------+--------------+------+-----+---------+----------------+
+  | 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    |                |
+  +---------------+--------------+------+-----+---------+----------------+
+
+
+`user_id`, `course_id`
+----------------------
+  The table is indexed by user and course
+
+`status`
+--------
+  Status may be one of these states:
+
+  * `unavailable`
+  * `generating`
+  * `regenerating`
+  * `deleting`
+  * `deleted`
+  * `downloadable`
+  * `notpassing`
+  * `restricted`
+  * `error`
+  
+  After a course has been graded and certificates have been issued status will be one of:
+  
+  * `downloadable`
+  * `notpassing`
+  * `restricted`
+  
+  If the status is `downloadable` then the student passed the course and there will be a certificate available for download.
+
+`download_url`
+--------------
+  The `download_uuid` has the full URL to the certificate
+
+`download_uuid`, `verify_uuid`
+------------------------------
+  The two uuids are what uniquely identify the download url and the url used to download the certificate.
+
+`distinction`
+-------------
+  This was used for letters of distinction for 188.1x and is not being used for any current courses
+
+`name`
+------
+  This field records the name of the student that was set at the time the student was graded and the certificate was generated.
+
+`grade`
+-------
+  The grade of the student recorded at the time the certificate was generated. This may be different than the current grade since grading is only done once for a course when it ends.
\ No newline at end of file
diff --git a/doc/public/internal_data_formats/tracking_logs.rst b/doc/public/internal_data_formats/tracking_logs.rst
new file mode 100644
index 0000000000..04326497d7
--- /dev/null
+++ b/doc/public/internal_data_formats/tracking_logs.rst
@@ -0,0 +1,389 @@
+#############
+Tracking Logs
+#############
+
+* Tracking logs are made available as separate tar files on S3 in the course-data bucket.
+* They are represented as JSON files that catalog all user interactions with the site.
+* To avoid filename collisions the tracking logs are organized by server name, where each directory corresponds to a server where they were stored. 
+
+*************
+Common Fields
+*************
+
+  .. list-table::
+     :widths: 10 40 10 25
+     :header-rows: 1
+     
+     * - field
+       - details
+       - type
+       - values/format
+     * - `username`
+       - username of the user who triggered the event, empty string for anonymous events (not logged in)
+       - string
+       - 
+     * - `session`
+       - key identifying the user's session, may be undefined
+       - string
+       - 32 digits key
+     * - `time`
+       - GMT time the event was triggered
+       - string	
+       - `YYYY-MM-DDThh:mm:ss.xxxxxx`
+     * - `ip`
+       - user ip address
+       - string
+       - 
+     * - `agent`
+       - users browser agent string
+       - string
+       - 
+     * - `page`
+       - page the user was visiting when the event was generated
+       - string
+       - `$URL`
+     * - event_source
+       - event source
+       - string
+       - `browser`, `server`
+     * - `event_type`
+       - type of event triggered, values depends on `event_source`
+       - string
+       - *more details listed below*
+     * - `event`
+       - specifics of the event (dependenty of the event_type)
+       - string/json
+       - *the event string may encode a JSON record*
+       
+
+*************
+Event Sources
+*************
+
+The `event_source` field identifies whether the event originated in the browser (via javascript) or on the server (during the processing of a request).
+
+Server Events
+=============
+
+  .. list-table::
+     :widths: 20 10 10 10 50
+     :header-rows: 1
+  
+     * - event_type
+       - event fields
+       - type
+       - values/format
+       - details
+     * - `show_answer`
+       - `problem_id`
+       - string
+       - 
+       - id of the problem being shown. Ex: `i4x://MITx/6.00x/problem/L15:L15_Problem_2`
+     * - `save_problem_check`
+       - `problem_id`
+       - string
+       - 
+       - id of the problem being shown
+     * -
+       - `success`
+       - string
+       - correct, incorrect
+       - whether the problem was correct
+     * -  	
+       - `attempts`
+       - integer
+       - number of attempts
+       -
+     * - 
+       - `correct_map`
+       - string/json
+       - 
+       - see details below
+     * - 
+       - `state`
+       - string/json
+       - 
+       - current problem state
+     * - 
+       - `answers`
+       - string/json
+       -
+       - students answers
+     * -
+       - `reset_problem`
+       - problem_id
+       - string
+       - id of the problem being shown
+
+
+`correct_map` details
+---------------------
+
+  .. list-table::
+     :widths: 15 10 15 10
+     :header-rows: 1
+    
+     * - correct_map fields
+       - type
+       - values/format
+       - null allowed?
+     * - hint
+       - string
+       -
+       -
+     * - hintmode
+       - boolean
+       -
+       - yes
+     * - correctness
+       - string
+       - correct, incorrect
+       -
+     * - npoints
+       - integer
+       -
+       - yes
+     * - msg
+       - string
+       -
+       -
+     * - queuestate
+       - string/json
+       - keys: key, time
+       -
+
+
+Browser Events
+==============
+
+  .. list-table::
+     :widths: 10 10 8 12 20 10
+     :header-rows: 1
+  
+     * - event_type
+       - fields
+       - type
+       - values/format
+       - details
+       - example
+     * - `book`
+       - `type`
+       - string
+       - `gotopage`	
+       -
+       -
+     * - 
+       - `old`
+       - integer	
+       - `$PAGE`
+       - from page number
+       - `2`
+     * -
+       - `new`
+       - integer
+       - `$PAGE`
+       - to page number
+       - `25`
+     * - `book`
+       - `type`
+       - string
+       - `nextpage`
+       -
+       -
+     * - 
+       - new
+       - integer
+       - `$PAGE`
+       - next page number
+       - `10`
+     * - `page_close`
+       - *empty*
+       - string
+       -
+       - 'page' field indicates which page was being closed
+       -
+     * - play_video
+       - `id`
+       - string
+       -
+       - edX id of the video being watched
+       - `i4x-HarvardX-PH207x-video-Simple_Random_Sample`
+     * -
+       - code
+       - string
+       -
+       - youtube id of the video being watched
+       - `FU3fCJNs94Y`
+     * -
+       - `currentTime`
+       - float
+       -
+       - time the video was paused at, in seconds
+       - `1.264`
+     * -
+       - `speed`
+       - string
+       - `0.75, 1.0, 1.25, 1.50`
+       - video speed being played
+       - `"1.0"`
+     * - `pause_video`
+       - `id`
+       - string
+       -
+       - edX id of the video being watched
+       -
+     * -
+       - `code`
+       - string
+       -
+       - youtube id of the video being watched
+       -
+     * -
+       - `currentTime`
+       - float
+       -
+       - time the video was paused at
+       -
+     * - 
+       - `speed`
+       - string
+       - `0.75, 1.0, 1.25, 1.50`
+       - video speed being played
+       -
+     * - `problem_check`
+       - *none*
+       - string
+       -
+       - event field contains the values of all input fields from the problem being checked (in the style of GET parameters (`key=value&key=value`))
+       -
+     * - `problem_show`
+       - `problem`
+       - string
+       - 
+       - id of the problem being checked
+       -
+     * - `seq_goto`
+       - `id`
+       - string
+       -
+       - edX id of the sequence
+       -
+     * -	
+       - `old`
+       - integer
+       -
+       - sequence element being jumped from
+       - `3`
+     * -
+       - `new`
+       - integer
+       -
+       - sequence element being jumped to
+       - `5`
+     * - `seq_next`
+       - `id`
+       - string
+       -
+       - edX id of the sequence	
+       -
+     * -	
+       - `old`
+       - integer
+       -
+       - sequence element being jumped from
+       - `4`
+     * -
+       - `new`
+       - integer
+       -
+       - sequence element being jumped to
+       - `6`
+     * - `rubric_select`
+       - `location`
+       - string
+       -
+       - location of the rubric's problem
+       - `i4x://MITx/6.00x/problem/L15:L15_Problem_2`
+     * -
+       - `category`
+       - integer
+       - 
+       - category number of the rubric selection
+       -
+     * -
+       - `value`
+       - integer
+       -
+       - value selected within the category
+       -
+     * - `(oe / peer_grading / staff_grading)`
+         `_show_problem`
+       - `location`
+       - string
+       -
+       - the location of the problem whose prompt we're showing
+       -
+     * - `(oe / peer_grading / staff_grading)`
+         `_hide_problem`
+       - `location`
+       - string
+       - 
+       - the location of the problem whose prompt we're hiding
+       -
+     * - `oe_show_full_feedback`
+       - *empty*
+       -
+       -
+       - the page where they're showing full feedback is already recorded
+       -
+     * - `oe_show_respond_to_feedback`
+       - *empty*
+       -
+       -
+       - the page where they're showing the feedback response form is already recorded
+       -
+     * - `oe_feedback_response_selected`
+       - `value`
+       - integer
+       -
+       - the value selected in the feedback response form
+       -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/xml-format.md b/doc/xml-format.md
deleted file mode 100644
index c59db690a1..0000000000
--- a/doc/xml-format.md
+++ /dev/null
@@ -1,480 +0,0 @@
-# edX xml format tutorial
-
-## Goals of this document
-
-*	This was written assuming the reader has no prior programming/CS knowledge and has jumped cold turkey into the edX platform.
-*	To educate the reader on how to build and maintain the back end structure of the course content. This is important for debugging and standardization.
-*	After reading this, you should be able to add content to a course and make sure it shows up in the courseware and does not break the code.
-* __Prerequisites:__ it would be helpful to know a little bit about xml.  Here is a [simple example](http://www.ultraslavonic.info/intro-to-xml/) if you've never seen it before.
-
-## Outline
-
-*	First, we will show a sample course structure as a case study/model of how xml and files in a course are organized to introductory understanding.
-
-*	More technical details are below, including discussion of some special cases.
-
-
-## Introduction
-
-*	The course is organized hierarchically.  We start by describing course-wide parameters, then break the course into chapters, and then go deeper and deeper until we reach a specific pset, video, etc.
-
-*	You could make an analogy to finding a green shirt in your house - front door -> bedroom -> closet -> drawer -> shirts -> green shirt
-
-
-## Case Study
-
-Let's jump right in by looking at the directory structure of a very simple toy course:
-
-    toy/
-        course
-        course.xml
-        problem
-        policies
-        roots
-
-The only top level file is `course.xml`, which should contain one line, looking something like this:
-
-    <course org="edX" course="toy" url_name="2012_Fall"/>
-
-This gives all the information to uniquely identify a particular run of any course--which organization is producing the course, what the course name is, and what "run" this is, specified via the `url_name` attribute.
-
-Obviously, this doesn't actually specify any of the course content, so we need to find that next.  To know where to look, you need to know the standard organizational structure of our system: _course elements are uniquely identified by the combination `(category, url_name)`_.  In this case, we are looking for a `course` element with the `url_name` "2012_Fall".  The definition of this element will be in `course/2012_Fall.xml`.  Let's look there next:
-
-`course/2012_Fall.xml`
-
-    <course>
-      <chapter url_name="Overview">
-        <videosequence url_name="Toy_Videos">
-          <problem url_name="warmup"/>
-          <video url_name="Video_Resources" youtube="1.0:1bK-WdDi6Qw"/>
-        </videosequence>
-        <video url_name="Welcome" youtube="1.0:p2Q6BrNhdh8"/>
-      </chapter>
-    </course>
-
-Aha.  Now we found some content.  We can see that the course is organized hierarchically, in this case with only one chapter, with `url_name` "Overview".   The chapter contains a `videosequence` and a `video`, with the sequence containing a problem and another video.  When viewed in the courseware, chapters are shown at the top level of the navigation accordion on the left, with any elements directly included in the chapter below.
-
-Looking at this file, we can see the course structure, and the youtube urls for the videos, but what about the "warmup" problem?  There is no problem content here!    Where should we look?  This is a good time to pause and try to answer that question based on our organizational structure above.
-
-As you hopefully guessed, the problem would be in `problem/warmup.xml`.  (Note: This tutorial doesn't discuss the xml format for problems--there are chapters of edx4edx that describe it.)  This is an instance of a _pointer tag:_ any xml tag with only the category and a url_name attribute will point to the file `{category}/{url_name}.xml`.  For example, this means that our toy `course.xml` could have also been written as
-
-`course/2012_Fall.xml`
-
-    <course>
-      <chapter url_name="Overview"/>
-    </course>
-
-with `chapter/Overview.xml` containing
-
-    <chapter>
-        <videosequence url_name="Toy_Videos">
-          <problem url_name="warmup"/>
-          <video url_name="Video_Resources" youtube="1.0:1bK-WdDi6Qw"/>
-        </videosequence>
-        <video url_name="Welcome" youtube="1.0:p2Q6BrNhdh8"/>
-    </chapter>
-
-In fact, this is the recommended structure for real courses--putting each chapter into its own file makes it easy to have different people work on each without conflicting or having to merge.  Similarly, as sequences get large, it can be handy to split them out as well (in `sequence/{url_name}.xml`, of course).
-
-Note that the `url_name` is only specified once per element--either the inline definition, or in the pointer tag.
-
-## Policy files
-
-We still haven't looked at two of the directoies in the top-level listing above: `policies` and `roots`.  Let's look at policies next.  The policy directory contains one file:
-
-    policies:
-        2012_Fall.json
-
-and that file is named {course-url_name}.json.  As you might expect, this file contains a policy for the course.  In our example, it looks like this:
-
-    2012_Fall.json:
-    {
-        "course/2012_Fall": {
-            "graceperiod": "2 days 5 hours 59 minutes 59 seconds",
-            "start": "2015-07-17T12:00",
-            "display_name": "Toy Course"
-        },
-        "chapter/Overview": {
-            "display_name": "Overview"
-        },
-        "videosequence/Toy_Videos": {
-            "display_name": "Toy Videos",
-            "format": "Lecture Sequence"
-        },
-        "problem/warmup": {
-            "display_name": "Getting ready for the semester"
-        },
-        "video/Video_Resources": {
-            "display_name": "Video Resources"
-        },
-        "video/Welcome": {
-            "display_name": "Welcome"
-        }
-    }
-
-The policy specifies metadata about the content elements--things which are not inherent to the definition of the content, but which describe how the content is presented to the user and used in the course.  See below for a full list of metadata attributes; as the example shows, they include `display_name`, which is what is shown when this piece of content is referenced or shown in the courseware, and various dates and times, like `start`, which specifies when the content becomes visible to students, and various problem-specific parameters like the allowed number of attempts.  One important point is that some metadata is inherited: for example, specifying the start date on the course makes it the default for every element in the course.  See below for more details.
-
-It is possible to put metadata directly in the xml, as attributes of the appropriate tag, but using a policy file has two benefits: it puts all the policy in one place, making it easier to check that things like due dates are set properly, and it allows the content definitions to be easily used in another run of the same course, with the same or similar content, but different policy.
-
-## Roots
-
-The last directory in the top level listing is `roots`.  In our toy course, it contains a single file:
-
-    roots/
-        2012_Fall.xml
-
-This file is identical to the top-level `course.xml`, containing
-
-    <course org="edX" course="toy" url_name="2012_Fall"/>
-
-In fact, the top level `course.xml` is a symbolic link to this file.  When there is only one run of a course, the roots directory is not really necessary, and the top-level course.xml file can just specify the `url_name` of the course.  However, if we wanted to make a second run of our toy course, we could add another file called, e.g., `roots/2013_Spring.xml`, containing
-
-    <course org="edX" course="toy" url_name="2013_Spring"/>
-
-After creating `course/2013_Spring.xml` with the course structure (possibly as a symbolic link or copy of `course/2012_Fall.xml` if no content was changing), and `policies/2013_Spring.json`, we would have two different runs of the toy course in the course repository.  Our build system understands this roots structure, and will build a course package for each root.  (Dev note: if you're using a local development environment, make the top level `course.xml` point to the desired root, and check out the repo multiple times if you need multiple runs simultaneously).
-
-That's basically all there is to the organizational structure.  Read the next section for details on the tags we support, including some special case tags like `customtag` and `html` invariants, and look at the end for some tips that will make the editing process easier.
-
-----------
-
-# Tag types
-
-* `abtest` -- Support for A/B testing.  TODO: add details..
-* `chapter` -- top level organization unit of a course.   The courseware display code currently expects the top level `course` element to contain only chapters, though there is no philosophical reason why this is required, so we may change it to properly display non-chapters at the top level.
-* `conditional` -- conditional element, which shows one or more modules only if certain conditions are satisfied.
-* `course` -- top level tag.  Contains everything else.
-* `customtag` -- render an html template, filling in some parameters, and return the resulting html.  See below for details.
-* `discussion` -- Inline discussion forum
-* `html` -- a reference to an html file.
-* `error`  -- don't put these in by hand :)   The internal representation of content that has an error, such as malformed xml or some broken invariant.  You may see this in the xml once the CMS is in use...
-* `problem` -- a problem.  See elsewhere in edx4edx for documentation on the format.
-* `problemset` -- logically, a series of related problems.  Currently displayed vertically.  May contain explanatory html, videos, etc.
-* `sequential` -- a sequence of content, currently displayed with a horizontal list of tabs.  If possible, use a more semantically meaningful tag (currently, we only have `videosequence`).
-* `vertical` -- a sequence of content, displayed vertically.  Content will be accessed all at once, on the right part of the page. No navigational bar. May have to use browser scroll bars. Content split with separators.   If possible, use a more semantically meaningful tag (currently, we only have `problemset`).
-* `video`  -- a link to a video, currently expected to be hosted on youtube.
-* `videosequence` -- a sequence of videos.  This can contain various non-video content; it just signals to the system that this is logically part of an explanatory sequence of content, as opposed to say an exam sequence.
-
-## Tag details
-
-### Container tags
-
-Container tags include `chapter`, `sequential`, `videosequence`, `vertical`, and `problemset`.  They are all specified in the same way in the xml, as shown in the tutorial above.
-
-### `course`
-
-`course` is also a container, and is similar, with one extra wrinkle: the top level pointer tag _must_ have  `org` and `course` attributes specified--the organization name, and course name.  Note that `course` is referring to the platonic ideal of this course (e.g. "6.002x"), not to any particular run of this course.  The `url_name` should be the particular run of this course.
-
-### `conditional`
-
-`conditional` is as special kind of container tag as well.  Here are two examples:
-
-        <conditional condition="require_completed" required="problem/choiceprob">
-            <video url_name="secret_video" />
-        </conditional>
-
-        <conditional condition="require_attempted" required="problem/choiceprob&problem/sumprob">
-            <html url_name="secret_page" />
-        </conditional>
-
-The condition can be either `require_completed`, in which case the required modules must be completed, or `require_attempted`, in which case the required modules must have been attempted.
-
-The required modules are specified as a set of `tag`/`url_name`, joined by an ampersand.
-
-### `customtag`
-
-When we see `<customtag impl="special" animal="unicorn" hat="blue"/>`, we will:
-
-* look for a file called `custom_tags/special`  in your course dir.
-* render it as a mako template, passing parameters {'animal':'unicorn', 'hat':'blue'}, generating html.  (Google `mako` for template syntax, or look at existing examples).
-
-Since `customtag` is already a pointer, there is generally no need to put it into a separate file--just use it in place: <customtag url_name="my_custom_tag" impl="blah" attr1="..."/>
-
-### `discussion`
-
-The discussion tag embeds an inline discussion module. The XML format is:
-```
-<discussion for="Course overview" id="6002x_Fall_2012_Overview" discussion_category="Week 1 / Overview" />
-``` 
-The meaning of each attribute is as follows:
-* `for`: A string that describes the discussion. Purely for descriptive purposes (to the student).
-* `id`: The identifier that the discussion forum service uses to refer to this inline discussion module. Since the `id` must be unique and lives in a common namespace with all other courses, the preferred convention is to use `<course_name>_<course_run>_<descriptor>` as in the above example. The `id` should be "machine-friendly", e.g. use alphanumeric characters, underscores. Do **not** use a period (e.g. `6.002x_Fall_2012_Overview`).
-* `discussion_category`: The inline module will be indexed in the main "Discussion" tab of the course. The inline discussions are organized into a directory-like hierarchy. Note that the forward slash indicates depth, as in conventional filesytems. In the above example, this discussion module will show up in the following "directory":
-```
-Week 1 / Overview / Course overview
-```
-
-Further discussion on `discussion_category`:
-Note that the `for` tag has been appended to the end of the `discussion_category`. This can often lead into deeply nested subforums, which may not be intended. In the above example, if we were to use instead:
-
-```
-<discussion for="Course overview" id="6002x_Fall_2012_Overview" discussion_category="Week 1" />
-``` 
-
-this discussion module would show up in the main forums as:
-```
-Week 1 / Course overview
-```
-
-which is more succinct.
-
-### `html`
-
-Most of our content is in xml, but some html content may not be proper xml (all tags matched, single top-level tag, etc), since browsers are fairly lenient in what they'll display.  So, there are two ways to include html content:
-
-* If your html content is in a proper xml format, just put it in `html/{url_name}.xml`.
-* If your html content is not in proper xml format, you can put it in `html/{filename}.html`, and put `<html filename={filename} />` in `html/{filename}.xml`.  This allows another level of indirection, and makes sure that we can read the xml file and then just return the actual html content without trying to parse it.
-
-### `video`
-
-Videos have an attribute youtube, which specifies a series of speeds + youtube videos id:
-
-    <video youtube="0.75:1yk1A8-FPbw,1.0:vNMrbPvwhU4,1.25:gBW_wqe7rDc,1.50:7AE_TKgaBwA" url_name="S15V14_Response_to_impulse_limit_case"/>
-
-This video has been encoded at 4 different speeds: 0.75x, 1x, 1.25x, and 1.5x.
-
-## More on `url_name`s
-
-Every content element (within a course) should have a unique id.  This id is formed as `{category}/{url_name}`, or automatically generated from the content if `url_name` is not specified.  Categories are the different tag types ('chapter', 'problem', 'html', 'sequential', etc).  Url_name is a string containing a-z, A-Z, dot (.), underscore (_), and ':'.  This is what appears in urls that point to this object.
-
-Colon (':') is special--when looking for the content definition in an xml, ':' will be replaced with '/'.  This allows organizing content into folders.  For example, given the pointer tag
-
-    <problem url_name="conceptual:add_apples_and_oranges"/>
-
-we would look for the problem definition in `problem/conceptual/add_apples_and_oranges.xml`.   (There is a technical reason why we can't just allow '/' in the url_name directly.)
-
-__IMPORTANT__: A student's state for a particular content element is tied to the element id, so the automatic id generation if only ok for elements that do not need to store any student state (e.g. verticals or customtags).  For problems, sequentials, and videos, and any other element where we keep track of what the student has done and where they are at, you should specify a unique `url_name`.  Of course, any content element that is split out into a file will need a `url_name` to specify where to find the definition.  When the CMS comes online, it will use these ids to enable content reuse, so if there is a logical name for something, please do specify it.
-
------
-
-## Policy files
-
-*	A policy file is useful when running different versions of a course e.g. internal, external, fall, spring, etc. as you can change due dates, etc, by creating multiple policy files.
-*	A policy file provides information on the metadata of the course--things that are not inherent to the definitions of the contents, but that may vary from run to run.
-* Note: We will be expanding our understanding and format for metadata in the not-too-distant future, but for now it is simply a set of key-value pairs.
-
-### Policy file location
-* The policy for a course run `some_url_name` should live in `policies/some_url_name/policy.json`  (NOTE: the old format of putting it in `policies/some_url_name.json` will also work, but we suggest using the subdirectory to have all the per-course policy files in one place)
-* Grading policy files go in `policies/some_url_name/grading_policy.json`   (if there's only one course run, can also put it directly in the course root: `/grading_policy.json`)
-
-### Policy file contents
-* The file format is "json", and is best shown by example, as in the tutorial above (though also feel free to google :)
-* The expected contents are a dictionary mapping from keys to values (syntax "{ key : value, key2 : value2, etc}")
-* Keys are in the form "{category}/{url_name}", which should uniquely identify a content element.
-Values are dictionaries of the form {"metadata-key" : "metadata-value"}.
-* The order in which things appear does not matter, though it may be helpful to organize the file in the same order as things appear in the content.
-* NOTE: json is picky about commas.  If you have trailing commas before closing braces, it will complain and refuse to parse the file.  This can be irritating at first.
-
-Supported fields at the course level:
-
-* "start" -- specify the start date for the course.  Format-by-example: "2012-09-05T12:00".
-* "advertised_start" -- specify what you want displayed as the start date of the course in the course listing and course about pages. This can be useful if you want to let people in early before the formal start. Format-by-example: "2012-09-05T12:00".
-* "disable_policy_graph" -- set to true (or "Yes"), if the policy graph should be disabled (ie not shown).
-* "enrollment_start", "enrollment_end" -- when can students enroll?  (if not specified, can enroll anytime).   Same format as "start".
-* "end" -- specify the end date for the course.  Format-by-example: "2012-11-05T12:00".
-* "end_of_course_survey_url" -- a url for an end of course survey -- shown after course is over, next to certificate download links.
-* "tabs" -- have custom tabs in the courseware.  See below for details on config.
-* "discussion_blackouts" -- An array of time intervals during which you want to disable a student's ability to create or edit posts in the forum. Moderators, Community TAs, and Admins are unaffected. You might use this during exam periods, but please be aware that the forum is often a very good place to catch mistakes and clarify points to students. The better long term solution would be to have better flagging/moderation mechanisms, but this is the hammer we have today. Format by example: [["2012-10-29T04:00", "2012-11-03T04:00"], ["2012-12-30T04:00", "2013-01-02T04:00"]]
-* "show_calculator" (value "Yes" if desired)
-* "days_early_for_beta" -- number of days (floating point ok) early that students in the beta-testers group get to see course content.  Can also be specified for any other course element, and overrides values set at higher levels.
-* "cohort_config" : dictionary with keys 
-    - "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 with an optional 'cohorted': bool parameter (with default value false).  
-    - "cohorted_discussions": list of discussions that should be cohorted.  
-    - ... more to come.  ('auto_cohort', how to auto cohort, etc)
-
-* TODO: there are others
-
-### Grading policy file contents
-
-TODO: This needs to be improved, but for now here's a sketch of how grading works:
-
-
-* First we grade on individual problems. Correct and total are methods on CapaProblem.
-
-    `problem_score = (correct ,  total)`
-
-* If a problem weight is in the xml, then re-weight the problem to be worth that many points
-
-    `if problem_weight:`
-         `problem_score = (correct * weight / total, weight)`
-
-* Now sum up all of problems in a section to get the percent for that section
-
-    `section_percent = \sum_problems_correct /   \sum_problems_total`
-
-* Now we have all of the percents for all of the graded sections. This is the gradesheet that we pass to to a subclass of CourseGrader.
-
-* A WeightedSubsectionsGrader contains several SingleSectionGraders and AssignmentFormatGraders. Each of those graders is run first before WeightedSubsectionsGrader computes the final grade.
-
-    - SingleSectionGrader (within a WeightedSubsectionsGrader) contains one section
-
-    `grader_percent = section_percent`
-
-    - AssignmentFormatGrader (within a WegithedSubsectionsGrader) contains multiple sections matching a certain format
-drop the lowest X sections
-
-    `grader_percent = \sum_section_percent  /  \count_section`
-
-    - WeightedSubsectionsGrader
-
-    `final_grade_percent = \sum_(grader_percent * grader_weight)`
-
-* Round the final grade up to the nearest percentage point
-
-    `final_grade_percent = round(final_grade_percent * 100 + 0.05) / 100`
-
-### Available metadata
-
-__Not inherited:__
-
-* `display_name` - name that will appear when this content is displayed in the courseware.  Useful for all tag types.
-*	`format` - subheading under display name -- currently only displayed for chapter sub-sections.  Also used by the the grader to know how to process students assessments that the
-    section contains. New formats can be defined as a 'type' in the GRADER variable in course_settings.json. Optional.  (TODO: double check this--what's the current behavior?)
-* `hide_from_toc` -- If set to true for a chapter or chapter subsection, will hide that element from the courseware navigation accordion.  This is useful if you'd like to link to the content directly instead (e.g. for tutorials)
-* `ispublic` -- specify whether the course is public.  You should be able to use start dates instead (?)
-
-__Inherited:__
-
-* `start` -- when this content should be shown to students.  Note that anyone with staff access to the course will always see everything.
-*	`showanswer` - When to show answer. For 'attempted', will show answer after first attempt. Values: never, attempted, answered, closed. Default: closed. Optional.
-*	`graded` - Whether this section will count towards the students grade. "true" or "false". Defaults to "false".
-*	`rerandomize` - Randomize question on each attempt. Values: 'always' (students see a different version of the problem after each attempt to solve it)
-                                                            'onreset' (randomize question when reset button is pressed by the student)
-                                                            'never' (all students see the same version of the problem)
-                                                            'per_student' (individual students see the same version of the problem each time the look at it, but that version is different from what other students see)
-                                                            Default: 'always'. Optional.
-*	`due` - Due date for assignment. Assignment will be closed after that.  Values: valid date. Default: none. Optional.
-* attempts: Number of allowed attempts. Values: integer. Default: infinite. Optional.
-* `graceperiod` - A default length of time that the problem is still accessible after the due date in the format "2 days 3 hours" or "1 day 15 minutes".  Note, graceperiods are currently the easiest way to handle time zones. Due dates are all expressed in UCT.
-* `xqa_key` -- for integration with Ike's content QA server. -- should typically be specified at the course level.
-
-__Inheritance example:__
-
-This is a sketch ("tue" is not a valid start date), that should help illustrate how metadata inheritance works.
-
-    <course start="tue">
-      <chap1> -- start tue
-        <problem>   --- start tue
-      </chap1>
-      <chap2 start="wed">  -- start wed
-       <problem2 start="thu">  -- start thu
-       <problem3>      -- start wed
-      </chap2>
-    </course>
-
-
-## Specifying metadata in the xml file
-
-Metadata can also live in the xml files, but anything defined in the policy file overrides anything in the xml.  This is primarily for backwards compatibility, and you should probably  not use both.  If you do leave some metadata tags in the xml, you should be consistent (e.g. if `display_name`s stay in xml, they should all stay in xml. Note `display_name` should be specified in the problem xml definition itself, ie, <problem display_name="Title"> Problem Text </problem>, in file ProblemFoo.xml).
-   - note, some xml attributes are not metadata.  e.g. in `<video youtube="xyz987293487293847"/>`, the `youtube` attribute specifies what video this is, and is logically part of the content, not the policy, so it should stay in the xml.
-
-Another example policy file:
-
-    {
-        "course/2012": {
-            "graceperiod": "1 day",
-            "start": "2012-10-15T12:00",
-            "display_name": "Introduction to Computer Science I",
-            "xqa_key": "z1y4vdYcy0izkoPeihtPClDxmbY1ogDK"
-        },
-        "chapter/Week_0": {
-            "display_name": "Week 0"
-        },
-        "sequential/Pre-Course_Survey": {
-            "display_name": "Pre-Course Survey",
-            "format": "Survey"
-        }
-    }
-
-
-
-## Deprecated formats
-
-If you look at some older xml, you may see some tags or metadata attributes that aren't listed above.  They are deprecated, and should not be used in new content.  We include them here so that you can understand how old-format content works.
-
-### Obsolete tags:
-
-* `section` : this used to be necessary within chapters.  Now, you can just use any standard tag inside a chapter, so use the container tag that makes the most sense for grouping content--e.g. `problemset`, `videosequence`, and just include content directly if it belongs inside a chapter (e.g. `html`, `video`, `problem`)
-
-* There used to be special purpose tags that all basically did the same thing, and have been subsumed by `customtag`.  The list is `videodev, book, slides, image, discuss`.  Use `customtag` in new content.  (e.g. instead of `<book page="12"/>`, use `<customtag impl="book" page="12"/>`)
-
-### Obsolete attributes
-
-* `slug` -- old term for `url_name`.  Use `url_name`
-* `name` -- we didn't originally have a distinction between `url_name` and `display_name` -- this made content element ids fragile, so please use `url_name` as a stable unique identifier for the content, and `display_name` as the particular string you'd like to display for it.
-
-
-# Static links
-
-If your content links (e.g. in an html file)  to `"static/blah/ponies.jpg"`, we will look for this...
-
-* If your course dir has a `static/` subdirectory, we will look in `YOUR_COURSE_DIR/static/blah/ponies.jpg`.   This is the prefered organization, as it does not expose anything except what's in `static/` to the world.
-*  If your course dir does not have a `static/` subdirectory, we will look in `YOUR_COURSE_DIR/blah/ponies.jpg`.  This is the old organization, and requires that the web server allow access to everything in the couse dir.  To switch to the new organization, move all your static content into a new `static/` dir  (e.g. if you currently have things in `images/`, `css/`, and `special/`, create a dir called `static/`, and move `images/, css/, and special/` there).
-
-Links that include `/course` will be rewritten to the root of your course in the courseware (e.g. `courses/{org}/{course}/{url_name}/` in the current url structure).  This is useful for linking to the course wiki, for example.
-
-# Tabs
-
-If you want to customize the courseware tabs displayed for your course, specify a "tabs" list in the course-level policy.  e.g.:
-
-    "tabs" : [
-        {"type": "courseware"},       # no name--always "Courseware" for consistency between courses
-        {"type": "course_info", "name": "Course Info"},
-        {"type": "external_link", "name": "My Discussion", "link": "http://www.mydiscussion.org/blah"},
-        {"type": "progress", "name": "Progress"},
-        {"type": "wiki", "name": "Wonderwiki"},
-        {"type": "static_tab", "url_slug": "news", "name": "Exciting news"},
-        {"type": "textbooks"}        # generates one tab per textbook, taking names from the textbook titles
-    ]
-
-
-* If you specify any tabs, you must specify all tabs.  They will appear in the order given.
-* The first two tabs must have types `"courseware"` and `"course_info"`, in that order.  Otherwise, we'll refuse to load the course.
-* for static tabs, the url_slug will be the url that points to the tab.  It can not be one of the existing courseware url types (even if those aren't used in your course).  The static content will come from `tabs/{course_url_name}/{url_slug}.html`, or `tabs/{url_slug}.html` if that doesn't exist.
-
-* An Instructor tab will be automatically added at the end for course staff users.
-
-## Supported tab types:
-
-* "courseware".  No other parameters.
-* "course_info".  Parameter "name".
-* "wiki". Parameter "name".
-* "discussion".  Parameter "name".
-* "external_link".  Parameters "name", "link".
-* "textbooks".  No parameters--generates tab names from book titles.
-* "progress".  Parameter "name".
-* "static_tab".  Parameters "name", 'url_slug'--will look for tab contents in
-                       'tabs/{course_url_name}/{tab url_slug}.html'
-* "staff_grading". No parameters.  If specified, displays the staff grading tab for instructors.
-
-
-# Tips for content developers
-
-* We will be making better tools for managing policy files soon.  In the meantime, you can add dummy definitions to make it easier to search and separate the file visually.  For example, you could add:
-
-    "WEEK 1" : "##################################################",
-
-before the week 1 material to make it easy to find in the file.
-
-* Come up with a consistent pattern for url_names, so that it's easy to know where to look for any piece of content.  It will also help to come up with a standard way of splitting your content files.  As a point of departure, we suggest splitting chapters, sequences, html, and problems into separate files.
-
-* Prefer the most "semantic" name for containers: e.g., use problemset rather than sequential for a problem set.  That way, if we decide to display problem sets differently, we don't have to change the xml.
-
-# Other file locations (info and about)
-
-With different course runs, we may want different course info and about materials.  This is now supported by putting files in as follows:
-
-    / 
-      about/
-           foo.html      -- shared default for all runs
-           url_name1/
-                foo.html   -- version used for url_name1
-                bar.html   -- bar for url_name1
-           url_name2/
-                bar.html   -- bar for url_name2
-                           -- url_name2 will use default foo.html
-
-and the same works for the `info` directory.
-
-----
-
-(Dev note: This file is generated from the mitx repo, in `doc/xml-format.md`.  Please make edits there.)
diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index a47141b183..b31aeb6b5a 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -119,6 +119,16 @@ def _textbooks(tab, user, course, active_page):
                 for index, textbook in enumerate(course.textbooks)]
     return []
 
+def _pdf_textbooks(tab, user, course, active_page):
+    """
+    Generates one tab per textbook.  Only displays if user is authenticated.
+    """
+    if user.is_authenticated():
+        # since there can be more than one textbook, active_page is e.g. "book/0".
+        return [CourseTab(textbook['tab_title'], reverse('pdf_book', args=[course.id, index]),
+                          active_page == "pdftextbook/{0}".format(index))
+                for index, textbook in enumerate(course.pdf_textbooks)]
+    return []
 
 def _staff_grading(tab, user, course, active_page):
     if has_access(user, course, 'staff'):
@@ -198,6 +208,7 @@ VALID_TAB_TYPES = {
     'discussion': TabImpl(need_name, _discussion),
     'external_link': TabImpl(key_checker(['name', 'link']), _external_link),
     'textbooks': TabImpl(null_validator, _textbooks),
+    'pdf_textbooks': TabImpl(null_validator, _pdf_textbooks),
     'progress': TabImpl(need_name, _progress),
     'static_tab': TabImpl(key_checker(['name', 'url_slug']), _static_tab),
     'peer_grading': TabImpl(null_validator, _peer_grading),
diff --git a/lms/djangoapps/django_comment_client/base/views.py b/lms/djangoapps/django_comment_client/base/views.py
index 7ca00cb37c..e4e5ce1550 100644
--- a/lms/djangoapps/django_comment_client/base/views.py
+++ b/lms/djangoapps/django_comment_client/base/views.py
@@ -91,23 +91,31 @@ def create_thread(request, course_id, commentable_id):
         'user_id': request.user.id,
     })
 
+    
+    user = cc.User.from_django_user(request.user)
 
+    #kevinchugh because the new requirement is that all groups will be determined
+    #by the group id in the request this all goes away
+    
     # Cohort the thread if the commentable is cohorted.
-    if is_commentable_cohorted(course_id, commentable_id):
-        user_group_id = get_cohort_id(request.user, course_id)
+    #if is_commentable_cohorted(course_id, commentable_id):
+    #    user_group_id = get_cohort_id(user, course_id)
         # TODO (vshnayder): once we have more than just cohorts, we'll want to
         # change this to a single get_group_for_user_and_commentable function
         # that can do different things depending on the commentable_id
-        if cached_has_permission(request.user, "see_all_cohorts", course_id):
+    #    if cached_has_permission(request.user, "see_all_cohorts", course_id):
             # admins can optionally choose what group to post as
-            group_id = post.get('group_id', user_group_id)
-        else:
+    #        group_id = post.get('group_id', user_group_id)
+    #    else:
             # regular users always post with their own id.
-            group_id = user_group_id
-
-        thread.update_attributes(group_id=group_id)
-
+    #        group_id = user_group_id
+    group_id = post.get('group_id')
+    if group_id:
+      thread.update_attributes(group_id=group_id)
+    
+    log.debug("Saving thread %r", thread.attributes)
     thread.save()
+
     if post.get('auto_subscribe', 'false').lower() == 'true':
         user = cc.User.from_django_user(request.user)
         user.follow(thread)
diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index 70d9f40fcf..efacbc1b4e 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -11,12 +11,12 @@ from django.contrib.auth.models import User
 
 from mitxmako.shortcuts import render_to_response, render_to_string
 from courseware.courses import get_course_with_access
-from course_groups.cohorts import get_cohort_id
+from course_groups.cohorts import is_course_cohorted, get_cohort_id, is_commentable_cohorted, get_cohorted_commentables, get_cohort, get_course_cohorts, get_cohort_by_id 
 from courseware.access import has_access
 
 from urllib import urlencode
 from operator import methodcaller
-from django_comment_client.permissions import check_permissions_by_view
+from django_comment_client.permissions import check_permissions_by_view, cached_has_permission
 from django_comment_client.utils import (merge_dict, extract, strip_none,
                                          strip_blank, get_courseware_context)
 
@@ -50,22 +50,38 @@ def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAG
 
     if not request.GET.get('sort_key'):
         # If the user did not select a sort key, use their last used sort key
-        user = cc.User.from_django_user(request.user)
-        user.retrieve()
+        cc_user = cc.User.from_django_user(request.user)
+        cc_user.retrieve()
         # TODO: After the comment service is updated this can just be user.default_sort_key because the service returns the default value
-        default_query_params['sort_key'] = user.get('default_sort_key') or default_query_params['sort_key']
+        default_query_params['sort_key'] = cc_user.get('default_sort_key') or default_query_params['sort_key']
     else:
         # If the user clicked a sort key, update their default sort key
-        user = cc.User.from_django_user(request.user)
-        user.default_sort_key = request.GET.get('sort_key')
-        user.save()
+        cc_user = cc.User.from_django_user(request.user)
+        cc_user.default_sort_key = request.GET.get('sort_key')
+        cc_user.save()
 
 
-    #if the course-user is cohorted, then add the group id
-    group_id = get_cohort_id(user, course_id)
+    #there are 2 dimensions to consider when executing a search with respect to group id
+    #is user a moderator
+    #did the user request a group
+    
+    #if the user requested a group explicitly, give them that group, othewrise, if mod, show all, else if student, use cohort
+    
+    group_id = request.GET.get('group_id')
+    
+    if group_id == "all":
+        group_id = None
+    
+    if not group_id:
+        if not cached_has_permission(request.user, "see_all_cohorts", course_id):
+            group_id = get_cohort_id(request.user, course_id)
+        
     if group_id:
         default_query_params["group_id"] = group_id
 
+        
+    #so by default, a moderator sees all items, and a student sees his cohort
+        
     query_params = merge_dict(default_query_params,
                               strip_none(extract(request.GET,
                                                  ['page', 'sort_key',
@@ -73,6 +89,15 @@ def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAG
                                                   'tags', 'commentable_ids'])))
 
     threads, page, num_pages = cc.Thread.search(query_params)
+    
+    #now add the group name if the thread has a group id
+    for thread in threads:
+        if thread.get('group_id'):
+            thread['group_name'] = get_cohort_by_id(course_id, thread.get('group_id')).name
+            thread['group_string'] = "This post visible only to Group %s." % (thread['group_name'])
+        else:
+            thread['group_name'] = ""
+            thread['group_string'] = "This post visible to everyone."
 
     query_params['page'] = page
     query_params['num_pages'] = num_pages
@@ -81,6 +106,7 @@ def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAG
 
 
 def inline_discussion(request, course_id, discussion_id):
+  
     """
     Renders JSON for DiscussionModules
     """
@@ -89,7 +115,8 @@ def inline_discussion(request, course_id, discussion_id):
 
     try:
         threads, query_params = get_threads(request, course_id, discussion_id, per_page=INLINE_THREADS_PER_PAGE)
-        user_info = cc.User.from_django_user(request.user).to_dict()
+        cc_user = cc.User.from_django_user(request.user)
+        user_info = cc_user.to_dict()
     except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError) as err:
         # TODO (vshnayder): since none of this code seems to be aware of the fact that
         # sometimes things go wrong, I suspect that the js client is also not
@@ -101,7 +128,38 @@ def inline_discussion(request, course_id, discussion_id):
 
     allow_anonymous = course.metadata.get("allow_anonymous", True)
     allow_anonymous_to_peers = course.metadata.get("allow_anonymous_to_peers", False)
+        
+    #since inline is all one commentable, only show or allow the choice of cohorts
+    #if the commentable is cohorted, otherwise everything is not cohorted
+    #and no one has the option of choosing a cohort
+    is_cohorted = is_course_cohorted(course_id) and is_commentable_cohorted(course_id, discussion_id)
 
+    cohorts_list = list()
+    
+    if is_cohorted:
+      cohorts_list.append({'name':'All Groups','id':None})
+      
+      #if you're a mod, send all cohorts and let you pick
+      if cached_has_permission(request.user, "see_all_cohorts", course_id):
+          cohorts = get_course_cohorts(course_id)
+          for c in cohorts:
+              cohorts_list.append({'name':c.name, 'id':c.id})
+              
+      else:
+      #otherwise, just make a dictionary of two 
+          user_cohort = get_cohort(cc_user, course_id)
+          if user_cohort:
+              user_cohort_name = user_cohort.name
+              user_cohort_id = user_cohort.id
+          else:
+              user_cohort_name = user_cohort_id = None
+          
+          if user_cohort:
+              cohorts_list.append({'name':user_cohort_name, 'id':user_cohort_id})
+          else:
+              cohorts_list = None
+          
+          
     return utils.JsonResponse({
         'discussion_data': map(utils.safe_content, threads),
         'user_info': user_info,
@@ -111,11 +169,14 @@ def inline_discussion(request, course_id, discussion_id):
         'roles': utils.get_role_ids(course_id),
         'allow_anonymous_to_peers': allow_anonymous_to_peers,
         'allow_anonymous': allow_anonymous,
+        'cohorts': cohorts_list,
+        'is_cohorted': is_cohorted
     })
 
 
 @login_required
 def forum_form_discussion(request, course_id):
+    
     """
     Renders the main Discussion page, potentially filtered by a search query
     """
@@ -129,7 +190,8 @@ def forum_form_discussion(request, course_id):
         log.error("Error loading forum discussion threads: %s" % str(err))
         raise Http404
 
-    user_info = cc.User.from_django_user(request.user).to_dict()
+    user = cc.User.from_django_user(request.user)
+    user_info = user.to_dict()
 
     annotated_content_info = utils.get_metadata_for_threads(course_id, threads, request.user, user_info)
 
@@ -154,6 +216,10 @@ def forum_form_discussion(request, course_id):
         #trending_tags = cc.search_trending_tags(
         #    course_id,
         #)
+        cohorts = get_course_cohorts(course_id)
+        cohorted_commentables = get_cohorted_commentables(course_id)
+        
+        user_cohort_id = get_cohort_id(request.user, course_id)
 
         context = {
             'csrf': csrf(request)['csrf_token'],
@@ -168,14 +234,18 @@ def forum_form_discussion(request, course_id):
             'course_id': course.id,
             'category_map': category_map,
             'roles': saxutils.escape(json.dumps(utils.get_role_ids(course_id)), escapedict),
+            'is_moderator': cached_has_permission(request.user, "see_all_cohorts", course_id),
+            'cohorts': cohorts,
+            'user_cohort': user_cohort_id,
+            'cohorted_commentables': cohorted_commentables,
+            'is_course_cohorted': is_course_cohorted(course_id)
         }
         # print "start rendering.."
+        
         return render_to_response('discussion/index.html', context)
 
-
 @login_required
 def single_thread(request, course_id, discussion_id, thread_id):
-
     course = get_course_with_access(request.user, course_id, 'load')
     cc_user = cc.User.from_django_user(request.user)
     user_info = cc_user.to_dict()
@@ -189,7 +259,7 @@ def single_thread(request, course_id, discussion_id, thread_id):
     if request.is_ajax():
 
         courseware_context = get_courseware_context(thread, course)
-
+        
         annotated_content_info = utils.get_annotated_content_infos(course_id, thread, request.user, user_info=user_info)
         context = {'thread': thread.to_dict(), 'course_id': course_id}
         # TODO: Remove completely or switch back to server side rendering
@@ -219,6 +289,8 @@ def single_thread(request, course_id, discussion_id, thread_id):
             courseware_context = get_courseware_context(thread, course)
             if courseware_context:
                 thread.update(courseware_context)
+            if thread.get('group_id') and not thread.get('group_name'):
+                thread['group_name'] = get_cohort_by_id(course_id, thread.get('group_id')).name     
 
         threads = [utils.safe_content(thread) for thread in threads]
 
@@ -232,8 +304,11 @@ def single_thread(request, course_id, discussion_id, thread_id):
         #    course_id,
         #)
 
-
         annotated_content_info = utils.get_metadata_for_threads(course_id, threads, request.user, user_info)
+    
+        cohorts = get_course_cohorts(course_id)
+        cohorted_commentables = get_cohorted_commentables(course_id)
+        user_cohort = get_cohort_id(request.user, course_id)
 
         context = {
             'discussion_id': discussion_id,
@@ -250,6 +325,11 @@ def single_thread(request, course_id, discussion_id, thread_id):
             'category_map': category_map,
             'roles': saxutils.escape(json.dumps(utils.get_role_ids(course_id)), escapedict),
             'thread_pages': query_params['num_pages'],
+            'is_course_cohorted': is_course_cohorted(course_id),
+            'is_moderator': cached_has_permission(request.user, "see_all_cohorts", course_id),
+            'cohorts': cohorts,
+            'user_cohort': get_cohort_id(request.user, course_id),
+            'cohorted_commentables': cohorted_commentables
         }
 
         return render_to_response('discussion/single_thread.html', context)
diff --git a/lms/djangoapps/django_comment_client/utils.py b/lms/djangoapps/django_comment_client/utils.py
index 877c730539..dde219294c 100644
--- a/lms/djangoapps/django_comment_client/utils.py
+++ b/lms/djangoapps/django_comment_client/utils.py
@@ -430,7 +430,7 @@ def safe_content(content):
         'updated_at', 'depth', 'type', 'commentable_id', 'comments_count',
         'at_position_list', 'children', 'highlighted_title', 'highlighted_body',
         'courseware_title', 'courseware_url', 'tags', 'unread_comments_count',
-        'read',
+        'read', 'group_id', 'group_name', 'group_string'
     ]
 
     if (content.get('anonymous') is False) and (content.get('anonymous_to_peers') is False):
diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 75146b833f..a3e3b9c37e 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -195,7 +195,7 @@ def instructor_dashboard(request, course_id):
         track.views.server_track(request, 'dump-answer-dist-csv', {}, page='idashboard')
         return return_csv('answer_dist_{0}.csv'.format(course_id), get_answers_distribution(request, course_id))
 
-    elif "Reset student's attempts" in action:
+    elif "Reset student's attempts" in action or "Delete student state for problem" in action:
         # get the form data
         unique_student_identifier = request.POST.get('unique_student_identifier', '')
         problem_to_reset = request.POST.get('problem_to_reset', '')
@@ -226,28 +226,36 @@ def instructor_dashboard(request, course_id):
             except Exception as e:
                 msg += "<font color='red'>Couldn't find module with that urlname.  </font>"
 
-        # modify the problem's state
-        try:
-            # load the state json
-            problem_state = json.loads(module_to_reset.state)
-            old_number_of_attempts = problem_state["attempts"]
-            problem_state["attempts"] = 0
+        if "Delete student state for problem" in action:
+            # delete the state
+            try:
+                module_to_reset.delete()
+                msg += "<font color='red'>Deleted student module state for %s!</font>" % module_state_key
+            except:
+                msg += "Failed to delete module state for %s/%s" % (unique_student_identifier, problem_to_reset)
+        else:
+            # modify the problem's state
+            try:
+                # load the state json
+                problem_state = json.loads(module_to_reset.state)
+                old_number_of_attempts = problem_state["attempts"]
+                problem_state["attempts"] = 0
 
-            # save
-            module_to_reset.state = json.dumps(problem_state)
-            module_to_reset.save()
-            track.views.server_track(request,
-                                    '{instructor} reset attempts from {old_attempts} to 0 for {student} on problem {problem} in {course}'.format(
-                                        old_attempts=old_number_of_attempts,
-                                        student=student_to_reset,
-                                        problem=module_to_reset.module_state_key,
-                                        instructor=request.user,
-                                        course=course_id),
-                                    {},
-                                    page='idashboard')
-            msg += "<font color='green'>Module state successfully reset!</font>"
-        except:
-            msg += "<font color='red'>Couldn't reset module state.  </font>"
+                # save
+                module_to_reset.state = json.dumps(problem_state)
+                module_to_reset.save()
+                track.views.server_track(request,
+                                        '{instructor} reset attempts from {old_attempts} to 0 for {student} on problem {problem} in {course}'.format(
+                                            old_attempts=old_number_of_attempts,
+                                            student=student_to_reset,
+                                            problem=module_to_reset.module_state_key,
+                                            instructor=request.user,
+                                            course=course_id),
+                                        {},
+                                        page='idashboard')
+                msg += "<font color='green'>Module state successfully reset!</font>"
+            except:
+                msg += "<font color='red'>Couldn't reset module state.  </font>"
 
 
     elif "Get link to student's progress page" in action:
diff --git a/lms/djangoapps/open_ended_grading/open_ended_notifications.py b/lms/djangoapps/open_ended_grading/open_ended_notifications.py
index ecec29fce3..b4ca20079f 100644
--- a/lms/djangoapps/open_ended_grading/open_ended_notifications.py
+++ b/lms/djangoapps/open_ended_grading/open_ended_notifications.py
@@ -1,7 +1,7 @@
 from django.conf import settings
 from xmodule.open_ended_grading_classes import peer_grading_service
 from staff_grading_service import StaffGradingService
-from open_ended_grading.controller_query_service import ControllerQueryService
+from xmodule.open_ended_grading_classes.controller_query_service import ControllerQueryService
 import json
 from student.models import unique_id_for_user
 from courseware.models import StudentModule
@@ -45,7 +45,8 @@ def staff_grading_notifications(course, user):
     except:
         #Non catastrophic error, so no real action
         notifications = {}
-        log.info("Problem with getting notifications from staff grading service.")
+        #This is a dev_facing_error
+        log.info("Problem with getting notifications from staff grading service for course {0} user {1}.".format(course_id, student_id))
 
     if pending_grading:
         img_path = "/static/images/grading_notification.png"
@@ -78,7 +79,8 @@ def peer_grading_notifications(course, user):
     except:
         #Non catastrophic error, so no real action
         notifications = {}
-        log.info("Problem with getting notifications from peer grading service.")
+        #This is a dev_facing_error
+        log.info("Problem with getting notifications from peer grading service for course {0} user {1}.".format(course_id, student_id))
 
     if pending_grading:
         img_path = "/static/images/grading_notification.png"
@@ -91,7 +93,8 @@ def peer_grading_notifications(course, user):
 
 
 def combined_notifications(course, user):
-    controller_qs = ControllerQueryService(settings.OPEN_ENDED_GRADING_INTERFACE)
+    system = ModuleSystem(None, None, None, render_to_string, None)
+    controller_qs = ControllerQueryService(settings.OPEN_ENDED_GRADING_INTERFACE, system)
     student_id = unique_id_for_user(user)
     user_is_staff = has_access(user, course, 'staff')
     course_id = course.id
@@ -123,7 +126,8 @@ def combined_notifications(course, user):
     except:
         #Non catastrophic error, so no real action
         notifications = {}
-        log.exception("Problem with getting notifications from controller query service.")
+        #This is a dev_facing_error
+        log.exception("Problem with getting notifications from controller query service for course {0} user {1}.".format(course_id, student_id))
 
     if pending_grading:
         img_path = "/static/images/grading_notification.png"
diff --git a/lms/djangoapps/open_ended_grading/staff_grading_service.py b/lms/djangoapps/open_ended_grading/staff_grading_service.py
index 0ead7aa364..79b92dffba 100644
--- a/lms/djangoapps/open_ended_grading/staff_grading_service.py
+++ b/lms/djangoapps/open_ended_grading/staff_grading_service.py
@@ -18,6 +18,7 @@ from mitxmako.shortcuts import render_to_string
 
 log = logging.getLogger(__name__)
 
+STAFF_ERROR_MESSAGE = 'Could not contact the external grading server.  Please contact the development team.  If you do not have a point of contact, you can contact Vik at vik@edx.org.'
 
 class MockStaffGradingService(object):
     """
@@ -254,10 +255,12 @@ def get_problem_list(request, course_id):
         return HttpResponse(response,
                 mimetype="application/json")
     except GradingServiceError:
-        log.exception("Error from grading service.  server url: {0}"
+        #This is a dev_facing_error
+        log.exception("Error from staff grading service in open ended grading.  server url: {0}"
                       .format(staff_grading_service().url))
+        #This is a staff_facing_error
         return HttpResponse(json.dumps({'success': False,
-                           'error': 'Could not connect to grading service'}))
+                           'error': STAFF_ERROR_MESSAGE}))
 
 
 def _get_next(course_id, grader_id, location):
@@ -267,10 +270,12 @@ def _get_next(course_id, grader_id, location):
     try:
         return staff_grading_service().get_next(course_id, location, grader_id)
     except GradingServiceError:
-        log.exception("Error from grading service.  server url: {0}"
+        #This is a dev facing error
+        log.exception("Error from staff grading service in open ended grading.  server url: {0}"
                       .format(staff_grading_service().url))
+        #This is a staff_facing_error
         return json.dumps({'success': False,
-                           'error': 'Could not connect to grading service'})
+                           'error': STAFF_ERROR_MESSAGE})
 
 
 @expect_json
@@ -316,18 +321,23 @@ def save_grade(request, course_id):
                                           p.getlist('rubric_scores[]'),
                                           p['submission_flagged'])
     except GradingServiceError:
-        log.exception("Error saving grade")
-        return _err_response('Could not connect to grading service')
+        #This is a dev_facing_error
+        log.exception("Error saving grade in the staff grading interface in open ended grading.  Request: {0} Course ID: {1}".format(request, course_id))
+        #This is a staff_facing_error
+        return _err_response(STAFF_ERROR_MESSAGE)
 
     try:
         result = json.loads(result_json)
     except ValueError:
-        log.exception("save_grade returned broken json: %s", result_json)
-        return _err_response('Grading service returned mal-formatted data.')
+        #This is a dev_facing_error
+        log.exception("save_grade returned broken json in the staff grading interface in open ended grading: {0}".format(result_json))
+        #This is a staff_facing_error
+        return _err_response(STAFF_ERROR_MESSAGE)
 
     if not result.get('success', False):
-        log.warning('Got success=False from grading service.  Response: %s', result_json)
-        return _err_response('Grading service failed')
+        #This is a dev_facing_error
+        log.warning('Got success=False from staff grading service in open ended grading.  Response: {0}'.format(result_json))
+        return _err_response(STAFF_ERROR_MESSAGE)
 
     # Ok, save_grade seemed to work.  Get the next submission to grade.
     return HttpResponse(_get_next(course_id, grader_id, location),
diff --git a/lms/djangoapps/open_ended_grading/tests.py b/lms/djangoapps/open_ended_grading/tests.py
index 63048c78d4..d452883ebb 100644
--- a/lms/djangoapps/open_ended_grading/tests.py
+++ b/lms/djangoapps/open_ended_grading/tests.py
@@ -16,7 +16,7 @@ import courseware.tests.tests as ct
 from xmodule.modulestore.django import modulestore
 import xmodule.modulestore.django
 from nose import SkipTest
-from mock import patch, Mock
+from mock import patch, Mock, MagicMock
 import json
 from xmodule.x_module import ModuleSystem
 from mitxmako.shortcuts import render_to_string
@@ -169,23 +169,35 @@ class TestPeerGradingService(ct.PageLoader):
 
     def test_get_next_submission_missing_location(self):
         data = {}
-        r = self.peer_module.get_next_submission(data)
-        d = r
+        d = self.peer_module.get_next_submission(data)
         self.assertFalse(d['success'])
         self.assertEqual(d['error'], "Missing required keys: location")
 
     def test_save_grade_success(self):
-        raise SkipTest()
-        data = 'rubric_scores[]=1|rubric_scores[]=2|location=' + self.location + '|submission_id=1|submission_key=fake key|score=2|feedback=feedback|submission_flagged=False'
-        qdict = QueryDict(data.replace("|", "&"))
+        data = {
+                'rubric_scores[]': [0, 0],
+                'location': self.location,
+                'submission_id': 1,
+                'submission_key': 'fake key',
+                'score': 2,
+                'feedback': 'feedback',
+                'submission_flagged': 'false'
+                }
+
+        qdict = MagicMock()
+        def fake_get_item(key):
+            return data[key]
+        qdict.__getitem__.side_effect = fake_get_item
+        qdict.getlist = fake_get_item
+        qdict.keys = data.keys
+
         r = self.peer_module.save_grade(qdict)
-        d = r
+        d = json.loads(r)
         self.assertTrue(d['success'])
 
     def test_save_grade_missing_keys(self):
         data = {}
-        r = self.peer_module.save_grade(data)
-        d = r
+        d = self.peer_module.save_grade(data)
         self.assertFalse(d['success'])
         self.assertTrue(d['error'].find('Missing required keys:') > -1)
 
@@ -198,8 +210,7 @@ class TestPeerGradingService(ct.PageLoader):
 
     def test_is_calibrated_failure(self):
         data = {}
-        r = self.peer_module.is_student_calibrated(data)
-        d = r
+        d = self.peer_module.is_student_calibrated(data)
         self.assertFalse(d['success'])
         self.assertFalse('calibrated' in d)
 
@@ -219,25 +230,36 @@ class TestPeerGradingService(ct.PageLoader):
     def test_show_calibration_essay_missing_key(self):
         data = {}
 
-        r = self.peer_module.show_calibration_essay(data)
-        d = r
+        d = self.peer_module.show_calibration_essay(data)
 
         self.assertFalse(d['success'])
         self.assertEqual(d['error'], "Missing required keys: location")
 
     def test_save_calibration_essay_success(self):
-        raise SkipTest()
-        data = 'rubric_scores[]=1|rubric_scores[]=2|location=' + self.location + '|submission_id=1|submission_key=fake key|score=2|feedback=feedback|submission_flagged=False'
-        qdict = QueryDict(data.replace("|", "&"))
-        r = self.peer_module.save_calibration_essay(qdict)
-        d = r
+        data = {
+                'rubric_scores[]': [0, 0],
+                'location': self.location,
+                'submission_id': 1,
+                'submission_key': 'fake key',
+                'score': 2,
+                'feedback': 'feedback',
+                'submission_flagged': 'false'
+                }
+
+        qdict = MagicMock()
+        def fake_get_item(key):
+            return data[key]
+        qdict.__getitem__.side_effect = fake_get_item
+        qdict.getlist = fake_get_item
+        qdict.keys = data.keys
+
+        d = self.peer_module.save_calibration_essay(qdict)
         self.assertTrue(d['success'])
         self.assertTrue('actual_score' in d)
 
     def test_save_calibration_essay_missing_keys(self):
         data = {}
-        r = self.peer_module.save_calibration_essay(data)
-        d = r
+        d = self.peer_module.save_calibration_essay(data)
         self.assertFalse(d['success'])
         self.assertTrue(d['error'].find('Missing required keys:') > -1)
         self.assertFalse('actual_score' in d)
diff --git a/lms/djangoapps/open_ended_grading/views.py b/lms/djangoapps/open_ended_grading/views.py
index 80f50b282d..76919d4103 100644
--- a/lms/djangoapps/open_ended_grading/views.py
+++ b/lms/djangoapps/open_ended_grading/views.py
@@ -11,7 +11,8 @@ from django.core.urlresolvers import reverse
 from student.models import unique_id_for_user
 from courseware.courses import get_course_with_access
 
-from controller_query_service import ControllerQueryService
+from xmodule.x_module import ModuleSystem
+from xmodule.open_ended_grading_classes.controller_query_service import ControllerQueryService, convert_seconds_to_human_readable
 from xmodule.open_ended_grading_classes.grading_service_module import GradingServiceError
 import json
 from student.models import unique_id_for_user
@@ -22,12 +23,14 @@ from xmodule.modulestore.django import modulestore
 from xmodule.modulestore import search
 
 from django.http import HttpResponse, Http404, HttpResponseRedirect
+from mitxmako.shortcuts import render_to_string
 
 log = logging.getLogger(__name__)
 
 template_imports = {'urllib': urllib}
 
-controller_qs = ControllerQueryService(settings.OPEN_ENDED_GRADING_INTERFACE)
+system = ModuleSystem(None, None, None, render_to_string, None)
+controller_qs = ControllerQueryService(settings.OPEN_ENDED_GRADING_INTERFACE, system)
 
 """
 Reverses the URL from the name and the course id, and then adds a trailing slash if
@@ -60,6 +63,8 @@ ALERT_DICT = {
             'Flagged Submissions': "Submissions have been flagged for review"
     }
 
+STUDENT_ERROR_MESSAGE = "Error occured while contacting the grading service.  Please notify course staff."
+STAFF_ERROR_MESSAGE = "Error occured while contacting the grading service.  Please notify the development team.  If you do not have a point of contact, please email Vik at vik@edx.org"
 
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 def staff_grading(request, course_id):
@@ -96,7 +101,9 @@ def peer_grading(request, course_id):
 
         return HttpResponseRedirect(problem_url)
     except:
+        #This is a student_facing_error
         error_message = "Error with initializing peer grading.  Centralized module does not exist.  Please contact course staff."
+        #This is a dev_facing_error
         log.exception(error_message + "Current course is: {0}".format(course_id))
         return HttpResponse(error_message)
 
@@ -132,30 +139,46 @@ def student_problem_list(request, course_id):
     problem_list = []
     base_course_url  = reverse('courses')
 
-    #try:
-    problem_list_json = controller_qs.get_grading_status_list(course_id, unique_id_for_user(request.user))
-    problem_list_dict = json.loads(problem_list_json)
-    success = problem_list_dict['success']
-    if 'error' in problem_list_dict:
-        error_text = problem_list_dict['error']
-        problem_list = []
-    else:
-        problem_list = problem_list_dict['problem_list']
+    try:
+        problem_list_json = controller_qs.get_grading_status_list(course_id, unique_id_for_user(request.user))
+        problem_list_dict = json.loads(problem_list_json)
+        success = problem_list_dict['success']
+        if 'error' in problem_list_dict:
+            error_text = problem_list_dict['error']
+            problem_list = []
+        else:
+            problem_list = problem_list_dict['problem_list']
 
-    for i in xrange(0, len(problem_list)):
-        problem_url_parts = search.path_to_location(modulestore(), course.id, problem_list[i]['location'])
-        problem_url = generate_problem_url(problem_url_parts, base_course_url)
-        problem_list[i].update({'actual_url': problem_url})
+        for i in xrange(0, len(problem_list)):
+            problem_url_parts = search.path_to_location(modulestore(), course.id, problem_list[i]['location'])
+            problem_url = generate_problem_url(problem_url_parts, base_course_url)
+            problem_list[i].update({'actual_url': problem_url})
+            eta_available = problem_list[i]['eta_available']
+            if isinstance(eta_available, basestring):
+                eta_available = (eta_available.lower() == "true")
+
+            eta_string = "N/A"
+            if eta_available:
+                try:
+                    eta_string = convert_seconds_to_human_readable(int(problem_list[i]['eta']))
+                except:
+                    #This is a student_facing_error
+                    eta_string = "Error getting ETA."
+            problem_list[i].update({'eta_string' : eta_string})
 
-    """
     except GradingServiceError:
-        error_text = "Error occured while contacting the grading service"
+        #This is a student_facing_error
+        error_text = STUDENT_ERROR_MESSAGE
+        #This is a dev facing error
+        log.error("Problem contacting open ended grading service.")
         success = False
     # catch error if if the json loads fails
     except ValueError:
-        error_text = "Could not get problem list"
+        #This is a student facing error
+        error_text = STUDENT_ERROR_MESSAGE
+        #This is a dev_facing_error
+        log.error("Problem with results from external grading service for open ended.")
         success = False
-    """
 
     ajax_url = _reverse_with_slash('open_ended_problems', course_id)
 
@@ -195,11 +218,17 @@ def flagged_problem_list(request, course_id):
             problem_list = problem_list_dict['flagged_submissions']
 
     except GradingServiceError:
-        error_text = "Error occured while contacting the grading service"
+        #This is a staff_facing_error
+        error_text = STAFF_ERROR_MESSAGE
+        #This is a dev_facing_error
+        log.error("Could not get flagged problem list from external grading service for open ended.")
         success = False
     # catch error if if the json loads fails
     except ValueError:
-        error_text = "Could not get problem list"
+        #This is a staff_facing_error
+        error_text = STAFF_ERROR_MESSAGE
+        #This is a dev_facing_error
+        log.error("Could not parse problem list from external grading service response.")
         success = False
 
     ajax_url = _reverse_with_slash('open_ended_flagged_problems', course_id)
@@ -283,7 +312,8 @@ def take_action_on_flags(request, course_id):
     required = ['submission_id', 'action_type', 'student_id']
     for key in required:
         if key not in request.POST:
-            return HttpResponse(json.dumps({'success': False, 'error': 'Missing key {0}'.format(key)}),
+            #This is a staff_facing_error
+            return HttpResponse(json.dumps({'success': False, 'error': STAFF_ERROR_MESSAGE + 'Missing key {0} from submission.  Please reload and try again.'.format(key)}),
                 mimetype="application/json")
 
     p = request.POST
@@ -297,5 +327,6 @@ def take_action_on_flags(request, course_id):
         response = controller_qs.take_action_on_flags(course_id, student_id, submission_id, action_type)
         return HttpResponse(response, mimetype="application/json")
     except GradingServiceError:
-        log.exception("Error saving calibration grade, submission_id: {0}, submission_key: {1}, grader_id: {2}".format(submission_id, submission_key, grader_id))
-        return _err_response('Could not connect to grading service')
+        #This is a dev_facing_error
+        log.exception("Error taking action on flagged peer grading submissions, submission_id: {0}, action_type: {1}, grader_id: {2}".format(submission_id, action_type, grader_id))
+        return _err_response(STAFF_ERROR_MESSAGE)
diff --git a/lms/djangoapps/staticbook/views.py b/lms/djangoapps/staticbook/views.py
index 6750d151ce..a391b1cb32 100644
--- a/lms/djangoapps/staticbook/views.py
+++ b/lms/djangoapps/staticbook/views.py
@@ -1,10 +1,12 @@
-from django.conf import settings
+from lxml import etree
+
+# from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from mitxmako.shortcuts import render_to_response
 
 from courseware.access import has_access
 from courseware.courses import get_course_with_access
-from lxml import etree
+from static_replace import replace_static_urls
 
 
 @login_required
@@ -30,3 +32,38 @@ def index(request, course_id, book_index, page=None):
 
 def index_shifted(request, course_id, page):
     return index(request, course_id=course_id, page=int(page) + 24)
+
+
+@login_required
+def pdf_index(request, course_id, book_index, chapter=None, page=None):
+    course = get_course_with_access(request.user, course_id, 'load')
+    staff_access = has_access(request.user, course, 'staff')
+
+    book_index = int(book_index)
+    textbook = course.pdf_textbooks[book_index]
+
+    def remap_static_url(original_url, course):
+        input_url = "'" + original_url + "'"
+        output_url = replace_static_urls(
+                    input_url,
+                    course.metadata['data_dir'],
+                    course_namespace=course.location
+                )
+        # strip off the quotes again...
+        return output_url[1:-1]
+
+    if 'url' in textbook:
+        textbook['url'] = remap_static_url(textbook['url'], course)
+    # then remap all the chapter URLs as well, if they are provided.
+    if 'chapters' in textbook:
+        for entry in textbook['chapters']:
+            entry['url'] = remap_static_url(entry['url'], course)            
+
+
+    return render_to_response('static_pdfbook.html',
+                              {'book_index': book_index, 
+                               'course': course, 
+                               'textbook': textbook,
+                               'chapter': chapter,
+                               'page': page,
+                               'staff_access': staff_access})
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 71e93024d2..9b0afeef3a 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -20,7 +20,6 @@ Longer TODO:
 """
 import sys
 import os
-import tempfile
 from xmodule.static_content import write_module_styles, write_module_js
 
 from path import path
@@ -133,7 +132,8 @@ OPENID_PROVIDER_TRUSTED_ROOTS = ['cs50.net', '*.cs50.net']
 ################################## MITXWEB #####################################
 # This is where we stick our compiled template files. Most of the app uses Mako
 # templates
-MAKO_MODULE_DIR = tempfile.mkdtemp('mako')
+from tempdir import mkdtemp_clean
+MAKO_MODULE_DIR = mkdtemp_clean('mako')
 MAKO_TEMPLATES = {}
 MAKO_TEMPLATES['main'] = [PROJECT_ROOT / 'templates',
                           COMMON_ROOT / 'templates',
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 6cad6416d0..c1863349fb 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -170,4 +170,4 @@ PASSWORD_HASHERS = (
     'django.contrib.auth.hashers.SHA1PasswordHasher',
     'django.contrib.auth.hashers.MD5PasswordHasher',
     # 'django.contrib.auth.hashers.CryptPasswordHasher',
-)
+)
\ No newline at end of file
diff --git a/lms/lib/comment_client/thread.py b/lms/lib/comment_client/thread.py
index 912ae1af18..ca607d3ff3 100644
--- a/lms/lib/comment_client/thread.py
+++ b/lms/lib/comment_client/thread.py
@@ -11,12 +11,12 @@ class Thread(models.Model):
         'closed', 'tags', 'votes', 'commentable_id', 'username', 'user_id',
         'created_at', 'updated_at', 'comments_count', 'unread_comments_count',
         'at_position_list', 'children', 'type', 'highlighted_title',
-        'highlighted_body', 'endorsed', 'read', 'group_id'
+        'highlighted_body', 'endorsed', 'read', 'group_id', 'group_name'
     ]
 
     updatable_fields = [
         'title', 'body', 'anonymous', 'anonymous_to_peers', 'course_id',
-        'closed', 'tags', 'user_id', 'commentable_id', 'group_id'
+        'closed', 'tags', 'user_id', 'commentable_id', 'group_id', 'group_name'
     ]
 
     initializable_fields = updatable_fields
diff --git a/lms/lib/symmath/symmath_check.py b/lms/lib/symmath/symmath_check.py
index d386ea6b06..dc6fe60398 100644
--- a/lms/lib/symmath/symmath_check.py
+++ b/lms/lib/symmath/symmath_check.py
@@ -149,6 +149,12 @@ 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)
+    else:
+        return (abs(abs(actual - expected) / expected) < tolerance)
+
 #-----------------------------------------------------------------------------
 # Check function interface, which takes pmathml input
 #
@@ -215,16 +221,16 @@ 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 fans
+    if (hasattr(fexpect, 'is_number') and fexpect.is_number 
         and hasattr(fans, 'is_number') and fans.is_number):
-        if abs(abs(fans - fexpect) / fexpect) < threshold:
+        if is_within_tolerance(fexpect, fans, threshold):
             return {'ok': True, 'msg': msg}
         else:
             msg += '<p>You entered: %s</p>' % to_latex(fans)
             return {'ok': False, 'msg': msg}
 
     if do_numerical:		# numerical answer expected - force numerical comparison
-        if abs(abs(fans - fexpect) / fexpect) < threshold:
+        if is_within_tolerance(fexpect, fans, threshold):
             return {'ok': True, 'msg': msg}
         else:
             msg += '<p>You entered: %s (note that a numerical answer is expected)</p>' % to_latex(fans)
diff --git a/lms/lib/symmath/test_symmath_check.py b/lms/lib/symmath/test_symmath_check.py
new file mode 100644
index 0000000000..71b8f45aad
--- /dev/null
+++ b/lms/lib/symmath/test_symmath_check.py
@@ -0,0 +1,28 @@
+from unittest import TestCase
+from symmath_check import symmath_check
+
+class SymmathCheckTest(TestCase):
+    def test_symmath_check_integers(self):
+        number_list = [i for i in range(-100, 100)]
+        self._symmath_check_numbers(number_list)
+
+    def test_symmath_check_floats(self):
+        number_list = [i + 0.01 for i in range(-100, 100)]
+        self._symmath_check_numbers(number_list)
+
+    def _symmath_check_numbers(self, number_list):
+
+        for n in number_list:
+
+            # expect = ans, so should say the answer is correct
+            expect = n
+            ans = n
+            result = symmath_check(str(expect), str(ans))
+            self.assertTrue('ok' in result and result['ok'],
+                            "%f should == %f" % (expect, ans))
+
+            # Change expect so that it != ans
+            expect += 0.1
+            result = symmath_check(str(expect), str(ans))
+            self.assertTrue('ok' in result and not result['ok'],
+                            "%f should != %f" % (expect, ans))
diff --git a/lms/static/coffee/src/open_ended/open_ended.coffee b/lms/static/coffee/src/open_ended/open_ended.coffee
index cc8bad5473..bfb0fa5931 100644
--- a/lms/static/coffee/src/open_ended/open_ended.coffee
+++ b/lms/static/coffee/src/open_ended/open_ended.coffee
@@ -41,7 +41,7 @@ class OpenEnded
   post: (cmd, data, callback) ->
       # if this post request fails, the error callback will catch it
       $.post(@ajax_url + cmd, data, callback)
-        .error => callback({success: false, error: "Error occured while performing this operation"})
+        .error => callback({success: false, error: "Error occured while performing javascript ajax post."})
 
   after_action_wrapper: (target, action_type) ->
     tr_parent = target.parent().parent()
diff --git a/lms/static/coffee/src/staff_grading/staff_grading.coffee b/lms/static/coffee/src/staff_grading/staff_grading.coffee
index 8a1bf1adbb..6af9ecf5d1 100644
--- a/lms/static/coffee/src/staff_grading/staff_grading.coffee
+++ b/lms/static/coffee/src/staff_grading/staff_grading.coffee
@@ -143,11 +143,12 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t
     else
       # TODO: replace with postWithPrefix when that's loaded
       $.post(@ajax_url + cmd, data, callback)
-        .error => callback({success: false, error: "Error occured while performing this operation"})
+        .error => callback({success: false, error: "Error occured while performing javascript AJAX post."})
 
 
 class @StaffGrading
   constructor: (backend) ->
+    AjaxPrefix.addAjaxPrefix(jQuery, -> "")
     @backend = backend
 
     # all the jquery selectors
@@ -182,6 +183,8 @@ class @StaffGrading
 
     @breadcrumbs = $('.breadcrumbs')
 
+
+    $(window).keydown @keydown_handler
     @question_header = $('.question-header')
     @question_header.click @collapse_question
     @collapse_question()
@@ -218,7 +221,8 @@ class @StaffGrading
 
   setup_score_selection: =>
     @score_selection_container.html(@rubric)
-    $('.score-selection').click => @graded_callback()
+    $('input[class="score-selection"]').change => @graded_callback()
+    Rubric.initialize(@location)
 
 
   graded_callback: () =>
@@ -227,6 +231,10 @@ class @StaffGrading
       @state = state_graded
       @submit_button.show()
 
+  keydown_handler: (e) =>
+    if e.which == 13 && !@list_view && Rubric.check_complete()
+      @submit_and_get_next()
+
   set_button_text: (text) =>
     @action_button.attr('value', text)
 
@@ -441,8 +449,10 @@ class @StaffGrading
     @prompt_container.slideToggle()
     @prompt_container.toggleClass('open')
     if @question_header.text() == "(Hide)"
+      Logger.log 'staff_grading_hide_question', {location: @location}
       new_text = "(Show)"
     else
+      Logger.log 'staff_grading_show_question', {location: @location}
       new_text = "(Hide)"
     @question_header.text(new_text)
 
diff --git a/lms/static/images/university/anu/anu-cover.jpg b/lms/static/images/university/anu/anu-cover.jpg
new file mode 100644
index 0000000000..591df9791d
Binary files /dev/null and b/lms/static/images/university/anu/anu-cover.jpg differ
diff --git a/lms/static/images/university/anu/anu.png b/lms/static/images/university/anu/anu.png
new file mode 100644
index 0000000000..5caeb0b180
Binary files /dev/null and b/lms/static/images/university/anu/anu.png differ
diff --git a/lms/static/images/university/delft/delft-cover.jpg b/lms/static/images/university/delft/delft-cover.jpg
new file mode 100644
index 0000000000..73092d7596
Binary files /dev/null and b/lms/static/images/university/delft/delft-cover.jpg differ
diff --git a/lms/static/images/university/delft/delft.png b/lms/static/images/university/delft/delft.png
new file mode 100644
index 0000000000..03c566e91f
Binary files /dev/null and b/lms/static/images/university/delft/delft.png differ
diff --git a/lms/static/images/university/epfl/epfl-cover.jpg b/lms/static/images/university/epfl/epfl-cover.jpg
new file mode 100644
index 0000000000..42b188c925
Binary files /dev/null and b/lms/static/images/university/epfl/epfl-cover.jpg differ
diff --git a/lms/static/images/university/epfl/epfl.png b/lms/static/images/university/epfl/epfl.png
new file mode 100644
index 0000000000..6725340a1a
Binary files /dev/null and b/lms/static/images/university/epfl/epfl.png differ
diff --git a/lms/static/images/university/mcgill/mcgill-cover.jpg b/lms/static/images/university/mcgill/mcgill-cover.jpg
new file mode 100644
index 0000000000..4d213c8c92
Binary files /dev/null and b/lms/static/images/university/mcgill/mcgill-cover.jpg differ
diff --git a/lms/static/images/university/mcgill/mcgill.png b/lms/static/images/university/mcgill/mcgill.png
new file mode 100644
index 0000000000..5a0bcb56ad
Binary files /dev/null and b/lms/static/images/university/mcgill/mcgill.png differ
diff --git a/lms/static/images/university/rice/rice-cover.jpg b/lms/static/images/university/rice/rice-cover.jpg
new file mode 100644
index 0000000000..2266a72c6d
Binary files /dev/null and b/lms/static/images/university/rice/rice-cover.jpg differ
diff --git a/lms/static/images/university/rice/rice.png b/lms/static/images/university/rice/rice.png
new file mode 100644
index 0000000000..95865f2dba
Binary files /dev/null and b/lms/static/images/university/rice/rice.png differ
diff --git a/lms/static/images/university/toronto/toronto-cover.jpg b/lms/static/images/university/toronto/toronto-cover.jpg
new file mode 100644
index 0000000000..0d3434659e
Binary files /dev/null and b/lms/static/images/university/toronto/toronto-cover.jpg differ
diff --git a/lms/static/images/university/toronto/toronto.png b/lms/static/images/university/toronto/toronto.png
new file mode 100644
index 0000000000..86851b9468
Binary files /dev/null and b/lms/static/images/university/toronto/toronto.png differ
diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 809c968fe6..e5134837fe 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -169,6 +169,12 @@ body.discussion {
         }
       }
 
+      .form-group-label {
+        display: block;
+        padding-top: 5px;
+        color:#fff;
+      }
+
       .topic_dropdown_button {
         position: relative;
         z-index: 1000;
@@ -181,7 +187,7 @@ body.discussion {
         .drop-arrow {
           float: right;
           color: #999;
-          line-height: 36px;
+          line-height: 37px;
         }
       }
 
@@ -971,7 +977,8 @@ body.discussion {
   }
 
   .sort-bar {
-    height: 27px;
+    height: auto;
+    min-height: 27px;
     border-bottom: 1px solid #a3a3a3;
     @include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
     background-color: #aeaeae;
@@ -1020,6 +1027,18 @@ body.discussion {
       }
 
     }
+    .group-filter-label {
+      width: 40px;
+      margin-left:10px;
+    }
+
+    .group-filter-select {
+      margin: 5px 0px 5px 5px;
+      width: 80px;
+      font-size:10px;
+      background: transparent;
+      border-color: #ccc;
+    }
   }
 
   .post-list-wrapper {
@@ -1327,6 +1346,8 @@ body.discussion {
       margin-left: 40px;
     }
 
+
+
     .post-tools {
       @include clearfix;
       margin-top: 15px;
@@ -1357,6 +1378,8 @@ body.discussion {
     margin-bottom: 20px;
   }
 
+  
+
   .responses {
     list-style: none;
     margin-top: 40px;
@@ -2412,3 +2435,11 @@ body.discussion {
 .discussion-user-threads {
   @extend .discussion-module
 }
+
+
+.group-visibility-label {
+    font-size: 12px;
+    color:#000;
+    font-style: italic;
+    background-color:#fff;
+  }
\ No newline at end of file
diff --git a/lms/static/sass/course/_textbook.scss b/lms/static/sass/course/_textbook.scss
index 4bda5a46d6..af9c2493fd 100644
--- a/lms/static/sass/course/_textbook.scss
+++ b/lms/static/sass/course/_textbook.scss
@@ -102,6 +102,7 @@ div.book-wrapper {
           position: absolute;
           height: 100%;
           width: flex-grid(2, 8);
+          z-index: 1;
 
           a {
             background-color: rgba(#000, .7);
diff --git a/lms/static/sass/multicourse/_courses.scss b/lms/static/sass/multicourse/_courses.scss
index 7e5bd4ff38..45ecfcd23f 100644
--- a/lms/static/sass/multicourse/_courses.scss
+++ b/lms/static/sass/multicourse/_courses.scss
@@ -5,6 +5,7 @@
   header.search {
     background: rgb(240,240,240);
     background-size: cover;
+    background-position: center top !important;
     border-bottom: 1px solid rgb(100,100,100);
     @include box-shadow(inset 0 -1px 8px 0 rgba(0,0,0, 0.2), inset 0 1px 12px 0 rgba(0,0,0, 0.3));
     height: 430px;
diff --git a/lms/static/sass/multicourse/_home.scss b/lms/static/sass/multicourse/_home.scss
index 669bd889b0..b5546aa470 100644
--- a/lms/static/sass/multicourse/_home.scss
+++ b/lms/static/sass/multicourse/_home.scss
@@ -1,6 +1,11 @@
 .home {
   padding: 0px;
 
+  > .container {
+    @include box-sizing(border-box);
+    width: flex-grid(12);
+  }
+
   > header {
     background: rgb(255,255,255);
     @include background-image(url('/static/images/homepage-bg.jpg'));
@@ -175,9 +180,6 @@
   }
 
   .university-partners {
-    @include background-image(linear-gradient(180deg, rgba(245,245,245, 0) 0%,
-                                                      rgba(245,245,245, 1) 50%,
-                                                      rgba(245,245,245, 0) 100%));
     border-bottom: 1px solid rgb(210,210,210);
     margin-bottom: 0px;
     overflow: hidden;
@@ -300,7 +302,6 @@
         }
 
         img {
-          max-width: 190px;
           position: relative;
           @include transition(all, 0.25s, ease-in-out);
           vertical-align: middle;
@@ -324,6 +325,44 @@
         }
       }
     }
+
+    &.university-partners2x6 {
+      @include box-sizing(border-box);
+      width: flex-grid(12, 12);
+
+      .partners {
+        @include box-sizing(border-box);
+        @include clearfix();
+        margin-left: 60px;
+        padding: 12px 0;
+
+        .partner {
+          @include box-sizing(border-box);
+          width: flex-grid(2, 12);
+          display: block;
+          float: left;
+          padding: 0 12px;
+
+          a {
+
+            img {
+              width: 100%;
+              height: auto;
+            }
+
+            .name > span {
+              font-size: 1.0em;
+            }
+
+            &:hover {
+              .name {
+                bottom: 14px;
+              }
+            }
+          }
+        }
+      }
+    }
   }
 
   .more-info {
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index 700e171ace..5d8ef859aa 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -1,4 +1,4 @@
-<section id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}" data-accept-file-upload = "${accept_file_upload}">
+<section id="combined-open-ended" class="combined-open-ended" data-location="${location}" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}" data-accept-file-upload = "${accept_file_upload}">
     <div class="status-container">
         ${status|n}
     </div>
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index fa84e7bab7..d13077737f 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -16,7 +16,7 @@
                     %else:
                         ${status['human_task']}
                     %endif
-                    (${status['human_state']}) ${status['score']} / ${status['max_score']}
+                    (${status['human_state']})
             </div>
         %endfor
     </section>
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index a31ee0025e..52eb8655fa 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -149,6 +149,12 @@ function goto( mode)
     <p><input type="text" name="unique_student_identifier">  <input type="submit" name="action" value="Get link to student's progress page"></p>
     <p>and, if you want to reset the number of attempts for a problem, the urlname of that problem</p>
     <p> <input type="text" name="problem_to_reset"> <input type="submit" name="action" value="Reset student's attempts">  </p>
+
+    %if instructor_access:
+    <p> You may also delete the entire state of a student for a problem:
+    <input type="submit" name="action" value="Delete student state for problem">  </p>
+    %endif
+
  %endif
 
 ##----------------------------------------------------------------------------- 
diff --git a/lms/templates/discussion/_filter_dropdown.html b/lms/templates/discussion/_filter_dropdown.html
index 484ee05101..fef4abb11f 100644
--- a/lms/templates/discussion/_filter_dropdown.html
+++ b/lms/templates/discussion/_filter_dropdown.html
@@ -11,7 +11,7 @@
 </%def>
 
 <%def name="render_entry(entries, entry)">
-    <li><a href="#"><span class="board-name" data-discussion_id='${json.dumps(entries[entry])}'>${entry}</span></a></li>
+    <li><a href="#"><span class="board-name" data-discussion_id='${json.dumps(entries[entry])}' cohorted = "${entries[entry]['id'] in cohorted_commentables}">${entry}</span></a></li>
 </%def>
 
 <%def name="render_category(categories, category)">
@@ -30,7 +30,7 @@
     <ul class="browse-topic-drop-menu">
         <li>
             <a href="#">
-                <span class="board-name" data-discussion_id='#all'>All</span>
+                <span class="board-name" data-discussion_id='#all'>Show All Discussions</span>
             </a>
         </li>
         <li>
diff --git a/lms/templates/discussion/_inline_new_post.html b/lms/templates/discussion/_inline_new_post.html
index 7af66c0cdd..a1b347f548 100644
--- a/lms/templates/discussion/_inline_new_post.html
+++ b/lms/templates/discussion/_inline_new_post.html
@@ -1,6 +1,6 @@
 <article class="new-post-article">
     <div class="inner-wrapper">
-        <div class="new-post-form-errors">
+      <div class="new-post-form-errors">
         </div>
         <form class="new-post-form">
             <div class="left-column">
@@ -12,6 +12,24 @@
                     %elif course.metadata.get("allow_anonymous_to_peers", False):
                         <input type="checkbox" name="anonymous_to_peers" class="discussion-anonymous-to-peers" id="new-post-anonymous-to-peers"><label for="new-post-anonymous-to-peers">post anonymously to classmates</label>
                     %endif
+                    %if is_course_cohorted:
+                    <div class="form-group-label choose-cohort">
+                        Make visible to:
+                        <select class="group-filter-select new-post-group" name = "group_id"> 
+                            <option value="">All Groups</option>
+                            %if is_moderator:
+                              %for c in cohorts:
+                                <option value="${c.id}">${c.name}</option>
+                              %endfor
+                            %else:
+                                %if user_cohort:
+                                    <option value="${user_cohort}">My Cohort</option>
+                                %endif
+                            %endif
+
+                        </select>
+                    </div>
+                    %endif
                 </div>
             </div>
             <div class="right-column">
diff --git a/lms/templates/discussion/_new_post.html b/lms/templates/discussion/_new_post.html
index eafcda7f42..223b593368 100644
--- a/lms/templates/discussion/_new_post.html
+++ b/lms/templates/discussion/_new_post.html
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="render_entry(entries, entry)">
-    <li><a href="#" class="topic" data-discussion_id="${entries[entry]['id']}">${entry}</a></li>
+    <li><a href="#" class="topic" data-discussion_id="${entries[entry]['id']}" cohorted = "${entries[entry]['id'] in cohorted_commentables}">${entry}</a></li>
 </%def>
 
 <%def name="render_category(categories, category)">
@@ -21,13 +21,14 @@
     </li>
 </%def>
 
+
 <article class="new-post-article">
     <div class="inner-wrapper">        
         <form class="new-post-form">
             <div class="left-column">
                 <label>Create new post about:</label>
                 <div class="form-topic-drop">
-                    <a href="#" class="topic_dropdown_button">All<span class="drop-arrow">▾</span></a>
+                    <a href="#" class="topic_dropdown_button">Show All Discussions<span class="drop-arrow">▾</span></a>
                     <div class="topic_menu_wrapper">
                         <div class="topic_menu_search">
                             <input type="text" class="form-topic-drop-search-input" placeholder="filter topics">
@@ -45,6 +46,24 @@
                     %elif course.metadata.get("allow_anonymous_to_peers", False):
                         <input type="checkbox" name="anonymous_to_peers" class="discussion-anonymous-to-peers" id="new-post-anonymous-to-peers"><label for="new-post-anonymous-to-peers">post anonymously to classmates</label>
                     %endif
+                    %if is_course_cohorted:
+                    <div class="form-group-label choose-cohort">
+                        Make visible to:
+                        <select class="group-filter-select new-post-group" name = "group_id"> 
+                            <option value="">All Groups</option>
+                            %if is_moderator:
+                              %for c in cohorts:
+                                <option value="${c.id}">${c.name}</option>
+                              %endfor
+                            %else:
+                                %if user_cohort:
+                                    <option value="${user_cohort}">My Cohort</option>
+                                %endif
+                            %endif
+
+                        </select>
+                    </div>
+                    %endif
                 </div>
             </div>
             <div class="right-column">
diff --git a/lms/templates/discussion/_single_thread.html b/lms/templates/discussion/_single_thread.html
index c7644dcbef..0dec32ad47 100644
--- a/lms/templates/discussion/_single_thread.html
+++ b/lms/templates/discussion/_single_thread.html
@@ -4,7 +4,12 @@
 <article class="discussion-article" data-id="${discussion_id| h}">
   <a href="#" class="dogear"></a>
   <div class="discussion-post">
+  
     <header>
+    %if thread['group_id']
+      <div class="group-visibility-label">This post visible only to group ${cohort_dictionary[thread['group_id']]}. </div>
+    %endif
+      
         <a href="#" class="vote-btn discussion-vote discussion-vote-up"><span class="plus-icon">+</span> <span class='votes-count-number'>${thread['votes']['up_count']}</span></a>
       <h1>${thread['title']}</h1>
       <p class="posted-details">
diff --git a/lms/templates/discussion/_thread_list_template.html b/lms/templates/discussion/_thread_list_template.html
index 5e1c826b45..34038d9909 100644
--- a/lms/templates/discussion/_thread_list_template.html
+++ b/lms/templates/discussion/_thread_list_template.html
@@ -2,7 +2,7 @@
     <div class="browse-search">
         <div class="browse is-open">
             <a href="#" class="browse-topic-drop-icon"></a>
-            <a href="#" class="browse-topic-drop-btn"><span class="current-board">All</span> <span class="drop-arrow">▾</span></a>
+            <a href="#" class="browse-topic-drop-btn"><span class="current-board">Show All Discussions</span> <span class="drop-arrow">▾</span></a>
         </div>
         <%include file="_filter_dropdown.html" />
         <div class="search">
@@ -18,6 +18,17 @@
             <li><a href="#" data-sort="votes">votes</a></li>
             <li><a href="#" data-sort="comments">comments</a></li>
         </ul>
+        
+
+        %if is_course_cohorted and is_moderator:
+        <span class="group-filter-label cohort">Show:</span>
+            <select class="group-filter-select cohort-options cohort"> 
+                <option value="all">View All</option>
+                    %for c in cohorts:
+                        <option value="${c.id}">View as ${c.name}</option>
+                    %endfor
+            </select>        
+        %endif
     </div>
     <div class="post-list-wrapper">
         <ul class="post-list">
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index be238811c2..de1ff394bd 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -26,6 +26,10 @@
   <div class="discussion-post">
       <div><a href="javascript:void(0)" class="dogear action-follow" data-tooltip="follow"></a></div>
       <header>
+      ${"<% if (obj.group_id) { %>"}
+      <div class="group-visibility-label">${"<%- obj.group_string%>"}</div>
+              ${"<% }  %>"}      
+      
           <a href="#" class="vote-btn discussion-vote discussion-vote-up" data-role="discussion-vote" data-tooltip="vote"><span class="plus-icon">+</span> <span class='votes-count-number'>${'<%- votes["up_count"] %>'}</span></a>
           <h1>${'<%- title %>'}</h1>
           <p class="posted-details">
diff --git a/lms/templates/discussion/mustache/_content.mustache b/lms/templates/discussion/mustache/_content.mustache
index 8f2ebca2a9..6bcf048915 100644
--- a/lms/templates/discussion/mustache/_content.mustache
+++ b/lms/templates/discussion/mustache/_content.mustache
@@ -1,4 +1,5 @@
 <div class="discussion-content local{{#content.roles}} role-{{name}}{{/content.roles}}">
+CONTENT MUSTACHE
   <div class="discussion-content-wrapper">
     <div class="discussion-votes">
       <a class="discussion-vote discussion-vote-up" href="javascript:void(0)" value="up">&#9650;</a>
diff --git a/lms/templates/discussion/mustache/_inline_discussion.mustache b/lms/templates/discussion/mustache/_inline_discussion.mustache
index 0140a6221a..6c57fa9dfe 100644
--- a/lms/templates/discussion/mustache/_inline_discussion.mustache
+++ b/lms/templates/discussion/mustache/_inline_discussion.mustache
@@ -1,6 +1,4 @@
 <section class="discussion" data-discussion-id="{{discussionId}}">
-    
-
     <article class="new-post-article">
         <span class="topic"  data-discussion-id="{{discussionId}}" />
         <div class="inner-wrapper">
diff --git a/lms/templates/discussion/mustache/_inline_discussion_cohorted.mustache b/lms/templates/discussion/mustache/_inline_discussion_cohorted.mustache
new file mode 100644
index 0000000000..6daef10dbb
--- /dev/null
+++ b/lms/templates/discussion/mustache/_inline_discussion_cohorted.mustache
@@ -0,0 +1,56 @@
+<section class="discussion" data-discussion-id="{{discussionId}}">
+    <article class="new-post-article">
+        <span class="topic"  data-discussion-id="{{discussionId}}" />
+        <div class="inner-wrapper">
+            <div class="new-post-form-errors">
+            </div>
+            <form class="new-post-form">
+                <div class="form-row">
+                    <input type="text" class="new-post-title" name="title" placeholder="Title">
+                </div>
+                <div class="form-row">
+                    <div class="new-post-body" name="body" placeholder="Enter your question or comment&hellip;"></div>
+                    <!---<div class="new-post-preview"><span class="new-post-preview-label">Preview</span></div>-->
+                </div>
+                {{! TODO tags: Getting rid of tags for now. }}
+                {{!<div class="form-row">}}
+                {{!    <input type="text" class="new-post-tags" name="tags" placeholder="Tags">}}
+                {{!</div>}}
+                <input type="submit" class="submit" value="Add post">
+                <a href="#" class="new-post-cancel">Cancel</a>
+                <div class="options">
+                    <input type="checkbox" name="follow" class="discussion-follow" class="discussion-follow" id="new-post-follow" checked><label for="new-post-follow">follow this post</label>
+                    <br>
+                    {{#allow_anonymous}}
+                        <input type="checkbox" name="anonymous" class="discussion-anonymous" id="new-post-anonymous"><label for="new-post-anonymous">post anonymously</label>
+                    {{/allow_anonymous}}
+                    {{#allow_anonymous_to_peers}}
+                        <input type="checkbox" name="anonymous" class="discussion-anonymous-to-peers" id="new-post-anonymous-to-peers"><label for="new-post-anonymous-to-peers">post anonymously to classmates</label>
+                    {{/allow_anonymous_to_peers}}
+                    
+                    <div class="form-group-label choose-cohort">
+                        Make visible to:
+                        <select class="group-filter-select new-post-group" name = "group_id"> 
+                              {{#cohorts}}
+                                <option value="{{id}}">{{name}}</option>
+                              {{/cohorts}}
+                                
+
+                        </select>
+                    </div>                    
+
+                </div>
+            </form>
+        </div>
+    </article>
+
+    <section class="threads">
+        {{#threads}}
+            <article class="discussion-thread" id="thread_{{id}}">
+            </article>
+        {{/threads}}
+    </section>
+
+    <section class="pagination">
+    </section>
+</section>
diff --git a/lms/templates/discussion/mustache/_inline_thread.mustache b/lms/templates/discussion/mustache/_inline_thread.mustache
index 150625bfae..b52d3924e7 100644
--- a/lms/templates/discussion/mustache/_inline_thread.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread.mustache
@@ -1,5 +1,4 @@
 <article class="discussion-article" data-id="{{id}}">
-
     <div class="thread-content-wrapper"></div>
 
     <ol class="responses post-extended-content">
diff --git a/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
new file mode 100644
index 0000000000..9223dfd388
--- /dev/null
+++ b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
@@ -0,0 +1,22 @@
+<article class="discussion-article" data-id="{{id}}">
+<div class="group-visibility-label">{{group_string}}</div>
+    <div class="thread-content-wrapper"></div>
+
+    <ol class="responses post-extended-content">
+        <li class="loading"><div class="loading-animation"></div></li>
+    </ol>
+    <form class="local discussion-reply-new post-extended-content"  data-id="{{id}}">
+        <h4>Post a response:</h4>
+        <ul class="discussion-errors"></ul>
+        <div class="reply-body" data-id="{{id}}"></div>
+        <div class="reply-post-control">
+            <a class="discussion-submit-post control-button" href="#">Submit</a>
+        </div>
+    </form>
+
+    <div class="local post-tools">
+        <a href="javascript:void(0)" class="expand-post">View discussion</a>
+        <a href="javascript:void(0)" class="collapse-post">Hide discussion</a>
+    </div>
+
+</article>
\ No newline at end of file
diff --git a/lms/templates/feed.rss b/lms/templates/feed.rss
index 8048c86cbd..a5b40ca11c 100644
--- a/lms/templates/feed.rss
+++ b/lms/templates/feed.rss
@@ -6,7 +6,16 @@
   <link type="text/html" rel="alternate" href="http://blog.edx.org/"/>
   ##<link type="application/atom+xml" rel="self" href="https://github.com/blog.atom"/>
   <title>EdX Blog</title>
-  <updated>2013-01-30T14:00:12-07:00</updated>
+  <updated>2013-02-20T14:00:12-07:00</updated>
+  <entry>
+    <id>tag:www.edx.org,2012:Post/13</id>
+    <published>2013-02-20T10:00:00-07:00</published>
+    <updated>2013-02-20T10:00:00-07:00</updated>
+    <link type="text/html" rel="alternate" href="${reverse('press/edx-expands-internationally')}"/>
+    <title>edX Expands Internationally and Doubles its Institutional Membership with the Addition of Six New Schools</title>
+    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt;
+        &lt;p&gt;&lt;/p&gt;</content>
+  </entry>
   <entry>
     <id>tag:www.edx.org,2012:Post/13</id>
     <published>2013-01-30T10:00:00-07:00</published>
@@ -16,15 +25,6 @@
     <content type="html">&lt;img src=&quot;${static.url('images/press/releases/eric-lander_240x180.jpg')}&quot; /&gt;
         &lt;p&gt;&lt;/p&gt;</content>
   </entry>
-  <entry>
-    <id>tag:www.edx.org,2012:Post/12</id>
-    <published>2013-01-29T10:00:00-07:00</published>
-    <updated>2013-01-29T10:00:00-07:00</updated>
-    <link type="text/html" rel="alternate" href="${reverse('press/bostonx-announcement')}"/>
-    <title>City of Boston and edX partner to establish BostonX to improve educational access for residents</title>
-    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt;
-        &lt;p&gt;&lt;/p&gt;</content>
-  </entry>
   <entry>
     <id>tag:www.edx.org,2012:Post/11</id>
     <published>2013-01-22T10:00:00-07:00</published>
@@ -34,6 +34,15 @@
     <content type="html">&lt;img src=&quot;${static.url('images/press/releases/dr-lewin-316_240x180.jpg')}&quot; /&gt;
         &lt;p&gt;&lt;/p&gt;</content>
   </entry>
+  <entry>
+    <id>tag:www.edx.org,2012:Post/12</id>
+    <published>2013-01-29T10:00:00-07:00</published>
+    <updated>2013-01-29T10:00:00-07:00</updated>
+    <link type="text/html" rel="alternate" href="${reverse('press/bostonx-announcement')}"/>
+    <title>City of Boston and edX partner to establish BostonX to improve educational access for residents</title>
+    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt;
+        &lt;p&gt;&lt;/p&gt;</content>
+  </entry>
   <!-- <entry> -->
   <!--   <id>tag:www.edx.org,2012:Post/10</id> -->
   <!--   <published>2012-12-19T14:00:00-07:00</published> -->
diff --git a/lms/templates/index.html b/lms/templates/index.html
index d08ba09e61..f2fc34c8ec 100644
--- a/lms/templates/index.html
+++ b/lms/templates/index.html
@@ -47,8 +47,8 @@
     <section class="highlighted-courses">
       <h2>Explore free courses from <span class="edx">edX</span> universities</h2>
 
-      <section class="university-partners">
-        <ol class="partners partners-primary">
+      <section class="university-partners university-partners2x6">
+        <ol class="partners">
           <li class="partner mit">
             <a href="${reverse('university_profile', args=['MITx'])}">
               <img src="${static.url('images/university/mit/mit.png')}" />
@@ -65,7 +65,7 @@
               </div>
             </a>
           </li>
-          <li class="partner last">
+          <li class="partner">
             <a href="${reverse('university_profile', args=['BerkeleyX'])}">
               <img src="${static.url('images/university/berkeley/berkeley.png')}" />
               <div class="name">
@@ -73,11 +73,6 @@
               </div>
             </a>
           </li>
-        </ol>
-
-        <hr />
-
-        <ol class="partners">
           <li class="partner">
             <a href="${reverse('university_profile', args=['UTx'])}">
               <img src="${static.url('images/university/ut/ut-rollover_350x150.png')}" />
@@ -86,6 +81,27 @@
               </div>
             </a>
           </li>
+          <li class="partner">
+            <a href="${reverse('university_profile', args=['McGillX'])}">
+              <img src="${static.url('images/university/mcgill/mcgill.png')}" />
+              <div class="name">
+                <span>McGillX</span>
+              </div>
+            </a>
+          </li>
+          <li class="partner">
+            <a href="${reverse('university_profile', args=['ANUx'])}">
+              <img src="${static.url('images/university/anu/anu.png')}" />
+              <div class="name">
+                <span>ANUx</span>
+              </div>
+            </a>
+          </li>
+        </ol>
+
+        <hr />
+
+        <ol class="partners">
           <li class="partner">
             <a href="${reverse('university_profile', args=['WellesleyX'])}">
               <img src="${static.url('images/university/wellesley/wellesley-rollover_350x150.png')}" />
@@ -94,7 +110,7 @@
               </div>
             </a>
           </li>
-          <li class="partner last">
+          <li class="partner">
             <a href="${reverse('university_profile', args=['GeorgetownX'])}">
               <img src="${static.url('images/university/georgetown/georgetown-rollover_350x150.png')}" />
               <div class="name">
@@ -102,6 +118,38 @@
               </div>
             </a>
           </li>
+          <li class="partner">
+            <a href="${reverse('university_profile', args=['TorontoX'])}">
+              <img src="${static.url('images/university/toronto/toronto.png')}" />
+              <div class="name">
+                <span>University of TorontoX</span>
+              </div>
+            </a>
+          </li>
+          <li class="partner">
+            <a href="${reverse('university_profile', args=['EPFLx'])}">
+              <img src="${static.url('images/university/epfl/epfl.png')}" />
+              <div class="name">
+                <span>EPFLx</span>
+              </div>
+            </a>
+          </li>
+          <li class="partner">
+            <a href="${reverse('university_profile', args=['DelftX'])}">
+              <img src="${static.url('images/university/delft/delft.png')}" />
+              <div class="name">
+                <span>DelftX</span>
+              </div>
+            </a>
+          </li>
+          <li class="partner">
+            <a href="${reverse('university_profile', args=['RiceX'])}">
+              <img src="${static.url('images/university/rice/rice.png')}" />
+              <div class="name">
+                <span>RiceX</span>
+              </div>
+            </a>
+          </li>
         </ol>
       </section>
 
diff --git a/lms/templates/instructor/staff_grading.html b/lms/templates/instructor/staff_grading.html
index bd9dde7117..1c5f7364ad 100644
--- a/lms/templates/instructor/staff_grading.html
+++ b/lms/templates/instructor/staff_grading.html
@@ -78,6 +78,7 @@
 <p>
    Flag as inappropriate content for later review <input class="flag-checkbox" type="checkbox" />
 </p>
+</div>
   
 
 <div class="submission">
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index 64defedda4..9fb136cee6 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -15,7 +15,12 @@
     % elif state in ['done', 'post_assessment'] and correct == 'incorrect':
     <span class="incorrect" id="status_${id}"></span> <p>Incorrect. </p>
     % elif state == 'assessing':
-      <span class="grading" id="status_${id}">Submitted for grading.</span>
+      <span class="grading" id="status_${id}">Submitted for grading.
+      % if eta_message is not None:
+         ${eta_message}
+      % endif
+      </span>
+
     % endif
 
     % if hidden:
diff --git a/lms/templates/open_ended_problems/open_ended_problems.html b/lms/templates/open_ended_problems/open_ended_problems.html
index 07d379fe32..3709fb2de6 100644
--- a/lms/templates/open_ended_problems/open_ended_problems.html
+++ b/lms/templates/open_ended_problems/open_ended_problems.html
@@ -27,7 +27,8 @@
             <tr>
                 <th>Problem Name</th>
                 <th>Status</th>
-                <th>Type of Grading</th>
+                <th>Grader Type</th>
+                <th>ETA</th>
             </tr>
             %for problem in problem_list:
             <tr>
@@ -40,6 +41,9 @@
                 <td> 
                     ${problem['grader_type']}
                 </td>
+                <td>
+                    ${problem['eta_string']}
+                </td>
             </tr>
             %endfor
         </table>
diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
index 2cbab3ab3b..144cd829d9 100644
--- a/lms/templates/open_ended_rubric.html
+++ b/lms/templates/open_ended_rubric.html
@@ -14,7 +14,7 @@
                         <li class="rubric-list-item">
                     % endif
                     <label class="rubric-label" for="score-${i}-${j}">
-                        <input type="radio" class="score-selection" name="score-selection-${i}" id="score-${i}-${j}" value="${option['points']}"/>
+                        <input type="radio" class="score-selection" data-category="${i}" name="score-selection-${i}" id="score-${i}-${j}" value="${option['points']}"/>
                         <span class="wrappable"> ${option['points']} points : ${option['text']}</span>
                     </label>
                     </li>
diff --git a/lms/templates/peer_grading/peer_grading.html b/lms/templates/peer_grading/peer_grading.html
index d309b4486c..0485b698b2 100644
--- a/lms/templates/peer_grading/peer_grading.html
+++ b/lms/templates/peer_grading/peer_grading.html
@@ -14,6 +14,7 @@
                 <table class="problem-list">
                     <tr>
                         <th>Problem Name</th>
+                        <th>Due date</th>
                         <th>Graded</th>
                         <th>Available</th>
                         <th>Required</th>
@@ -22,7 +23,18 @@
                 %for problem in problem_list:
                 <tr data-graded="${problem['num_graded']}" data-required="${problem['num_required']}">
                     <td class="problem-name">
-                        <a href="#problem" data-location="${problem['location']}" class="problem-button">${problem['problem_name']}</a>
+                        %if problem['closed']:
+                            ${problem['problem_name']}
+                        %else:
+                            <a href="#problem" data-location="${problem['location']}" class="problem-button">${problem['problem_name']}</a>
+                        %endif
+                    </td>
+                    <td>
+                        % if problem['due']:
+                            ${problem['due']}
+                        % else:
+                            No due date
+                        % endif
                     </td>
                     <td>
                         ${problem['num_graded']}
diff --git a/lms/templates/peer_grading/peer_grading_closed.html b/lms/templates/peer_grading/peer_grading_closed.html
new file mode 100644
index 0000000000..712ad8b380
--- /dev/null
+++ b/lms/templates/peer_grading/peer_grading_closed.html
@@ -0,0 +1,10 @@
+<section class="container peer-grading-container">
+<h2>Peer Grading</h2>
+    <p>The due date has passed, and
+    % if use_for_single_location:
+        peer grading for this problem is closed at this time.
+    %else:
+        peer grading is closed at this time.
+    %endif
+    </p>
+</section>
diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html
index 9468b594a2..87559ec877 100644
--- a/lms/templates/peer_grading/peer_grading_problem.html
+++ b/lms/templates/peer_grading/peer_grading_problem.html
@@ -43,7 +43,8 @@
           <p>Please include some written feedback as well.</p>
           <textarea name="feedback" placeholder="Feedback for student"
                     class="feedback-area" cols="70" ></textarea>
-          <p class="flag-student-container">Flag this submission for review by course staff (use if the submission contains inappropriate content): <input type="checkbox" class="flag-checkbox" value="student_is_flagged"></p>
+          <div class="flag-student-container"> <input type="checkbox" class="flag-checkbox" value="student_is_flagged"> Flag this submission for review by course staff (use if the submission contains inappropriate content) </div>
+          <div class="answer-unknown-container"> <input type="checkbox" class="answer-unknown-checkbox" value="answer_is_unknown"> I do not know how to grade this question </div>
         </div>
           
 
diff --git a/lms/templates/static_pdfbook.html b/lms/templates/static_pdfbook.html
new file mode 100644
index 0000000000..013413b62d
--- /dev/null
+++ b/lms/templates/static_pdfbook.html
@@ -0,0 +1,131 @@
+<%inherit file="main.html" />
+<%namespace name='static' file='static_content.html'/>
+<%block name="title">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title>${course.number} Textbook</title>
+</%block>
+
+<%block name="headextra">
+<%static:css group='course'/>
+<%static:js group='courseware'/>
+    <link rel="stylesheet" href="/static/css/pdfviewer.css"/>
+    <script type="text/javascript" src="/static/js/vendor/pdfjs/pdf.js"></script>
+    <script type="text/javascript" src="/static/js/pdfviewer.js"></script> 
+</%block>
+
+<%block name="js_extra">
+  <script type="text/javascript">
+
+    $(document).ready(function() {
+        var options = {};
+        %if 'url' in textbook:
+            options.url = "${textbook['url']}";
+        %endif
+        %if 'chapters' in textbook:
+            var chptrs = [];
+            %for chap in textbook['chapters']:
+                chptrs.push("${chap['url']}");
+            %endfor
+            options.chapters = chptrs;
+        %endif
+        %if chapter is not None:
+            options.chapterNum = ${chapter};
+        %endif
+        %if page is not None:
+            options.pageNum = ${page};
+        %endif
+    
+        $('#outerContainer').PDFViewer(options);
+    });
+  </script>  
+</%block>
+
+<%include file="/courseware/course_navigation.html" args="active_page='pdftextbook/{0}'.format(book_index)" />
+
+    <div id="outerContainer">
+      <div id="mainContainer" class="book-wrapper">
+
+        <div class="toolbar">
+          <div id="toolbarContainer">
+            <div id="toolbarViewer">
+              <div id="toolbarViewerLeft">
+                <label id="pageNumberLabel" class="toolbarLabel" for="pageNumber">Page: </label>
+                <input type="number" id="pageNumber" class="toolbarField pageNumber" value="1" size="4" min="1" tabindex="7">
+                </input>
+                <span id="numPages" class="toolbarLabel"></span>
+              </div>
+
+              <div class="outerCenter">
+                <div class="innerCenter" id="toolbarViewerMiddle">
+                  <div class="splitToolbarButton">
+                    <button class="toolbarButton zoomOut" id="zoom_out" title="Zoom Out" tabindex="8">
+                      <span>Zoom Out</span>
+                    </button>
+                    <div class="splitToolbarButtonSeparator"></div>
+                    <button class="toolbarButton zoomIn" id="zoom_in" title="Zoom In" tabindex="9">
+                      <span>Zoom In</span>
+                     </button>
+                  </div>
+                  <span id="scaleSelectContainer" class="dropdownToolbarButton">
+                     <select id="scaleSelect" title="Zoom" oncontextmenu="return false;" tabindex="10">
+<!--
+                      <option id="pageAutoOption" value="auto" selected="selected">Automatic Zoom</option>
+                      <option id="pageActualOption" value="page-actual">Actual Size</option>
+                      <option id="pageFitOption" value="page-fit">Fit Page</option>
+                      <option id="pageWidthOption" value="page-width">Full Width</option>
+-->
+                      <option id="customScaleOption" value="custom"></option>
+                      <option value="0.5">50%</option>
+                      <option value="0.75">75%</option>
+                      <option value="1">100%</option>
+                      <option value="1.25">125%</option>
+                      <option value="1.5">150%</option>
+                      <option value="2">200%</option>
+                    </select>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+%if 'chapters' in textbook:
+    <section aria-label="Textbook Navigation" class="book-sidebar">
+
+      <ul id="booknav" class="treeview-booknav">
+          <%def name="print_entry(entry, index_value)">
+              <li id="pdfchapter-${index_value}">
+                <a class="chapter">
+                  ${entry.get('title')}
+                </a>
+              </li>
+          </%def>
+
+          % for (index, entry) in enumerate(textbook['chapters']):
+            ${print_entry(entry, index+1)}
+          % endfor
+      </ul>
+    </section>
+%endif
+
+        <section id="viewerContainer" class="book">
+	  <!-- use same page-turning as used in image-based textbooks -->
+          <nav>
+            <ul>
+              <li class="last">
+                <a id="previous">Previous page</a>
+              </li>
+              <li class="next">
+                <a id="next">Next page</a>
+              </li>
+            </ul>
+          </nav>
+
+          <div id="viewer" contextmenu="viewerContextMenu"></div>
+        </div>
+
+
+      </div> <!-- mainContainer -->
+
+    </div> <!-- outerContainer -->
diff --git a/lms/templates/static_templates/press_releases/edx_expands_internationally.html b/lms/templates/static_templates/press_releases/edx_expands_internationally.html
new file mode 100644
index 0000000000..0ee42dafa9
--- /dev/null
+++ b/lms/templates/static_templates/press_releases/edx_expands_internationally.html
@@ -0,0 +1,81 @@
+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="../../main.html" />
+
+<%namespace name='static' file='../../static_content.html'/>
+
+<%block name="title"><title>edX Expands Internationally and Doubles its Institutional Membership with the Addition of Six New Schools</title></%block>
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+<section class="pressrelease">
+  <section class="container">
+    <h1>edX Expands Internationally and Doubles its Institutional Membership with the Addition of Six New Schools</h1>
+    <hr class="horizontal-divider">
+      <article>
+    <h2>edX welcomes The Australian National University, Delft University of Technology, École Polytechnique Fédérale de Lausanne, McGill University, Rice University and University of Toronto to its X University Consortium of the world’s leading higher education institutions</h2>
+
+        <p><strong>CAMBRIDGE, MA  &ndash; Feb. 20, 2013 &ndash;</strong>
+<a href="https://www.edx.org/">EdX</a>, the not-for-profit online learning enterprise founded by Harvard University and the Massachusetts Institute of Technology (MIT), announced today the international expansion of its X University Consortium with the addition of six new global higher education institutions. The Australian National University (ANU), Delft University of Technology in the Netherlands, École Polytechnique Fédérale de Lausanne (EPFL) in Switzerland, McGill University and the University of Toronto in Canada, and Rice University in the United States are joining the Consortium and will use the edX platform to deliver the next generation of online and blended courses. This international expansion enables edX to better achieve its mission of providing world-class courses to everyone, everywhere, and is the natural next step to continue serving the large international student body already using edX on a daily basis.
+</p>
+
+<p>While MOOCs, or massive open online courses, have typically focused on offering a variety of online courses inexpensively or for free, edX's vision is much larger. EdX is building an open source educational platform and a network of the world's top universities to improve education both online and on campus while conducting research on how students learn. To date, edX has more than 700,000 individuals on its platform, who account for more than 900,000 course enrollments. The addition of these new higher education institutions stretching from North America to Europe to the Asia Pacific will double the number of X University Consortium members and add a rich variety of new courses to edX’s offerings:
+</p>
+
+<ul>
+  <li>The Australian National University, a celebrated place of intensive research, education and policy engagement, will provide a series of <a href="https://www.edx.org/university_profile/ANUx">ANUx</a> courses to the open source platform including Astrophysics taught by Nobel Laureate and Professor of Astrophysics Brian Schmidt and his colleague Dr. Paul Francis, and Engaging India, taught by Dr. McComas Taylor and Dr. Peter Friedlander.</li>
+
+  <li>Delft University of Technology, the largest and oldest technological university in the Netherlands, will provide a series of <a href="https://www.edx.org/university_profile/DelftX">DelftX</a> courses under Creative Commons license, including Introduction to Aerospace Engineering by Professor Jacco Hoekstra, Solar Energy by Dr. Arno Smets, and Water Treatment Engineering by Professor Jules van Lier.</li>
+
+  <li>École Polytechnique Fédérale de Lausanne, one of the most famous institutions of science and technology in Europe, will provide a series of <a href="https://www.edx.org/university_profile/EPFLx">EPFLx</a> courses specially tailored to fit the edX format, originating from its five schools -- Engineering, Life Sciences, Informatics and Communication, Architecture and Basic Sciences.</li>
+
+  <li>McGill University, one of Canada's best-known institutions of higher learning and one of the leading universities in the world, will provide a series of <a href="https://www.edx.org/university_profile/McGillX">McGillX</a> courses in areas ranging from science and the humanities to public policy issues.</li>
+
+  <li>Rice University, in Houston, Texas, is consistently ranked among the nation's top 20 universities by U.S. News & World Report. Rice has highly respected schools of Architecture, Business, Continuing Studies, Engineering, Humanities, Music, Natural Sciences and Social Sciences and is home to the Baker Institute for Public Policy. Rice's Smalley Institute for Nanoscale Science and Technology was the world’s first nanotechnology center when it opened in 1991. Rice will initially provide four <a href="https://www.edx.org/university_profile/RiceX">RiceX</a> courses and investigate ways to integrate its learning analytics tools from OpenStax Tutor to enable students and instructors to track their progress in real time.</li>
+
+  <li>University of Toronto, one of the most respected and influential institutions of higher education and advanced research in the world, will provide a series of <a href="https://www.edx.org/university_profile/TorontoX">TorontoX</a> courses including Terrestrial Energy System by Professor Bryan Kanrey, Behavioral Economics by Professor Dilip Soman, The Logic of Business: Building Blocks for Organizational Design by Professor Mihnea Moldoveanu, and Bioinformatic Methods by Professor Nicholas Provart.</li>
+</ul> 
+
+  <p>“We have had an international student community from the very beginning, and bringing these leading universities, from North America and Europe and the Asia Pacific into the edX organization will help us meet the tremendous demand we are experiencing,” said Anant Agarwal, President of edX. “Each of these schools was carefully selected for the distinct expertise they bring to our growing family of edX institutions. We remain committed to growing edX to meet the needs of the world while maintaining a superior learning experience for all.”</p>
+
+  <p>Courses offered by institutions on the edX platform provide the same rigor as on-campus classes but are designed to take advantage of the unique features and benefits of online learning environments, including game-like experiences, instant feedback and cutting-edge virtual laboratories. Through edX, the new X Universities will provide interactive education experiences for students around the world. All that is required of edX students is access to the Internet and a desire to learn. By breaking down the barriers of location and cost and enabling the global exchange of information and ideas, edX is changing the foundations of both teaching and learning.</p>
+
+<p>The new member institutions will join founding universities MIT and Harvard, as well as the University of California, Berkeley, the University of Texas System, Wellesley College and Georgetown University in the X University Consortium. ANUx, DelftX, EPFLx, McGillX, RiceX and TorontoX will offer courses on edX beginning in late 2013. All of the courses will be hosted on edX’s open source platform at www.edx.org.
+</p>
+
+<h2>About edX</h2>
+
+<p><a href="https://www.edx.org/">EdX</a> is a not-for-profit enterprise of its founding partners <a href="http://www.harvard.edu">Harvard University</a> and the <a href="http://www.mit.edu">Massachusetts Institute of Technology</a> focused on transforming online and on-campus learning through groundbreaking methodologies, game-like experiences and cutting-edge research. EdX provides inspirational and transformative knowledge to students of all ages, social status, and income who form worldwide communities of learners. EdX uses its open source technology to transcend physical and social borders. We’re focused on people, not profit. EdX is based in Cambridge, Massachusetts in the USA.</p>
+
+
+      <section class="contact">
+        <p><strong>Media Contact:</strong></p>
+        <p>Dan O'Connell</p>
+        <p>oconnell@edx.org</p>
+        <p>(617) 480-6585</p>
+      </section>
+
+      <section class="footer">
+        <hr class="horizontal-divider">
+        <div class="logo"></div><h3 class="date">02 - 20 - 2013</h3>
+        <div class="social-sharing">
+        <hr class="horizontal-divider">
+          <p>Share with friends and family:</p>
+          <a href="http://twitter.com/intent/tweet?text=:edX+expands+internationally+http://www.edx.org/press/edx-expands-internationally" class="share">
+            <img src="${static.url('images/social/twitter-sharing.png')}">
+          </a>
+        </a>
+        <a href="mailto:?subject=edX%20expands%20internationally…http://edx.org/press/edx-expands-internationally" class="share">
+          <img src="${static.url('images/social/email-sharing.png')}">
+        </a>
+        <div class="fb-like" data-href="http://edx.org/press/edx-expands-internationally" data-send="true" data-width="450" data-show-faces="true"></div>
+      </div>
+      </section>
+    </article>
+  </section>
+</section>
diff --git a/lms/templates/static_templates/press_releases/template.html b/lms/templates/static_templates/press_releases/template.html
index bf2ba9bc6f..52eebf49f5 100644
--- a/lms/templates/static_templates/press_releases/template.html
+++ b/lms/templates/static_templates/press_releases/template.html
@@ -33,10 +33,10 @@ Text</p>
 
 
       <section class="contact">
-        <p><strong>Contact:</strong></p>
-        <p>Brad Baker, Weber Shandwick for edX</p>
-        <p>BBaker@webershandwick.com</p>
-        <p>(617) 520-7043</p>
+        <p><strong>Media Contact:</strong></p>
+        <p>Dan O'Connell</p>
+        <p>oconnell@edx.org</p>
+        <p>(617) 480-6585</p>
       </section>
 
       <section class="footer">
@@ -49,7 +49,7 @@ Text</p>
             <img src="${static.url('images/social/twitter-sharing.png')}">
           </a>
         </a>
-        <a href="mailto:?subject=BLAH%BLAH%BLAH…http://edx.org/press/LINK" class="share">
+        <a href="mailto:?subject=BLAH%20BLAH%20BLAH…http://edx.org/press/LINK" class="share">
           <img src="${static.url('images/social/email-sharing.png')}">
         </a>
         <div class="fb-like" data-href="http://edx.org/press/LINK" data-send="true" data-width="450" data-show-faces="true"></div>
diff --git a/lms/templates/university_profile/anux.html b/lms/templates/university_profile/anux.html
new file mode 100644
index 0000000000..c19310c70f
--- /dev/null
+++ b/lms/templates/university_profile/anux.html
@@ -0,0 +1,24 @@
+<%inherit file="base.html" />
+<%namespace name='static' file='../static_content.html'/>
+
+<%block name="title"><title>ANUx</title></%block>
+
+<%block name="university_header">
+  <header class="search" style="background: url('/static/images/university/anu/anu-cover.jpg')">
+    <div class="inner-wrapper university-search">
+      <hgroup>
+        <div class="logo">
+           <img src="${static.url('images/university/anu/anu.png')}" />
+        </div>
+        <h1>ANUx</h1>
+      </hgroup>
+    </div>
+  </header>
+
+</%block>
+
+<%block name="university_description">
+    <p>The Australian National University (ANU) is a celebrated place of intensive research, education and policy engagement. Our research has always been central to everything we do, shaping a holistic learning experience that goes beyond the classroom, giving students access to researchers who are among the best in their fields and to opportunities for development around Australia and the world.</p>
+</%block>
+
+${parent.body()}
diff --git a/lms/templates/university_profile/delftx.html b/lms/templates/university_profile/delftx.html
new file mode 100644
index 0000000000..feb3092dd9
--- /dev/null
+++ b/lms/templates/university_profile/delftx.html
@@ -0,0 +1,24 @@
+<%inherit file="base.html" />
+<%namespace name='static' file='../static_content.html'/>
+
+<%block name="title"><title>DelftX</title></%block>
+
+<%block name="university_header">
+  <header class="search" style="background: url('/static/images/university/delft/delft-cover.jpg')">
+    <div class="inner-wrapper university-search">
+      <hgroup>
+        <div class="logo">
+           <img src="${static.url('images/university/delft/delft.png')}" />
+        </div>
+        <h1>DelftX</h1>
+      </hgroup>
+    </div>
+  </header>
+
+</%block>
+
+<%block name="university_description">
+    <p>Delft University of Technology is the largest and oldest technological university in the Netherlands. Our research is inspired by the desire to increase fundamental understanding, as well as by societal challenges. We encourage our students to be independent thinkers so they will become engineers capable of solving complex problems. Our students have chosen Delft University of Technology because of our reputation for quality education and research.</p>
+</%block>
+
+${parent.body()}
diff --git a/lms/templates/university_profile/epflx.html b/lms/templates/university_profile/epflx.html
new file mode 100644
index 0000000000..5119a223de
--- /dev/null
+++ b/lms/templates/university_profile/epflx.html
@@ -0,0 +1,27 @@
+<%inherit file="base.html" />
+<%namespace name='static' file='../static_content.html'/>
+
+<%block name="title"><title>EPFLx</title></%block>
+
+<%block name="university_header">
+  <header class="search" style="background: url('/static/images/university/epfl/epfl-cover.jpg')">
+    <div class="inner-wrapper university-search">
+      <hgroup>
+        <div class="logo">
+           <img src="${static.url('images/university/epfl/epfl.png')}" />
+        </div>
+        <h1>EPFLx</h1>
+      </hgroup>
+    </div>
+  </header>
+
+</%block>
+
+<%block name="university_description">
+    <p>EPFL is one of the two Swiss Federal Institutes of Technology. With the status of a national school since 1969, the young engineering school has grown in many dimensions, to the extent of becoming one of the most famous European institutions of science and technology. It has three core missions: training, research and technology transfer. </p>
+
+ <p>EPFL is located in Lausanne in Switzerland, on the shores of the largest lake in Europe, Lake Geneva and at the foot of the Alps and Mont-Blanc. Its main campus brings together over 11,000 persons, students, researchers and staff in the same magical place. Because of its dynamism and rich student community, EPFL has been able to create a special spirit imbued with curiosity and simplicity. Daily interactions amongst students, researchers and entrepreneurs on campus give rise to new scientific, technological and architectural projects.
+</p>
+</%block>
+
+${parent.body()}
diff --git a/lms/templates/university_profile/mcgillx.html b/lms/templates/university_profile/mcgillx.html
new file mode 100644
index 0000000000..ca0801aa3b
--- /dev/null
+++ b/lms/templates/university_profile/mcgillx.html
@@ -0,0 +1,24 @@
+<%inherit file="base.html" />
+<%namespace name='static' file='../static_content.html'/>
+
+<%block name="title"><title>McGillX</title></%block>
+
+<%block name="university_header">
+  <header class="search" style="background: url('/static/images/university/mcgill/mcgill-cover.jpg')">
+    <div class="inner-wrapper university-search">
+      <hgroup>
+        <div class="logo">
+           <img src="${static.url('images/university/mcgill/mcgill.png')}" />
+        </div>
+        <h1>McGillX</h1>
+      </hgroup>
+    </div>
+  </header>
+
+</%block>
+
+<%block name="university_description">
+    <p>McGill University is one of Canada's best-known institutions of higher learning and one of the leading universities in the world. McGill is located in vibrant multicultural Montreal, in the province of Quebec. Our 11 faculties and 11 professional schools offer more than 300 programs to some 38,000 graduate, undergraduate and continuing studies students. McGill ranks 1st in Canada among medical-doctoral universities (Maclean’s) and 18th in the world (QS World University Rankings).</p>
+</%block>
+
+${parent.body()}
diff --git a/lms/templates/university_profile/ricex.html b/lms/templates/university_profile/ricex.html
new file mode 100644
index 0000000000..36acea2836
--- /dev/null
+++ b/lms/templates/university_profile/ricex.html
@@ -0,0 +1,24 @@
+<%inherit file="base.html" />
+<%namespace name='static' file='../static_content.html'/>
+
+<%block name="title"><title>RiceX</title></%block>
+
+<%block name="university_header">
+  <header class="search" style="background: url('/static/images/university/rice/rice-cover.jpg')">
+    <div class="inner-wrapper university-search">
+      <hgroup>
+        <div class="logo">
+           <img src="${static.url('images/university/rice/rice.png')}" />
+        </div>
+        <h1>RiceX</h1>
+      </hgroup>
+    </div>
+  </header>
+
+</%block>
+
+<%block name="university_description">
+    <p>Located on a 300-acre forested campus in Houston, Rice University is consistently ranked among the nation's top 20 universities by U.S. News & World Report. Rice has highly respected schools of Architecture, Business, Continuing Studies, Engineering, Humanities, Music, Natural Sciences and Social Sciences and is home to the Baker Institute for Public Policy. With 3,708 undergraduates and 2,374 graduate students, Rice's undergraduate student-to-faculty ratio is 6-to-1. Its residential college system builds close-knit communities and lifelong friendships, just one reason why Rice has been ranked No. 1 for best quality of life multiple times by the Princeton Review and No. 2 for "best value" among private universities by Kiplinger's Personal Finance.</p>
+</%block>
+
+${parent.body()}
diff --git a/lms/templates/university_profile/template.html b/lms/templates/university_profile/template.html
new file mode 100644
index 0000000000..44fc3f3ab4
--- /dev/null
+++ b/lms/templates/university_profile/template.html
@@ -0,0 +1,24 @@
+<%inherit file="base.html" />
+<%namespace name='static' file='../static_content.html'/>
+
+<%block name="title"><title>SCHOOLX</title></%block>
+
+<%block name="university_header">
+  <header class="search" style="background: url('/static/images/university/SCHOOL/IMAGE.jpg')">
+    <div class="inner-wrapper university-search">
+      <hgroup>
+        <div class="logo">
+           <img src="${static.url('images/university/SCHOOL/IMAGE.png')}" />
+        </div>
+        <h1>SCHOOLX</h1>
+      </hgroup>
+    </div>
+  </header>
+
+</%block>
+
+<%block name="university_description">
+    <p></p>
+</%block>
+
+${parent.body()}
diff --git a/lms/templates/university_profile/torontox.html b/lms/templates/university_profile/torontox.html
new file mode 100644
index 0000000000..6ae50d21b9
--- /dev/null
+++ b/lms/templates/university_profile/torontox.html
@@ -0,0 +1,24 @@
+<%inherit file="base.html" />
+<%namespace name='static' file='../static_content.html'/>
+
+<%block name="title"><title>University of TorontoX</title></%block>
+
+<%block name="university_header">
+  <header class="search" style="background: url('/static/images/university/toronto/toronto-cover.jpg')">
+    <div class="inner-wrapper university-search">
+      <hgroup>
+        <div class="logo">
+           <img src="${static.url('images/university/toronto/toronto.png')}" />
+        </div>
+        <h1>University of TorontoX</h1>
+      </hgroup>
+    </div>
+  </header>
+
+</%block>
+
+<%block name="university_description">
+    <p>Established in 1827, the University of Toronto is a vibrant and diverse academic community. It includes 80,000 students, 12,000 colleagues holding faculty appointments, 200 librarians, and 6,000 staff members across three distinctive campuses and at many partner sites, including world-renowned hospitals. With over 800 undergraduate programs, 150 graduate programs, and 40 professional programs, U of T attracts students of the highest calibre, from across Canada and from 160 countries around the world. The University is one of the most respected and influential institutions of higher education and advanced research in the world. Its strengths extend across the full range of disciplines: the 2012-13 Times Higher Education ranking groups the University of Toronto with Stanford, UC Berkeley, UCLA, Columbia, Cambridge, Oxford, the University of Melbourne, and the University of Michigan as the only institutions in the top 27 in all 6 broad disciplinary areas. The University is also consistently rated one of Canada’s Top 100 employers, and ranks with Harvard and Yale for the top university library resources in North America.</p>
+</%block>
+
+${parent.body()}
diff --git a/lms/urls.py b/lms/urls.py
index fc42577085..e8b4b17c3c 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -2,6 +2,7 @@ from django.conf import settings
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from django.conf.urls.static import static
+from django.views.generic import RedirectView
 import django.contrib.auth.views
 
 # Uncomment the next two lines to enable the admin:
@@ -65,10 +66,47 @@ urlpatterns = ('',
 
     url(r'^heartbeat$', include('heartbeat.urls')),
 
-    url(r'^university_profile/UTx$', 'courseware.views.static_university_profile', name="static_university_profile", kwargs={'org_id': 'UTx'}),
-    url(r'^university_profile/WellesleyX$', 'courseware.views.static_university_profile', name="static_university_profile", kwargs={'org_id': 'WellesleyX'}),
-    url(r'^university_profile/GeorgetownX$', 'courseware.views.static_university_profile', name="static_university_profile", kwargs={'org_id': 'GeorgetownX'}),
-    url(r'^university_profile/(?P<org_id>[^/]+)$', 'courseware.views.university_profile', name="university_profile"),
+    url(r'^university_profile/UTx$', 'courseware.views.static_university_profile',
+        name="static_university_profile", kwargs={'org_id': 'UTx'}),
+    url(r'^university_profile/WellesleyX$', 'courseware.views.static_university_profile',
+        name="static_university_profile", kwargs={'org_id': 'WellesleyX'}),
+    url(r'^university_profile/GeorgetownX$', 'courseware.views.static_university_profile',
+        name="static_university_profile", kwargs={'org_id': 'GeorgetownX'}),
+
+    # Dan accidentally sent out a press release with lower case urls for McGill, Toronto,
+    # Rice, ANU, Delft, and EPFL.  Hence the redirects.
+    url(r'^university_profile/McGillX$', 'courseware.views.static_university_profile',
+        name="static_university_profile", kwargs={'org_id': 'McGillX'}),
+    url(r'^university_profile/mcgillx$',
+        RedirectView.as_view(url='/university_profile/McGillX')),
+
+    url(r'^university_profile/TorontoX$', 'courseware.views.static_university_profile',
+        name="static_university_profile", kwargs={'org_id': 'TorontoX'}),
+    url(r'^university_profile/torontox$',
+        RedirectView.as_view(url='/university_profile/TorontoX')),
+
+    url(r'^university_profile/RiceX$', 'courseware.views.static_university_profile',
+        name="static_university_profile", kwargs={'org_id': 'RiceX'}),
+    url(r'^university_profile/ricex$',
+        RedirectView.as_view(url='/university_profile/RiceX')),
+
+    url(r'^university_profile/ANUx$', 'courseware.views.static_university_profile',
+        name="static_university_profile", kwargs={'org_id': 'ANUx'}),
+    url(r'^university_profile/anux$',
+        RedirectView.as_view(url='/university_profile/ANUx')),
+
+    url(r'^university_profile/DelftX$', 'courseware.views.static_university_profile',
+        name="static_university_profile", kwargs={'org_id': 'DelftX'}),
+    url(r'^university_profile/delftx$',
+        RedirectView.as_view(url='/university_profile/DelftX')),
+
+    url(r'^university_profile/EPFLx$', 'courseware.views.static_university_profile',
+        name="static_university_profile", kwargs={'org_id': 'EPFLx'}),
+    url(r'^university_profile/epflx$',
+        RedirectView.as_view(url='/university_profile/EPFLx')),
+
+    url(r'^university_profile/(?P<org_id>[^/]+)$', 'courseware.views.university_profile',
+        name="university_profile"),
 
     #Semi-static views (these need to be rendered and have the login bar, but don't change)
     url(r'^404$', 'static_template_view.views.render',
@@ -128,11 +166,14 @@ urlpatterns = ('',
     url(r'^press/eric-lander-secret-of-life$', 'static_template_view.views.render',
         {'template': 'press_releases/eric_lander_secret_of_life.html'},
         name="press/eric-lander-secret-of-life"),
+    url(r'^press/edx-expands-internationally$', 'static_template_view.views.render',
+        {'template': 'press_releases/edx_expands_internationally.html'},
+        name="press/edx-expands-internationally"),
 
 
     # Should this always update to point to the latest press release?
     (r'^pressrelease$', 'django.views.generic.simple.redirect_to',
-     {'url': '/press/eric-lander-secret-of-life'}),
+     {'url': '/press/edx-expands-internationally'}),
 
 
     (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}),
@@ -233,6 +274,17 @@ if settings.COURSEWARE_ENABLED:
             'staticbook.views.index'),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/book-shifted/(?P<page>[^/]*)$',
             'staticbook.views.index_shifted'),
+
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/pdfbook/(?P<book_index>[^/]*)/$',
+            'staticbook.views.pdf_index', name="pdf_book"),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/pdfbook/(?P<book_index>[^/]*)/(?P<page>[^/]*)$',
+            'staticbook.views.pdf_index'),
+
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/pdfbook/(?P<book_index>[^/]*)/chapter/(?P<chapter>[^/]*)/$',
+            'staticbook.views.pdf_index'),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/pdfbook/(?P<book_index>[^/]*)/chapter/(?P<chapter>[^/]*)/(?P<page>[^/]*)$',
+            'staticbook.views.pdf_index'),
+
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/courseware/?$',
             'courseware.views.index', name="courseware"),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/courseware/(?P<chapter>[^/]*)/$',
@@ -241,6 +293,7 @@ if settings.COURSEWARE_ENABLED:
             'courseware.views.index', name="courseware_section"),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/courseware/(?P<chapter>[^/]*)/(?P<section>[^/]*)/(?P<position>[^/]*)/?$',
             'courseware.views.index', name="courseware_position"),
+
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/progress$',
             'courseware.views.progress', name="progress"),
         # Takes optional student_id for instructor use--shows profile as that student sees it.
diff --git a/runone.py b/runone.py
new file mode 100755
index 0000000000..2227ae0adf
--- /dev/null
+++ b/runone.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+from django.core import management
+
+import argparse
+import os
+import sys
+
+# I want this:
+#   ERROR: test_update_and_fetch (mitx.cms.djangoapps.contentstore.tests.test_course_settings.CourseDetailsViewTest)
+# to become:
+#   test --settings=cms.envs.test --pythonpath=. -s cms/djangoapps/contentstore/tests/test_course_settings.py:CourseDetailsViewTest.test_update_and_fetch
+
+def find_full_path(path_to_file):
+    """Find the full path where we only have a relative path from somewhere in the tree."""
+    for subdir, dirs, files in os.walk("."):
+        full = os.path.relpath(os.path.join(subdir, path_to_file))
+        if os.path.exists(full):
+            return full
+
+def main(argv):
+    parser = argparse.ArgumentParser(description="Run just one test")
+    parser.add_argument('--nocapture', '-s', action='store_true', help="Don't capture stdout (any stdout output will be printed immediately)")
+    parser.add_argument('words', metavar="WORDS", nargs='+', help="The description of a test failure, like 'ERROR: test_set_missing_field (courseware.tests.test_model_data.TestStudentModuleStorage)'")
+
+    args = parser.parse_args(argv)
+    words = []
+    # Collect all the words, ignoring what was quoted together, and get rid of parens.
+    for argword in args.words:
+        words.extend(w.strip("()") for w in argword.split())
+    # If it starts with "ERROR:" or "FAIL:", just ignore that.
+    if words[0].endswith(':'):
+        del words[0]
+
+    test_method = words[0]
+    test_path = words[1].split('.')
+    if test_path[0] == 'mitx':
+        del test_path[0]
+    test_class = test_path[-1]
+    del test_path[-1]
+
+    test_py_path = "%s.py" % ("/".join(test_path))
+    test_py_path = find_full_path(test_py_path)
+    test_spec = "%s:%s.%s" % (test_py_path, test_class, test_method)
+
+    if test_py_path.startswith('cms'):
+        settings = 'cms.envs.test'
+    elif test_py_path.startswith('lms'):
+        settings = 'lms.envs.test'
+    else:
+        raise Exception("Couldn't determine settings to use!")
+
+    django_args = ["django-admin.py", "test", "--pythonpath=."]
+    django_args.append("--settings=%s" % settings)
+    if args.nocapture:
+        django_args.append("-s")
+    django_args.append(test_spec)
+
+    print " ".join(django_args)
+    management.execute_from_command_line(django_args)
+
+if __name__ == "__main__":
+    main(sys.argv[1:])