wip
Merge branch 'master' of https://github.com/LICEF/edx-platform

Conflicts:
	lms/templates/register.html