// Add Modernizr and Modernizr-loads check and loading for unsuported browsers
// label with tooltip
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// Add category name to page header title
// General modification for view and edit title
// adjustment on switch
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// Small Fix
// ooops
// Add identifier name
// Set Identifier name for search engine
// Better php def for Page header title edit and view
// Preferences identrifer names
// Change edit title on employees controller
//remove unused smarty variable
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
//dashproducts added section in tpl
// update Bootstrap 3.0.2 + fix tree header
fix conflicts
fix conflicts