Catalog menu ver1
Merge branch 'master' of github.com:naffiq/babyroom

Conflicts:
	protected/components/UserIdentity.php
	protected/controllers/SiteController.php