Conflicts: common/lib/xmodule/xmodule/capa_module.py common/lib/xmodule/xmodule/fields.py common/lib/xmodule/xmodule/peer_grading_module.py common/lib/xmodule/xmodule/tests/test_fields.py requirements/edx/github.txt
