update
Merge branch 'w-development' into n-development

Conflicts:
	Controller/Seller.php