Merge pull request #1 from PrestaShop/master

Merge Head
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from PrestaShop/master

// sync base
Update addshoppers.php

Fixed product price. We shall use getPrice() to have taxes automagically set
Update header.tpl

Added missing og:url meta
Update addshoppers.php
Update header.tpl
Update addshoppers.php
Update header.tpl
Merge branch 'ZiZuu-addshoppers' of https://github.com/ZiZuu-store/PrestaShop-modules into ZiZuu-store-ZiZuu-addshoppers

Conflicts:
	autoupgrade
	backwardcompatibility
	blockwishlist
	carriercompare
	cashondelivery
	dateofdelivery
	editorial
	favoriteproducts
	feeder
	followup
	gamification
	gapi
	giveit/backward_compatibility
	loyalty
	mailalerts
	newsletter
	productcomments
	pscleaner
	referralprogram
	sendtoafriend
	themeinstallator
	watermark