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 bug : change path of ODT template for commande and propal module
Merge branch '3.3' into 3.3_odttemplateproject