Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes

cms/djangoapps/contentstore/tests/tests.py

cms/djangoapps/contentstore/views.py

cms/static/coffee/files.json

cms/static/coffee/src/views/tabs.coffee

cms/static/js/models/settings/course_details.js

cms/static/js/views/course_info_edit.js

cms/static/js/views/server_error.js

cms/static/js/views/settings/main_settings_view.js

cms/templates/course_info.html

cms/templates/edit_subsection.html

cms/templates/settings.html

cms/urls.py

...on/djangoapps/student/management/commands/pearson_dump.py

common/lib/xmodule/jasmine_test_runner.html.erb

common/lib/xmodule/xmodule/capa_module.py

.../lib/xmodule/xmodule/js/fixtures/combined-open-ended.html

...ule/xmodule/js/spec/combinedopenended/display_spec.coffee

common/lib/xmodule/xmodule/js/spec/helper.coffee

common/lib/xmodule/xmodule/modulestore/xml_exporter.py

common/lib/xmodule/xmodule/open_ended_module.py