Forums vote tracking missing spaces causes awkward reading

update the attrib using dict-->update() function

Add tags plugin.

FIX - Missing Open Sans typeface files

TNL-1924

Revert "Clytwynec/unique dirs for test results"

Remove anonymous caching when SSL is enabled

Flag test as flaky.

Clytwynec/unique dirs for test results

add 'get_attempts' method for 'ReverificationService'

Videos should emit `stop_video` event once the video segment is compelte...

Switching between discussion threads take focus to bottom of the page.

AC-102

Updated Receipt Page for Oscar

Numerical Input assessment has multiple accessibilty issues

TNL-1677

Fixed loosing children in drafts on import

Enrollment API course details include credit modes.

Credit modes are hidden by default, since the user
isn't allowed to select them on the track selection page.
This commit exposes credit modes through the enrollment
API so that consumers can see that a course has a credit
track.

* Updated XBlock hash - new version forces exposes force_dirty method on fields
* Includes Scope.children fields into xml_importer._update_module_location so that they are updated as well.
* Tests for mutable fields xml_importer._update_module_location with mutable fields and children

Pep8 should ignore pycharm-helpers files on folks' workstations/VMs.

Add remember me checkbox back to the combined login/registration page

Add bok-choy shards 4 and 5. New default is 'shard 6'

Don't delete *.pyc files in the .git directory

Index course information alongside courseware

If you have a branch named "remove-all-.pyc", the original code would
clobber it inside the .git directory, because branches become files with
the same name.  This prevents find from looking in .git, saving your
precious oddly named branches.

Add discussion topic API

will fall in 'shard 6'

Release (DO NOT MERGE)

Conflicts:
	cms/djangoapps/contentstore/tests/test_courseware_index.py

This is the first stage of the new Discussion API.

JIRA: MA-604