[*] Project : Orders should rely only on ps_order_cart_rule
Merge pull request #682 from MyBB-Services/dev/sa/ordercartrulecleanup

[*] Project : Orders should rely only on ps_order_cart_rule
// fix from comment https://github.com/PrestaShop/PrestaShop/commit/c6d2e1252e1757478339009ec7b48320b1ccd92ahttps://github.com/PrestaShop/PrestaShop/commit/c6d2e1252e1757478339009ec7b48320b1ccd92a#commitcomment-4002919
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] BO : Fix error returned when first import of a localisation pack
[-] INSTALLER : Fix infinite loop when order message has additional ampersand
Warning in AdminController.php

If debugging is on (_PS_MODE_DEV_ set to TRUE)
On a fresh install there is a warning on line 1542 in
/classes/controller/AdminController.php in function
addToolBarModulesListButton().
Because of the warning xml files are not populated with data.

Warning: simplexml_load_file()
1: parser error : Document is empty
[-] BO : Fix pull request #665
Merge pull request #690 from Ha99y/20130903_addToolBarModulesListButton

[-] BO : Remove warning in AdminController.php
[-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678
[-] INSTALLER: short_description for PREFIX_manufacturer_lang is now type TEXT
[-] INSTALLER: Wrong SQL query for PS_LEGACY_IMAGES to 0
// bad commit sorry for that