[ bug #1341 ] Lastname not added by file or direct input in mass
e-mailing
same
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
Merge remote-tracking branch 'origin/3.5' into 3.5_backported