Make video tab conditional (#1564)
Merge pull request #1565 from Stanford-Online/dca_new_working

Make video tab conditional (#1564)
Address #1560
	modified:   c2g/models.py
Merge pull request #1562 from Stanford-Online/sef-1449-grader

Feedback endpoint for interactive exercises, invideo (#1449)
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-exercise-work
#1493 prepopulate exam/pset/survey title,etc. from XML
Merge pull request #1572 from Stanford-Online/jbau-xml-pset-prepop

#1493 prepopulate exam/pset/survey title,etc. from XML
Address Issue #1574, only show in-video exams for upload/edit video
	modified:   courses/videos/views.py
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-exercise-work
Address Issue #1573, check for url-identifier first, then url_identifier
	modified:   courses/videos/views.py
bugfix for handling not-present attributes in XML import #1577
Fix breaking Jenkins build

Check video_slug against empty string
	modified:   courses/videos/views.py
Merge pull request #1579 from Stanford-Online/jbau-xml-pset-prepop

bugfix for handling not-present attributes in XML import #1577
impove exam-list-item layout (#1555)

changed icon to checkbox instead of book
removed icon for children
changed <div>s to <span>s to get rid of excess whitespace
moved attempt listing to the far right, lined up with progess bars (e.g
on course materials page), rather than on their own line taking up more
vertical space
known issue: firefox on mac is displaying bullets for the child items.
This is unfortunate, but I'm having trouble fixing it, and the more
compact layout seems enough better that this version seems better
anyway. (Happy for any advice on getting rid of them.)
Merge pull request #1578 from Stanford-Online/wescott-master-exercise-work

Wescott master exercise work
minor changes - class=unstyled, django comment style
Merge pull request #1583 from Stanford-Online/jinpa-attempts-layout

impove exam-list-item layout (#1555)
nicer formatting for attempts list

only show the chevron when there's attempt content, and add some
left-padding to the chevron
icon back to pencil for exams

on Vidya's suggestion.  Also, removed a class=unstyled that wasn't
working
get rid of bullets for attempt items, and clean up inline styling