FIX : Bad rank when a bill was made by multiple orders
Fix: travis file for 3.5
[ bug #1522 ] Liste des propositions commerciales non filtée depuis un
projet
changelog
Merge pull request #1732 from FHenry/3.5

 [ bug #1522 ] Liste des propositions commerciales non filtée depuis un projet
Merge pull request #1726 from atm-alexis/3.5

FIX : Bad rank when a bill was made by multiple orders
Fix: Date error
Fix 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50854-multi-societe-options-cookies
Update ChangeLog: Remove add_photo_web()
Security fix
[ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly
Fixed a bug introduced in commit 0916d2cf3b
Fix: Import ProfId1 to siren and ProfId2 to siret
Fix: Import ProfId1 to siren and ProfId2 to siret
Fix: Import ProfId1 to siren and ProfId2 to siret
Fix: Import ProfId1 to siren and ProfId2 to siret

Conflicts:
	ChangeLog
Merge pull request #1739 from KreizIT/XssFix

Security fix
Merge pull request #1744 from marcosgdf/bug-linkedprojects

Fixed a bug introduced in commit 0916d2cf3b
Merge branch 'marcosgdf-bug-1526' into 3.5
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5

Conflicts:
	ChangeLog