Fix phpunit to be compatible with new version of phpunit
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
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5