Perf: Minor perf enhancement
Fix: No slash alone
Qual: Make code simpler.
Look: Minor change
Update changelog.
Fix: Fix template ODS.
Fix: Logon theme on amarok
Fix: broken features for fileupload
Fix: merge problem
Fix: broken features
Fix: missing commit
Merge remote-tracking branch 'dolibarr/develop' into develop

Conflicts:
	htdocs/core/class/fileupload.class.php

Change-Id: I6376e1c4e7d325669a7c63f05df2d1d5c2cbb20f
Merge remote-tracking branch 'dolibarr/develop' into develop