Merge branch 'fusionax' into account

Conflicts:
	include/banana/hooks.inc.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>

diff --cc classes/user.php
Simple merge

diff --cc include/banana/hooks.inc.php
Simple merge

diff --cc modules/register.php
Simple merge

diff --cc modules/register/register.inc.php
Simple merge

diff --cc templates/carnet/mescontacts.tpl
Simple merge