Filter by category
Merge branch 'master' of https://github.com/mrcnab/admin

Conflicts:
	protected/controllers/SiteController.php
	skin/luckybuys/css/style.css
	themes/luckybuys/views/layouts/main.php