missed rst
add infinity symbol to calc preview
Add more tests for the container page
Make course_id a required arg to split.create_course
and remove attempt to make it unique. Instead raise exception on dupe.
STUD-1359
Add common/djangoapps/third_party_auth; update pylintrc to allow test_* names.

third_party_auth contains a working settings mechanism, the start of the provider interface + 3 implementations (Google, Mozilla Persona, LinkedIn), and a stub for the auth pipeline. Modified existing lms settings files to use but deactivate the module.
Rename "Forum" roles on inst dash LMS-2092
Update discussions documentation LMS-2092
Merge pull request #2860 from edx/sarina/lms-2092

Rename "Forum" roles on inst dash LMS-2092
Only add mentoring application to INSTALLED_APPS when in virtualenv
Update import location of `prefer_xmodules`
Normalize the representation of Scope.content data in MongoModulestore FieldData

Without this, the new 'items' field in the course_info xmodule caused
bizarre behavior. If you added the text 'items' to a course_info
section, then the LMS would throw a 500, because the field name isn't
'data', but the stored data is a string, leading to the check of
`key.field_name in self._data`, where key.field_name is the string 'items',
and self._data is the content string.
Merge pull request #2811 from edx/andya/container-unit-tests

Add more tests for the container page
Delay import of xmodule packages until after sys.path fixup
Fix some simple pep8 and pylint violations
typo error in this file causing it to fail to install
BLD-844: Add possibility to download transcripts in different formats.
Merge pull request #2844 from edx/jmclaus/feature_download_transcript_button_with_options

Add .txt and .srt options to the "download transcript" button [BLD-844]
Merge pull request #2864 from edx/cale/fix-crazy-items-error

Cale/fix crazy items error
Merge pull request #2736 from johncox-google/johncox/feature/auth

Add auth module
Merge branch 'master' into release

Conflicts:
	cms/envs/common.py
	lms/envs/common.py