Fix: Bug 701
Trad: Add missing translations
Fix: Test not complete
Fix: Holiday module update always done
Merge pull request #635 from simnandez/3.3

Trad: Add missing translations
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
Task [ task #711 ]
Fix: bad translation
Fix: bad translation
Fix Bug 708
Merge pull request #645 from FHenry/dev_contactcombox

Task [ task #711 ]
Merge remote-tracking branch 'origin/3.3' into develop

Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/user/fiche.php
Commit temporaire
Qual: Removed TODO, deprecated code and deprecated properties. This also
fix missing combo box of contacts onto CC.
Task 350 in Doliforge
Merge branch 'develop' into develop_merger_cust_prospect_tab
Merge pull request #650 from FHenry/develop_merger_cust_prospect_tab

Develop merger cust prospect tab (Task 350)