Fix: Amarok login page issues
Fix: Bad choice of template
Renamed "Salvador" into "El Salvador"
Merge pull request #641 from simnandez/3.3

Fix: Amarok login page issues
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3