asdasd
Merge branch 'master' of https://github.com/vijayaragavans/Mus1c_Az2Ubyz9Vq7

Conflicts:
	protected/views/tblalbumcategory/_form.php
	protected/views/tblalbumcategory/_search.php
	protected/views/tblalbumcategory/_view.php
	protected/views/tblalbumcategory/admin.php
	protected/views/tblalbumcategory/create.php
	protected/views/tblalbumcategory/index.php
	protected/views/tblalbumcategory/update.php
	protected/views/tblalbumcategory/view.php
asdasd