Merge branch 'feature/btalbot/cms-gradable' of github.com:MITx/mitx into feature/btalbot/cms-gradable

Conflicts:
	cms/static/sass/_variables.scss