Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag

Conflicts:
	cms/static/js/base.js
	cms/static/js/hesitate.js

cms/envs/common.py

@@ -229,7 +229,7 @@ PIPELINE_JS = {
         'source_filenames': sorted(
             rooted_glob(COMMON_ROOT / 'static/', 'coffee/src/**/*.coffee') +
             rooted_glob(PROJECT_ROOT / 'static/', 'coffee/src/**/*.coffee')
-        ) + ['js/base.js'],
+        ) + ['js/hesitate.js', 'js/base.js'],
         'output_filename': 'js/cms-application.js',
     },
     'module-js': {