// bad ssl bind on favorite products
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	modules/bankwire
	modules/blockadvertising
	modules/blockbanner
	modules/blockbestsellers
	modules/blockcart
	modules/blockcategories
	modules/blockcms
	modules/blockcmsinfo
	modules/blockcontact
	modules/blockcontactinfos
	modules/blockcurrencies
	modules/blockcustomerprivacy
	modules/blockfacebook
	modules/blocklanguages
	modules/blocklayered
	modules/blocklink
	modules/blockmanufacturer
	modules/blockmyaccount
	modules/blockmyaccountfooter
	modules/blocknewproducts
	modules/blocknewsletter
	modules/blockpaymentlogo
	modules/blockpermanentlinks
	modules/blockreinsurance
	modules/blockrss
	modules/blocksearch
	modules/blocksharefb
	modules/blocksocial
	modules/blockspecials
	modules/blockstore
	modules/blocksupplier
	modules/blocktags
	modules/blocktopmenu
	modules/blockuserinfo
	modules/blockviewed
	modules/cheque
	modules/crossselling
	modules/dashactivity
	modules/dashgoals
	modules/dashproducts
	modules/dashtrends
	modules/graphnvd3
	modules/gridhtml
	modules/homefeatured
	modules/homeslider
	modules/pagesnotfound
	modules/productpaymentlogos
	modules/productscategory
	modules/producttooltip
	modules/sekeywords
	modules/socialsharing
	modules/statsbestcategories
	modules/statsbestcustomers
	modules/statsbestmanufacturers
	modules/statsbestproducts
	modules/statsbestsuppliers
	modules/statsbestvouchers
	modules/statscarrier
	modules/statscatalog
	modules/statscheckup
	modules/statsdata
	modules/statsequipment
	modules/statsforecast
	modules/statslive
	modules/statsnewsletter
	modules/statsorigin
	modules/statspersonalinfos
	modules/statsproduct
	modules/statsregistrations
	modules/statssales
	modules/statssearch
	modules/statsstock
	modules/statsvisits
	modules/themeconfigurator
	modules/trackingfront
	modules/vatnumber