Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker

Conflicts:
	common/lib/xmodule/xmodule/conditional_module.py