Url modify and add

Url modify and add
Merge branch 'master' of https://github.com/PepperPD/edx-pepper-platform

Conflicts:
	lms/urls.py