dashboard merge
Merge branch 'master' of https://github.com/PepperPD/edx-pepper-platform
dashboard merge