Conflicts: common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/modulestore/mongo.py common/lib/xmodule/xmodule/modulestore/search.py common/lib/xmodule/xmodule/modulestore/xml.py doc/development.md lms/envs/common.py
