Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] CORE : SetEnv not available on all config // @todo curl request on dummy .htacces
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] CORE : SetEnv in if statement
Turned "true" and "false" strings to proper booleans

It's cleaner this way, and matches how it is done on similar templates.
Merge pull request #893 from neemzy/development

[*] FO : Turned "true" and "false" strings to proper booleans in address.tpl
[-] BO : Fixed bug PSCFV-9910 using basic queries to prevent locking errors
Merge remote-tracking branch 'origin/development' into development
// norms
[-] MO : Fix bug #PSCFV-10841, blockcart hides on product page when last product is removed from cart
[-] MO : Blockwishlist no product image when id_product_attribute is defined, thanks @Broceliande
[*] BO : improved unicode characters replacement in URLs (Russian and Ukrainian characters added)
//missing line feed after disable_modsec
[-] BO : Fix bug #10689, could not set image legend in back office
[*] FO : Fix bug #PSCFV-10689 handle image legend
Merge pull request #897 from freedayko/development

[*] BO : improved unicode characters replacement in URLs
[-] BO : AdminImport, fix bug from https://github.com/indesign47/PrestaShop/commit/84454bbc1c7a315e232245c5e43b300b8f153473#commitcomment-4418502
homeslider stores slider about multistore with virtual uri
[-] FO: fixed bug #PSCFV-10654 - TinyMCE editor: List of products by manufacturer, products by supplier - Long description is not hidden.
Merge pull request #898 from Jacky75/blulab20131028-slider-virtualuri

[-] MO : homeslider stores slider about multistore with virtual uri