// Cache name
[-] BO : #PSCSX-2827 Fatal error
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
Removing displays_errors on Profiling tool if _PS_MODE_DEV_ is disabled

 - Profiling displays errors only if _PS_MODE_DEV_ is enabled (Previously, it override error managment)
 - Removing obsolete functions
[+] BO : Override of list, form or view fields

This is a method to allow to add fields in admin controllers.

in adminController.php, i add new functions to override in AdminController--- : 

getTemplateListVars()
getTemplateViewVars()
getTemplateFormVars()

Now i can easily add some new fields.

Sample:
In Override/.../adminControllerCustomer, i override these functions:

public function getTemplateViewVars()
{
     $myVars = array(..........);
     return array_merge($myVars, $this->tpl_view_vars);
}
// follow up https://github.com/PrestaShop/PrestaShop/commit/652f8101e2baeeac35abf9c0f9ab3bc671d081fc
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] BO : shop main url update
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
// Changed labels
// Adding total tax excluded to cart summary
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
[-] FO : FixBug #PSCSX-2893 - Wrong rowspan in shopping cart summary
// tax rules edition/deletion with historization
[-] FO : Fix PSCSX-623 width in function of nb column diplayed
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// indent and w3c
[*] MO : Fix #PSCSX-2949, if $display_column_xx not found in DB, use module settings instead of theme default value
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6