bfv
Merge branch 'master' of https://github.com/FnK-Lap/Social_club

Conflicts:

Master/templates_c/2fa1afda940ac2d07cfa556681ca4fc2671bff9f.file.profil.
tpl.php

Master/templates_c/e641a5f4467e9ceaa2820a30bed046ac7f148801.file.home.tp
l.php
cc
Merge branch 'master' of https://github.com/FnK-Lap/Social_club

Conflicts:

Master/templates_c/2fa1afda940ac2d07cfa556681ca4fc2671bff9f.file.profil.
tpl.php

Master/templates_c/e641a5f4467e9ceaa2820a30bed046ac7f148801.file.home.tp
l.php