Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py

if we have to reload a module and already have the descriptor, we don't ...

Feature/vaxxxa/docs poll conditional xml

Add course checklists to Studio

Synced up Studio View <titles> with UI headings

if we have to reload a module and already have the descriptor, we don't need to refect the descriptor (which results in another DB round-trip. We just need the student state.

studio - "view live version" of unit button label change

studio - changed the label of view published/live version of unit presented to a user while editing a draft of the same unit

pep8 fixes on test_responsetypes.py

Ux/marco/textbook

Bug/orphan

In sign up form, merge PhD-science and PhD-other, add Associate's degree

Includes corresponding documentation changes.

Per request from Harvard: LH #276

drive by fix to get proper error handling on error in change_enrollment

Feature/will/speed up lettuce tests

Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists

studio - fixing a mixin value used when defining font-size

Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/sass/base-style.scss
	cms/urls.py

Studio Sass Cleanup