[*] BO : moved display*ListAfter inside form
// small fix for chrome on block search input while you are on focus and without text written, and small fix for input text, that is below of search button
// small fix for chrome on block search input while you are on focus and without text written, and small fix for input text, that is below of search button
// follow up https://github.com/PrestaShop/PrestaShop/commit/7da25f6159cce3067701c4b25f4b1ee82aad1208
// Add label to unit price (see #PSCSX-3792)
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// Host Mode Small Fix
// follow up https://github.com/PrestaShop/PrestaShop/pull/2250
Merge pull request #2250 from PhpMadman/patch-8

[*] BO : moved display*ListAfter inside form
// price.tpl - remove alert when tax excl. mode

To match behavior of "retail price with tax" field
Merge pull request #2252 from AlexEven/patch-2

// price.tpl - remove alert when tax excl. mode
[*] BO : Fix #PSCSX-1237, Fix gross margin calculation for KPI
[-] BO : Fix bug #PSCSX-3805, invalid token on cancel
// delete unnecessary spaces and tabs on primary css´s
// delete unnecessary spaces and tabs on modules css´s
Merge pull request #2253 from marcoscv-work/1.6_MaC_01

[-] FO : Chrome input blocksearch // + css cleaning
[*] CORE : Introduce brand new .gitignore
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// follow up https://github.com/PrestaShop/PrestaShop/commit/f450675acac4a7d32ff2bc6d21670657c167c483
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6