Jeff updated 2 python files, UT pending
Merge branch 'master' of https://github.com/qinwenyan/courszilla