Merge pull request #467 from edx/fix/adam/file-upload

common/djangoapps/heartbeat/views.py

common/djangoapps/student/models.py

common/djangoapps/student/views.py

common/lib/capa/capa/capa_problem.py

common/lib/capa/capa/correctmap.py

common/lib/capa/capa/responsetypes.py

common/lib/capa/capa/tests/test_responsetypes.py

common/lib/capa/capa/xqueue_interface.py

common/lib/xmodule/xmodule/capa_module.py

common/lib/xmodule/xmodule/fields.py

...e/xmodule/open_ended_grading_classes/open_ended_module.py

...dule/xmodule/open_ended_grading_classes/openendedchild.py

common/lib/xmodule/xmodule/tests/test_combined_open_ended.py

i18n/tests/test_extract.py

i18n/tests/test_generate.py

...pps/certificates/management/commands/ungenerated_certs.py

lms/djangoapps/courseware/module_render.py