Merge branch 'feature/markchang/studio-analytics' of github.com:MITx/mitx into feature/markchang/studio-analytics