// refacto product pack
Update OrderConfirmationController.php

This change makes more sense to compare the orders module to the modules name.  Comparing the orders payment to the modules display name can result in executing the redirect and never hitting the order confirmation page.

For example, if I create a payment module that allows payment via Credit Card.
The module would have the following variables
name="my_great_module"
paymentMethod="Credit Card"
displayName="My Great Payment Module"

Now in the back office module listing, the merchant would see "My Great Payment Module".  This makes sense to the merchant who may have many payment modules.
But in the Order History page, the customer would see "Credit Card".  This makes much more sense to the customer who has no idea what "My Great Payment Module" is.

But in the order confirmation controller, since "My Great Payment Module" != "Credit Card", then the order confirmation page would never be displayed.  Instead you get redirected to the order history page.  This is not desirable

Instead we revise the order confirmation controller to compare the orders module name to the actual module name which both are "my_great_module".  This gives much greater flexibility
[*] BO : Product Pack refacto
Force shop_id for 'all shops' context

http://forge.prestashop.com/browse/PSCFV-11971
[+] BO : Product Pack Refacto
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into bo-product

Conflicts:
	admin-dev/themes/default/css/admin-theme.css
	admin-dev/themes/default/css/admin-theme_rtl.css
	admin-dev/themes/default/js/admin-theme.js
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/pack.tpl
[*] BO : Product Pack Refacto - fixes/updates
// Price are recalculated with specific price and group reduction
// import/form.tpl: wording.
// BO login page: better translation (1/2).
// BO login page: better translation (2/2).
// Typo.
strtolower from Tools
Merge pull request #1758 from DevNet/patch-8

[*] CORE : Tools::strtolower() in Tools.php
[-] BO : renderShopList, reselect disabled group
// bad commit https://github.com/PrestaShop/PrestaShop/commit/dc9a2d825c4357a6ab510ab446ddf38899895303
// small change in the installer
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
[-] FO : Fix bug #PSCFV-11922, bad carrier default selection
// Changed link to addons for untrusted module