Conflicts: common/lib/xmodule/xmodule/seq_module.py common/lib/xmodule/xmodule/template_module.py common/lib/xmodule/xmodule/x_module.py lms/djangoapps/courseware/tests/tests.py lms/djangoapps/courseware/views.py lms/static/sass/course.scss requirements.txt
