Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

.gitignore

common/djangoapps/student/views.py

common/lib/xmodule/setup.py

common/lib/xmodule/xmodule/capa_module.py

common/lib/xmodule/xmodule/course_module.py

.../lib/xmodule/xmodule/js/src/selfassessment/display.coffee

common/lib/xmodule/xmodule/self_assessment_module.py

common/lib/xmodule/xmodule/tests/test_export.py

common/lib/xmodule/xmodule/tests/test_import.py

common/test/data/self_assessment/README.md

common/test/data/self_assessment/course.xml

common/test/data/self_assessment/course/2012_Fall.xml

common/test/data/self_assessment/policies/2012_Fall.json

common/test/data/self_assessment/roots/2012_Fall.xml

...st/data/self_assessment/selfassessment/SampleQuestion.xml

create-dev-env.sh

doc/xml-format.md

...ps/certificates/management/commands/find_unicode_certs.py

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

...dcertificate__del_field_generatedcertificate_name__add.py