no message
Merge branch 'w-development' into n-development

Conflicts:
	Controller/Seller.php
no message
no message
update