stable.

Conflicts:
	htdocs/compta/facture/class/facture.class.php

Conflicts:
	htdocs/compta/facture/class/facture.class.php

Conflicts:
	composer.json
	htdocs/product/ajax/products.php
	htdocs/product/class/product.class.php

Fix Missing translations

Fix : situation percent should be 100 by default

Fix cancel button on categories
Css enhancement.

Fix perf when too much lines

Conflicts:
	.travis.yml
	htdocs/filefunc.inc.php

Conflicts:
	test/phpunit/AllTests.php

Conflicts:
	.travis.yml
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
	htdocs/includes/adodbtime/adodb-time.inc.php
	htdocs/langs/en_US/accountancy.lang

Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php

Conflicts:
	.travis.yml
	htdocs/contrat/class/contrat.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php