updating project
Merge branch 'master' of https://github.com/fresearchgroup/edX-Development