Merge branch 'feature/btalbot/cms-gradable' of github.com:MITx/mitx into feature/btalbot/cms-gradable

Conflicts:
	cms/static/sass/_variables.scss

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

grading - added in tooltips for graded toggle on overview UI and moved icon libraries and tooltip asset references to base template

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