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
Tooltip to show video progress
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
Changing the percentage to show no decimal points
fixes 1801--better parser for question solutions
Merge pull request #1802 from Stanford-Online/jbau-solution-parser

fixes 1801--better parser for question solutions
Fixes file upload 500s, also some draft/ready bugs
Merge pull request #1804 from Stanford-Online/jbau-file-upload-fixes

Fixes file upload 500s, also some draft/ready bugs
Merge branch 'master' of http://github.com/Stanford-Online/class2go into dca_new_working2
Fix for #1800

Insert a clearing div, as dynamically-inserting a floating div evidently
causes layout flakiness

	modified:   templates/exams/view_exam.html
tiny mce replaced by ACE
Add "we're hiring!" page and ribbon (fix #1809)
Static page edit has both HTML and WYSIWYG editors