Merge pull request #3306 from edx/zub/bugfix/std1523-uploadassetbutton

move upload asset code for assets to AssetsView
Unique Course Fix
Merge pull request #3849 from edx/ammar/uniqe-course-fix

Unique Course Fix
Merge remote-tracking branch 'edx/master' into ok-merge-from-master
Merge pull request #3805 from edx/sanchez/TIM-563-Check-Django-Admin

Adding new attribute to the xmodule_runtime to check admin privileges on users
Fixed DeleteComponent on Container Page.
Skip intermittently failing js video tests
Merge pull request #3834 from cpennington/ok-merge-from-master

Merge master into opaque-keys
Merge remote-tracking branch 'edx/master' into ok-merge-from-master

Conflicts:
	lms/djangoapps/courseware/module_render.py
Resolve conflicts
Merge pull request #3856 from cpennington/ok-merge-from-master

Merge from master to opaque-keys
Fixed typo in Studio Home Page panel help text

DOC-484
Merge pull request #3854 from edx/zoldak/skip-flaky-js-video-tests

Skip intermittently failing js video tests
Add page num to forum search tracking log events
Merge pull request #3857 from edx/markhoeber/documentation/doc-484

Fixed typo in Studio Home Page panel help text
Merge pull request #3817 from edx/gprice/forum-search-event-page

Add page num to forum search tracking log events
Merge pull request #2905 from edx/opaque-keys

(WIP) Make course ids and Locations/Locators opaque to LMS/Studio
added and updated pavelib/quality.py from dglance branch, deprecated rake quality tasks
fix for pylint/pep8 defaults
Merge pull request #3845 from edx/zoldak/brittle-html-editor-tests

Wait for ajax to complete when editing components in Studio acceptance tests