[+] BO : Product "For"
[+] BO : Product "For"
[+] BO : Product "For"
// BO attributes
[+] BO : Product "For" and new carriers select list
[+] BO : Product "For"
// update order tab
[+] BO : Product "For" and combination button
[-] BO : BugFix Cancel modification button error
no message
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

# By Jérôme Nadaud (4) and sLorenzini (1)
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : BugFix Cancel modification button error
  [+] BO : Product "For" and combination button
  // update order tab
  [+] BO : Product "For"
  [+] BO : Product "For" and new carriers select list

Conflicts:
	admin-dev/themes/default/css/admin-theme.css
[+] BO Manufacturers
[+] BO Scenes - Tags - Attachments
// update order tab
[+] BO : Products quantities "For" and small template fix
[+] BO : Products customization "For"
[+] BO : Product attachment "For"
[+] BO Invoices
// update "create order" tab
[+] BO : Handler invoice date generation button