Merge pull request #681 from grandoc/develop

...cs/adherents/canvas/actions_adherentcard_common.class.php

...cs/adherents/canvas/default/tpl/adherentcard_view.tpl.php

htdocs/adherents/card_subscriptions.php

htdocs/adherents/cartes/carte.php

htdocs/adherents/class/adherent.class.php

htdocs/adherents/cotisations.php

htdocs/adherents/document.php

htdocs/adherents/fiche.php

htdocs/adherents/index.php

htdocs/adherents/liste.php

htdocs/adherents/stats/geo.php

htdocs/adherents/type.php

htdocs/admin/company.php

htdocs/admin/ldap_contacts.php

htdocs/admin/ldap_members.php

htdocs/categories/categorie.php

htdocs/comm/list.php

htdocs/comm/propal/class/propal.class.php

htdocs/comm/prospect/list.php

htdocs/commande/customer.php