Merge branch 'master' into feature/kevin/flagging

cms/djangoapps/contentstore/tests/test_contentstore.py

cms/templates/settings_graders.html

common/lib/capa/capa/inputtypes.py

common/lib/capa/capa/templates/matlabinput.html

common/lib/capa/capa/tests/test_inputtypes.py

common/lib/xmodule/xmodule/modulestore/xml_importer.py

lms/djangoapps/django_comment_client/forum/views.py

lms/djangoapps/static_template_view/tests.py

lms/djangoapps/static_template_view/views.py

lms/templates/feed.rss

...lates/press_releases/cengage_to_provide_book_content.html

.../press_releases/edx_announces_proctored_exam_testing.html

...plates/press_releases/elsevier_collaborates_with_edx.html

...mplates/press_releases/gates_foundation_announcement.html

...static_templates/press_releases/georgetown_joins_edx.html

...c_templates/press_releases/lewin_course_announcement.html

...emplates/press_releases/mit_and_harvard_announce_edx.html

...lates/static_templates/press_releases/spring_courses.html

...c_templates/press_releases/stanford_to_work_with_edx.html

...tatic_templates/press_releases/uc_berkeley_joins_edx.html