Conflicts:
	ChangeLog

Corrected typo of PR #4444

Conflicts:
	htdocs/main.inc.php

FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays

FIX #4291 Correctly filter external calendar GETPOSTs

Conflicts:
	htdocs/install/upgrade.php

FIX: Not deleting contracts on element_element table

FIX #4242 Allow disabling dashes in documents

Fix #3930 Removed executable bit

These files doesn't contain executable code and may pose a security
threat.

FIX: Not delete a product when have customer price