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

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

Studio Sass Cleanup

import needs to enumerate through the fields for all content scopes. Als...

regression in future b/c the problem was persisting under one parser and
reading under another.

Conflicts:
	lms/djangoapps/courseware/features/problems.py

Fix bug 249 the ugly way (decerebrate the moronically impotent model)

returning the content in same form as it was saved rather than parroting
it back.

an "unanswered" div or span.  This is much faster than
asserting that correct/incorrect is NOT present.

rather than using the login dialog.

studio - sass cleanup: adding in more color variables, proofing box-sizing and older/rougher unit scss

Merge pull request #1709 from MITx/fix/cdodge/dont-compute-inherited-metadata-on-course-loads-with-depth-zero

if we're loading a course module with depth = 0, then we don't need to f...

add an array of courses to not refresh the metadata cache on writes. Thi...

if we're loading a course module with depth = 0, then we don't need to fetch/compute inherited metadata

Update Berkeley logos

LMS Lighthouse [#260]

Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/disable-metadata-inheritence-computation-on-import

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo.py

Force instantiation of the user before querying