Merge branch 'master' into select/devel

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/tabs.py
	cms/envs/common.py
	cms/static/js/models/course_info.js
	cms/static/js/views/course_info_edit.js
	common/djangoapps/student/views.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
	common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
	common/static/coffee/src/discussion/views/thread_response_show_view.coffee
	common/templates/courseware_vendor_js.html
	lms/djangoapps/bulk_email/tasks.py
	lms/djangoapps/courseware/tabs.py
	lms/djangoapps/instructor/views/legacy.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html
	lms/templates/dashboard.html
	lms/templates/discussion/_underscore_templates.html
	lms/templates/footer.html
	lms/templates/forgot_password_modal.html
	lms/templates/navigation.html
	lms/templates/register.html
	lms/templates/signup_modal.html
	lms/templates/stripped-main.html
	requirements/edx/base.txt