Feature/dhm/cms settings

Try running xmodule Jasmine tests on Jenkins (again!).

up the template caching version number to avoid stale caches since there's been a change to the underscore templates

up the template caching version number to avoid stale caches since there's been a change to the underscore templates

trying backing out the addition of the xmodule jasmine tests and see if ...

trying backing out the addition of the xmodule jasmine tests and see if builds start passing again on Jenkins

more tweeks on CodeMirror. Also do a re-ordering of operations when crea...

more tweeks on CodeMirror. Also do a re-ordering of operations when creating a new Update, put the CodeMirror binding after the form has been inserted into the DOM. It appears to improve some rendering characteristics.

call remove() on CodeMirror

Try running xmodule Jasmine tests on Jenkins.

dispose of  when we close the editor

Feature/christina/misc

html names are automatically converted to the symbols they describe.

Remove syllabus as it's not instrumented.

feature/dhm/cms-settings

Conflicts:
	cms/static/sass/_base.scss

CodeMirror on overview entry

Added Tool Tip UI Assets and References

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