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

diff --cc bin/export_sql.bash
Simple merge

diff --cc classes/direnum.php
Simple merge

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 htdocs/javascript/profile.js
Simple merge

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

diff --cc include/webservices/manageurs.server.inc.php
Simple merge

diff --cc modules/profile.php
Simple merge

diff --cc upgrade/1.1.2/README
index 818e00d,5cbee98..03f5fe5
--- 1/upgrade/1.1.2/README
--- 2/upgrade/1.1.2/README
+++ b/upgrade/1.1.2/README
@@@ -1,4 -1,7 +1,12 @@@
 +Check that the following queries return the same results before updating:
 +SELECT COUNT(*), COUNT(DISTINCT(pid)) FROM profile_name AS pn INNER JOIN profile_name_enum AS pne ON (pn.typeid = pne.id) WHERE pne.type = 'nickname';
 +SELECT COUNT(*), COUNT(DISTINCT(pid)) FROM profile_name AS pn INNER JOIN profile_name_enum AS pne ON (pn.typeid = pne.id) WHERE pne.type = 'name_other';
 +SELECT COUNT(*), COUNT(DISTINCT(pid)) FROM profile_name AS pn INNER JOIN profile_name_enum AS pne ON (pn.typeid = pne.id) WHERE pne.type = 'firstname_other';
++
+ Once all sql/php scripts have be run, run retrieve_address_tables.sh and finally xx_retrieve_geocoding.sql.
+ Then "./formatAddresses.php -g -t g -r e" will format the last ungeocoded addresses.
+ 
+ Additions to platal.conf:
+ [Maps]
+ api_version = "3.4" (depending on current version when releasing)
+ language = "fr"