// made a working You Save column for Volume Discounts
// sprintf & English
Merge pull request #949 from djfm/bootstrap

// sprintf & English
Merge pull request #947 from PhpMadman/Boot-UpTo

// made a working You Save column for Volume Discounts
// mobile nav
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// Add uploader to products controller
// Small fix on HelperUploader
// skin uploader button
// Remove flags
// Move spin and ladda js to products controller
// Unify thumb param in files options
// Remove unnecessary function
// Wrong col size
// Fix empty file list on add
// fixs on mobile nav
Added changes from eb94b51 TMMeilleur/PrestaShop
Merge pull request #955 from alexey-svistunov/bootstrap

Added changes from eb94b51 TMMeilleur/PrestaShop
Merge pull request #1 from PrestaShop/bootstrap

Bootstrap