Merge branch 'cdodge/meta-data-cms-editing' of github.com:MITx/mitx into cdodge/meta-data-cms-editing

Conflicts:
	cms/static/coffee/src/models/module.coffee