Ajout du mot passe passe oublié... Email
Merge branch 'master' of https://github.com/Stevymtl/Alpha

Conflicts:
	inc/langs/en.ini
	inc/langs/fr.ini
	inc/login/register_helper.php