Conflicts:
	htdocs/holiday/card.php
	htdocs/resource/list.php

FIX : Cannot change the date of a contract #4088

[Qual] More robust sorting

Update products.lang - include translation for units key in product/card.php

Fix #4137 Salaries parameter saving

FIX: Cannot set property '_renderItem of undefined 

field is not required by dolibarr core.

result of a select.

Only allow valid values and discard others.
Do not use user supplied data in SQL query.

Button was outside of the form.

http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html

http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html

Progress column not wide enough for 100%

cleaning travis.yml

FIX: Multiple syntax errors

Only print : when both $h and $m are set

FIX: Warning: implode(): Invalid arguments passed

 Declare array type before implode to avoid warning

Progress column not wide enough for 100%