commit at 17/10 12.57
Merge origin/master

Conflicts:
	view-retailer.php