Log
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
Merge pull request #813 from marcosgdf/3.3

Removed duplicated code and fixed a problem with orders2invoice
Fix: for multicompany compatibility
Fix [ bug #810 ] Cannot update ODT template path
Merge pull request #816 from FHenry/3.3

Fix [ bug #810 ] Cannot update ODT template path
Fix: security

Conflicts:
	htdocs/core/modules/mailings/contacts2.modules.php
Fix bug with multicompany (SYSLOG_FILE on wrong entity)
Merge pull request #820 from FHenry/3.3

Fix bug with multicompany (SYSLOG_FILE on wrong entity)
Fix: change for experimental encryption
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
Fix: filter on all contacts, not just those related to a company
Fix bug : change path of ODT template for commande and propal module
Merge pull request #821 from FHenry/3.3

Fix bug : change path of ODT template for commande and propal module
Fix: Solve conflict of translation
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
Fix: demo modules list
Fix: bad url
Fix: encoding at wrong place
Fix: for avoid problem with multicompany thirdparty sharing