Merge branch 'develop' of git+ssh://github.com/Dolibarr/dolibarr into develop

Conflicts:
	htdocs/admin/agenda_extsites.php
	htdocs/admin/company.php
	htdocs/comm/action/index.php
	htdocs/comm/action/listactions.php
	htdocs/comm/fiche.php
	htdocs/includes/modules/action/rapport.pdf.php