// 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
Merge remote-tracking branch 'upstream/bootstrap' into bootstrap
// Fix empty file list on add
added mainpage footer blocks and mainpage banners
Merge remote-tracking branch 'upstream/bootstrap' into bootstrap
Merge branch 'bootstrap' of https://github.com/TMMeilleur/PrestaShop into bootstrap