Temporarily disable masking

fix for prereqs installation cache check

Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py

Adds Ben McMorran to authors file.

Check YouTube for Bok-Choy

Lettuce YouTube Check Improvements

ORA2 release-2014-06-02T15.45

RelativeTime: incorrect value after XML serialization.

Bok-Choy Video Tests Batch9

i18n: Make .underscore files translatable

Annotation Tool Clean up and Plugins

Sylvia/docs/bld 1049

Making sure extension comes after annotator css

- UI Fixes for Diacritic Mark Plugin

CodeResponse: fix i18n.

BLD-724: ChoiceTextResponse i18n.

Fixed links for units loaded via ajax.

LMS-2711

Fixed staff debug info endpoints for staff member.

LMS-2737

Change Location, CourseLocator, etc to reference opaque-keys library

Ensure no old gems are left behind between test runs.

removes qualaroo from studio (STUD-1684)

Delete orphans was trying to get non-existent 'draft' modulestore

Added more details around Python's support for multi-line translator comments.

Allow courses to set Matlab API key globally, in advanced settings.