Conflicts: common/lib/xmodule/xmodule/crowdsource_hinter.py common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee common/static/coffee/src/logger.coffee common/templates/hinter_display.html lms/envs/test.py lms/urls.py
