Merge branch 'master' of http://github.com/Stanford-Online/class2go into dca_new_working2
Fix for #1826

Add Show/Hide toggle link for showing/hiding the explanation, because
adding/changing buttons leads to a dark path

	modified:   templates/exams/view_exam.html
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-exercise-work
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
bugfix fixes #1835
Shib backup Metadata file
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 #1716 - survey summary report.

The report is generated from c2g_examrecord.json_data.

There is a known problem with textarea inputs that needs to be addressed
after some discussion.
Merge branch 'master' of http://github.com/Stanford-Online/class2go into dca_new_working2
fixes #1853 make child static pages save as list view by default
enable editing ContentGroup in django admin