Add missing image into amarok theme
Merge pull request #1865 from FHenry/3.5

Add missing image into amarok theme
Fix: SQL injection
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php