fixup! Make course ids and usage ids opaque to LMS and Studio [partial commit]
Return the course from get_course in courseware
Better unicode handling in instructor tasks/bulk-email
Fix cohort.course_id naming
Clean up how courses are iterated on instructor dashboard
Fix syntax error
Make dashboard.tests a python module
Clean up partial import statemen
Use a validly formed bogus task id
Merge pull request #3642 from cpennington/opaque-keys-return-course

Fix some tests on the opaque keys branch
Merge pull request #3655 from edx/opaque-keys-common-lib-xmodule

Opaque keys common lib xmodule
Responses to comments on https://github.com/edx/edx-platform/pull/3539

Conflicts:
	common/lib/xmodule/xmodule/modulestore/locations.py
Merge pull request #3651 from edx/opaque-keys-xmodule-lib-cleanup

Responses to comments on https://github.com/edx/edx-platform/pull/3539
fixed asset search query.
moved location_to_son to LocationBase.py.