Fix phpunit to be compatible with new version of phpunit
escape for insert SQL expedition module
Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	test/phpunit/CoreTest.php
	test/phpunit/Functions2Test.php
	test/phpunit/FunctionsTest.php
Fix: Box was not added on correct side
Merge pull request #1606 from FHenry/3.5

escape for insert SQL expedition module
 [ bug #1399 ] [pgsql] Silent warning when setting a propal as
"facturée" in propal.php
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Fix: Data are clean once registered into dictionnaries.
Fix: When number reach 9999 with default numbering module, next number
will be 10000 instead of 0000 and error.
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Fix: When number reach 9999 with default numbering module, next number
will be 10000 instead of 0000 and error.
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5

Conflicts:
	ChangeLog
Fix: CRLF
Merge remote-tracking branch 'origin/3.5' into 3.5_backported