Fix: for multicompany compatibility
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 branch '3.3' into 3.3_odttemplateproject