sync
Merge branch 'master' of https://github.com/BeautyNista/nista

Conflicts:
	application/config/routes.php
	application/modules/market/controllers/market.php