Merge origin/master

Conflicts:
	view-retailer.php