Shib backup Metadata file
Merge pull request #1834 from Stanford-Online/jbau-shib-backup-xml

Shib backup Metadata file
Merge pull request #1831 from Stanford-Online/24a2c0775b3394adcf31995c5461292cb2df2afc

Fix for #1826
fixes #1835 no duplicate explanations
Merge pull request #1837 from Stanford-Online/jbau-1835-tiny-fix

fixes #1835 no duplicate explanations
serve popcorn from our own server (pages over https)
errant document.write() on homepage (#1840)
Merge pull request #1842 from Stanford-Online/sef-1840-homepage

errant document.write() on homepage (#1840)
fixes overview page #1844
Merge pull request #1846 from Stanford-Online/jbau-overview-page-fix

fixes overview page #1844
enclose the li tags in ul (was causing html validation errors)
fixes #1853 make child static pages save as list view by default
enable editing ContentGroup in django admin
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-exercise-work
Merge pull request #1848 from Stanford-Online/jinpa-master-little-bit-of-lint

enclose the li tags in ul (was causing html validation errors)
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-exercise-work
Merge pull request #1839 from Stanford-Online/jbau-serve-popcorn

serve popcorn from our own server (pages over https)
Merge pull request #1854 from Stanford-Online/jbau-static-child-default-list

fixes #1853 make child static pages save as list view by default
Fixes for #1865 and #1866

Interactive exercises have results div, into which AJAX returned data
is placed. Check Answer button is the only button (no more Hide Answer)
for interactive exercises, and it changes to "Checking..." while AJAX
call in progress

	modified:   templates/exams/view_exam.html
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-exercise-work