Api Fixed
Merge branch 'master' of https://github.com/mrcnab/admin

Conflicts:
	protected/controllers/SiteController.php
	themes/luckybuys/views/site/retailer.php