Optimized is_ip dolibarr function
Updated is_ip comment and added a test for is_ip function
Merge branch 'develop' into optimization
Merge remote-tracking branch 'upstream/develop' into optimization

Conflicts:
	test/phpunit/Functions2LibTest.php
Update llx_c_shipment_mode.sql

Update GLS tracking url
Update llx_c_shipment_mode.sql
Update propal.php
Fix on bugfix#1317, clean parameters missing

Clean fk_parent before updating fk_parent
Maj readme
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Merge pull request #1751 from marcosgdf/optimization

Optimized is_ip dolibarr function
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Fix: phpunit test
Better function is_ip
Merge pull request #1774 from fappels/develop

Fix on bugfix#1317, clean parameters missing
Merge pull request #1770 from frederic34/patch-5

Update propal.php
Merge pull request #1769 from frederic34/patch-4

Update llx_c_shipment_mode.sql
I grouped rules by Standard (PEAR, Generic, Zend, ...)
If a standard bring a rule that is duplicate than the other, we must
keep it commented saying duplicate with.
So at any time we know which rule we match for each standard.
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Fix: [ bug #1537 ] Difference between societe.nom and adherent.societ