Modif emails
modif Mohamed
Merge branch 'master' of https://github.com/LICEF/edx-platform

* 'master' of https://github.com/LICEF/edx-platform: (23 commits)
  wip
  Bug fix take 2
  bug fix
  wip
  updating "email" to fr-ca string
  wip
  wip
  Testing error message
  wip
  wip
  wip
  wip
  final sprint
  Hide course number when connected dashboard
  Revert 399236f..9395c23
  wip
  wip
  wip
  wip
  wip
  ...

Conflicts:
	lms/templates/register-sidebar.html
	lms/templates/register.html