order
Merge branch 'master' of https://github.com/maksudnishanov/mspares

Conflicts:
	protected/modules/market/widgets/views/pickupInformation.php