Show position drag handlers
[*] Installer : Romanian translation
[*] Installer : improved a string in the Romanian translation
[*] FO : Follow up https://github.com/PrestaShop/PrestaShop/pull/1888
Merge branch 'patch-1' of https://github.com/djbuch/PrestaShop into djbuch-patch-1
Merge branch 'djbuch-patch-1' into 1.6
/classes/PaymentModule.php: wording.
// AdminOrdersController: wording.
// /classes/order/OrderHistory.php: wording.
// /classes/PaymentModule.php: Removed #.
// AdminStatsController: wording
Merge pull request #1905 from xBorderie/patch-1

// Wording for some email titles
[-] FO : Fix bug #PSCFV-12219, could not contact with order ref when not logged
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// small css fix
[-] WS : #PSCFV-10283, #PSCFV-7498 Fix product images behavior
[-] WS : #PSCFV-11895, #PSCFV-10748 Fix ampersand issue
[-] WS : Fix node_type behavior for associations, now the node_type attribute is linked to plural entities name (eg: category is now categories)
[*] WS : #PSCFV-12162 Webservices now work in conjunction with watermark module
[*] WS : #PSCSX-1563 Webservices allow to set position_in_category of products entity
[+] WS : Add JSON output, add "io_format=JSON" to your request
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// AdminCartRulesController: wording

Validity end date --> Expiration date
Revert unwanted file to commit
Merge pull request #1901 from geedamed/geedamed

[*] Installer : Romanian translation