create-dev-env.sh is failing because rednose 0.3.3 seems to have
fallen off the face of the Earth. 0.3 is still available so reverting
to that.

Enable executing the lms jasmine tests as part of the build process

Fix/vik/oe and progress

Fix/will/bug 288

change submission history to be ordered by id

HOTFIX: Accept either a list of possible values, or a string as a value for

I'm pulling this in myself because it's urgent, it's the weekend, and I don't want this to get forgotten.

comparison of correctness in multiple choice.

Multiple choice code is scattered and sometimes sends a list of
choices for the value, and sometimes a single string. We used to use
"in" which scarily handled both cases (list or substring search),
but that caused a bug when you had two choices like choice_1 and
choice10. Moving to == caused us to break when lists were sent to
us. So this ugly code is extra paranoid and checks both possibilities.

This really needs a better cleanup.

Fix/vik/add oe tab

add checking for metadata that we can't support editing for in Studio. T...

Feature/cdodge/course overview perf

Enough is enough.

add an 'allowed' list of metadata (e.g. display_name, etc.) and also restrict metadata on sequentials

Feature/will/speed up unit tests

Conflicts:
	cms/djangoapps/contentstore/utils.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_metadata.py

Remove the default and prevent input_state from persisting across problems

unnecessary data.

Fixed bug in parsing of urandom struct so that seed

is set to an integer (and correctly saved) instead of a tuple.

Content/rocha/utaustinx courses