about grid-list , hotdeals page
merge file
Merge branch 'master' of https://github.com/mrcnab/admin

Conflicts:
	protected/controllers/SiteController.php