Show student verification status on the dashboard.
ECOM-677 ECOM-678 styled the new messages
Added styles for email opt in/out checkbox label
Merge pull request #6115 from edx/alasdair/email-opt-out

Added styles for email opt in/out checkbox label
Revert "Do not install requirements from github.txt in editable mode"

This reverts commit 61cf1d6edb4609094ba6b84c87a29ff5bec4ee2c.

Conflicts:
	requirements/edx/github.txt
Merge pull request #6070 from edx/will/verified-messaging-per-course

Student verification status
Merge pull request #6121 from edx/clytwynec/revert-not-editable-mode

Revert "Do not install requirements from github.txt in editable mode"
Fix dashboard i18n
Keep closing lines of email together for translation purposes
Add additional context for translators
Merge pull request #5917 from edx/sarina/fix-i18n

Fix Solutions i18n issues
Temporary commit: Fix batch enrollment script
Basic ability to upload a CSV file.
Implement `add_users_to_cohorts` cohort API.

WIP: Implement bulk-cohorting as background task.

Conflicts:
	common/djangoapps/util/file.py
Get Jasmine tests running.

Add explicit upload button.
Add task unit test, remove CSV validation...

... to be implemented in django or backbone view for synchronous alert.

Add unit test for `unicode_csv_dictreader`.

Update input file format, remove validation from async code
First bok choy test

Support either username or email (instructor_user is failing).

Celery tasks now work in bok choy.
Update output format

Fix task progress reporting

Fix bug; support either username or email
More bok choy tests and introduction of validator.
Move `add_users_to_cohorts` view to instructor.views.api

Change validation logic.