Un flush et on recommence!
Merge branch 'master' of https://github.com/Stevymtl/Alpha

Conflicts:
	inc/fonc/fonc_envcourriel.php
	inc/fonc/fonc_securite_modules.php
	inc/fonc/fonc_solde.php
	inc/langs/en.ini
	inc/langs/fr.ini
	inc/langs/lang.php
	inc/login/connected_helper.php
	inc/login/oublie.php
	inc/login/register_helper.php
	inc/menu.php
	inc/page_footer.php
	js/pages/security_login.js
	login.php
	oublie.php
	validation.php