Merge branch 'xorg/master' into xorg/f/geocoding

diff --cc classes/profile.php
Simple merge

diff --cc classes/userfilter.php
Simple merge

diff --cc classes/userfilter/conditions.inc.php
Simple merge

diff --cc configs/mails.conf
Simple merge

diff --cc configs/platal.ini
Simple merge

diff --cc include/ufbuilder.inc.php
Simple merge

diff --cc modules/profile.php
Simple merge