[-] MO: followup - fix bug in template vars
[-] FO : Check for cart rules before diplaying shopping cart in OPC
//fixed multi-shipping bug
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
// Profiler, redirect method declaration fixed
// Update profiling tools
// Added lock to class_index generation
[-] FO : Do no try to add empty css or js file name
[-] Core: Fix search indexation when nb languages * nb shops > 50
Merge pull request #317 from Shagshag/patch-2

[-] SQL error in Combination::setAttributes
Merge pull request #316 from ldecoker/patch-4

[*][FO]Missing php_self variable
Merge pull request #299 from samy-r/dev-import-time

Import time improvment
// Fix 404 img path on pagenotfoundcontroller
[-] BO: Fix auto-selection of default category when you have choosen one on the listing
[-] BO: Fix update of delivery address on backoffice orders
Merge pull request #315 from PrestaEdit/followup

[-] MO: followup - fix bug in template vars
[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler
[-] FO : Fix bug #PSCFV-6595, fancybox images for IE and AlphaImageLoader
// remove additionnal \t
// again remove additional \t