The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.

feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py

Bug fix: Show error if organization name has invalid characters

we also need to set  on window scope

Remove 'name' property if it exists in an AssignmentFormatGrader. Don and I decided to do this instead of throwing an xlint warning and forcing authors to delete the name property.

on AWS instances, base.js gets wrapped into a single JS file, but it's i...

on AWS instances, base.js gets wrapped into a single JS file, but it's in a different scope. So to reference one of the globals in base.js, we have to reference it as window.XXXXXX.

move the underscore tempaltes to /static/client-templates and update the...

Course info style and implementation

Feature/cdodge/course info

get CodeMirror to work - set the right background in the .scss, make sure the textarea is visible before binding it to CodeMirror

support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed

Fix/cdodge/lms runtime bugs

Add unit tests.

some quick speedups

update styles fixed; tweaks to white button mixins; add update to top of list; render updates upon save

crossdomain policy violations when i try to validate.