Merge branch 'diana/instructor-skip-button' of github.com:MITx/mitx into diana/instructor-skip-button