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

.travis.yml

htdocs/admin/dict.php

htdocs/comm/propal.php

htdocs/comm/propal/class/propal.class.php

htdocs/commande/card.php

htdocs/commande/class/commande.class.php

htdocs/compta/facture.php

htdocs/compta/facture/class/facture-rec.class.php

htdocs/compta/facture/class/facture.class.php

htdocs/compta/facture/fiche-rec.php

htdocs/compta/salaries/card.php

htdocs/compta/salaries/info.php

htdocs/contrat/card.php

htdocs/contrat/class/contrat.class.php

htdocs/core/class/commondocgenerator.class.php

htdocs/core/class/commonobject.class.php

htdocs/core/class/commonobjectline.class.php

htdocs/core/class/html.form.class.php

htdocs/core/lib/pdf.lib.php

htdocs/core/lib/salaries.lib.php