Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-exercise-work
bugfix fixes #1835
Shib backup Metadata file
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-exercise-work
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-exercise-work
fixes #1857 simple reordering of top menubar
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
Use divider for dropdown links for clearer UI
Better fix for #1866

Based on a discussion with Jason, no "Hide Answer(s)" is necessary,
so I used that button space for a Show/Hide Explanation toggle button.
Removed Show/Hide Explanation link from Explanation area (implemented
with Pull #1831 (which addressed Issue #1826)

	modified:   templates/exams/view_exam.html
Add Show/Hide Explanation toggle for Summative results page

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

	modified:   templates/exams/view_exam.html
db-based S3 cache (#1440)

Working but since each request is a DB hit, unclear if it will ever be
that much faster.  Will try local django cache instead.
remove vestigial calls for news and video on course home
Merge pull request #1876 from Stanford-Online/wescott-master-exercise-work

Wescott master exercise work
Merge pull request #1870 from Stanford-Online/kluo-dropdown-divider

Use divider for dropdown links for clearer UI
django local fs cache for file and video locations (#1440)
fix typo in default (unused) cache defn (#1440)
strip querystrings from file links (#1440)