Merge commit 'e628f995435641602c1b62d5622eb92439814d72'
Modif script insertion data dans la base (fix bug)
Modification ->  Admin/index.php
Merge remote-tracking branch 'Ludo/master'
Merge remote-tracking branch 'Ludovic/master'
Merge remote-tracking branch 'Charles/master'
Merge remote-tracking branch 'jo/master'
Merge remote-tracking branch 'Jo/master'
Merge remote-tracking branch 'Florian/master'
Modification index.php pour permettre l'inscription au site
Client et usermanager et connexion
Merge remote-tracking branch 'bettyfava/master'
Merge remote-tracking branch 'jo/master'

Conflicts:
	class/UserManager.php