Fix phpunit to be compatible with new version of phpunit
Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents
Fix: Can disable features with PHPEXCEL (no DLSF compatible).
Fix: Can disable features with CKEDITOR.
Fix: Can disable features with PHPEXCEL (no DLSF compatible).
Fix: Can disable features with CKEDITOR.
Corrected little bug when no state_id was defined
Fix: Pb of records not correctly cleaned when module marge is
uninstalled (conflict between 'margin' and 'margins').
Merge branch '3.5' of github.com:FHenry/dolibarr into FHenry-3.5

Conflicts:
	ChangeLog
Merge branch 'FHenry-3.5' into 3.5
Merge branch 'bug-1371' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1371

Conflicts:
	ChangeLog
fix : no room when number of pages sup than 9
Fix: Suppliers invoice mask fails using {tttt} in numbering
Merge pull request #1576 from grandoc/3.5

fix : no room when number of pages sup than 9
Fix: When on delivery receipt, ref of shipment was not visible. Also
some tabs were missing.
Fix: After deletion of delivery receipt, we must go back to shipment of
delivery receipt.
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Fix: the pdf template name for typhon as not correctly set when enabling
module.
Update doc
Fix: contact of delivery of order not visible into typhon pdf.
Fix: navigation on tab notes for shipment was not working.
Prepare version 3.5.3
Fix: Script can be ran from non root user, even from a directory with no
write permissions.