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

Conflicts:
	protected/modules/market/controllers/DefaultController.php