Merge branch 'master' of github.com:Stanford-Online/class2go into sef-work
ignore class2go/.idea for pycharm
Merge branch 'master' of github.com:Stanford-Online/class2go into sef-work
Merge pull request #1761 from Stanford-Online/wescott-master-exercise-work

Wescott master exercise work
videocheck: separate term and class options (fix #1786)

Now have two options, -c for the class ("db") and -t for the term
("Winter2013").  Useful now that we have multiple terms, and I want to
look only at videos for the current term.

Although this changes the meaning of the "-c" option from a handle
("db--Winter2013") to a class, I'm the only one that uses this utility
and it's not in any scripts that I know about.  And this will be more
useful this way.
Robustness for if video duration was not sent
Merge pull request #1787 from Stanford-Online/kluo-vid-duration-fix

Robustness for if video duration was not sent
Merge pull request #1782 from Stanford-Online/sef-work

ignore class2go/.idea for pycharm IDE
Merge pull request #1788 from Stanford-Online/sef-1786-videocheck-options

videocheck: separate term and class options (fix #1786)
Problem Sets --> Quizzes (fix #1792)
Problem Sets --> Quizzes in selenium tests too (#1792)
Swap migr 32 and 33 to handle nulls in c2g_content_group.display_style (#1795)
Merge pull request #1796 from Stanford-Online/sef-1738-migration-contentgroup-nulls

Swap migr 32 and 33 to handle nulls in c2g_content_group.display_style (...
Merge pull request #1797 from Stanford-Online/sef-1792-probsets-to-quizzes

probsets to quizzes (fix #1792)
#1534 lockout between exams
Not live or too many attempts, link back to homepage (#1534)
Better place to return, plus data migration
Merge pull request #1798 from Stanford-Online/jbau-lockout

#1534 lockout between exams
fixes 1801--better parser for question solutions
Merge pull request #1802 from Stanford-Online/jbau-solution-parser

fixes 1801--better parser for question solutions