xblock-external-ui: Add XBlock API call to render XBlock views
xblock-external-ui: Include CSRF token in the API answer
xblock-external-ui: Adds support for CORS headers (cross-domain request)
Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets
password history: just limit the result set range to simplify iteration logic
remove double icons in the wiki sidebar
switching more wiki icons to use the right format
make beta dash compute module_state_key like legacy dash (LMS-2491)
add failing tests
Refactor video caption module.
Upgrade django_nose to 1.2
Test TemplateLookup dirs are not cleared during lms startup.

LMS-2498
make sure new lms/tests.py file is run
Merge pull request #3153 from edx/anton/caption_refactor

Refactor video caption module.
Merge pull request #3205 from edx/usman/lms2498-mako-template-tests

Test that TemplateLookup dirs are not cleared during lms startup
Merge pull request #3187 from edx/adam/fix-alter-xblock-student-state

Adam/fix alter xblock student state
BLD-958: Force video player in flash mode.
Merge pull request #3195 from edx/anton/force-flash

Force video player in flash mode.
Merge pull request #3204 from edx/db/upgrade-django-nose

Upgrade django_nose to 1.2
Fix the pointer to the contentstore in the bok-choy settings