no message
Merge branch 'master' of https://github.com/shafqatjan/pehchantv

Conflicts:
	protected/controllers/SiteController.php
	protected/models/_base/BaseDramaVideo.php
	protected/models/_base/BaseMember.php
	protected/models/_base/BaseMemberVideo.php
	protected/models/_base/BasePollQuestion.php
	protected/modules/admin/controllers/AdvertisementController.php
	protected/modules/admin/controllers/ArticleController.php
	protected/modules/admin/controllers/AuthorController.php
	protected/modules/admin/controllers/ChannelController.php
	protected/modules/admin/controllers/DramaController.php
	protected/modules/admin/controllers/DramaVideoController.php
	protected/modules/admin/controllers/MemberController.php
	protected/modules/admin/controllers/MemberVideoController.php
	protected/modules/admin/controllers/NewsController.php
	protected/modules/admin/controllers/SliderController.php
	protected/modules/admin/controllers/TalkshowEpisodeController.php
	protected/modules/admin/controllers/TalkshowProgramController.php
	protected/modules/admin/controllers/VideoController.php
	protected/modules/admin/views/advertisement/view.php
	protected/modules/admin/views/article/view.php
	protected/modules/admin/views/author/view.php
	protected/modules/admin/views/channel/view.php
	protected/modules/admin/views/drama/view.php
	protected/modules/admin/views/dramaVideo/view.php
	protected/modules/admin/views/member/view.php
	protected/modules/admin/views/memberVideo/view.php
	protected/modules/admin/views/news/view.php
	protected/modules/admin/views/slider/view.php
	protected/modules/admin/views/talkshowEpisode/view.php
	protected/modules/admin/views/talkshowProgram/view.php
	protected/modules/admin/views/video/view.php
	protected/views/layouts/right_index.php
	protected/views/site/index.php
Merge branch 'master' of https://github.com/shafqatjan/pehchantv

Conflicts:
	css/style_main.css
	protected/components/Functions.php
	protected/config/main.php
	protected/controllers/TalkshowController.php
	protected/models/Advertisement.php
	protected/models/Drama.php
	protected/models/DramaVideo.php
	protected/models/Page.php
	protected/models/Place.php
	protected/models/PollOption.php
	protected/models/PollQuestion.php
	protected/models/Slider.php
	protected/models/_base/BaseAdvertisement.php
	protected/models/_base/BaseAuthor.php
	protected/models/_base/BaseChannel.php
	protected/models/_base/BaseDrama.php
	protected/models/_base/BaseMember.php
	protected/models/_base/BaseNews.php
	protected/models/_base/BasePage.php
	protected/models/_base/BasePlace.php
	protected/models/_base/BaseSlider.php
	protected/models/_base/BaseSubCategory.php
	protected/models/_base/BaseTalkshowEpisode.php
	protected/models/_base/BaseTalkshowProgram.php
	protected/models/_base/BaseVideo.php
	protected/modules/admin/controllers/DramaController.php
	protected/modules/admin/controllers/PageController.php
	protected/modules/admin/controllers/PlaceController.php
	protected/modules/admin/controllers/PollOptionController.php
	protected/modules/admin/controllers/PollQuestionController.php
	protected/modules/admin/views/advertisement/_form.php
	protected/modules/admin/views/advertisement/_search.php
	protected/modules/admin/views/advertisement/_view.php
	protected/modules/admin/views/advertisement/admin.php
	protected/modules/admin/views/advertisement/create.php
	protected/modules/admin/views/advertisement/index.php
	protected/modules/admin/views/advertisement/update.php
	protected/modules/admin/views/advertisement/view.php
	protected/modules/admin/views/article/_form.php
	protected/modules/admin/views/article/_search.php
	protected/modules/admin/views/article/_view.php
	protected/modules/admin/views/article/admin.php
	protected/modules/admin/views/article/create.php
	protected/modules/admin/views/article/index.php
	protected/modules/admin/views/article/update.php
	protected/modules/admin/views/author/_form.php
	protected/modules/admin/views/author/_search.php
	protected/modules/admin/views/author/_view.php
	protected/modules/admin/views/author/admin.php
	protected/modules/admin/views/author/adminAll.php
	protected/modules/admin/views/author/create.php
	protected/modules/admin/views/author/index.php
	protected/modules/admin/views/author/update.php
	protected/modules/admin/views/category/_form.php
	protected/modules/admin/views/category/_search.php
	protected/modules/admin/views/category/_view.php
	protected/modules/admin/views/category/admin.php
	protected/modules/admin/views/category/create.php
	protected/modules/admin/views/category/index.php
	protected/modules/admin/views/category/update.php
	protected/modules/admin/views/category/view.php
	protected/modules/admin/views/channel/_form.php
	protected/modules/admin/views/channel/_search.php
	protected/modules/admin/views/channel/_view.php
	protected/modules/admin/views/channel/admin.php
	protected/modules/admin/views/channel/create.php
	protected/modules/admin/views/channel/index.php
	protected/modules/admin/views/channel/update.php
	protected/modules/admin/views/channel/view.php
	protected/modules/admin/views/default/index.php
	protected/modules/admin/views/drama/_form.php
	protected/modules/admin/views/drama/_search.php
	protected/modules/admin/views/drama/_view.php
	protected/modules/admin/views/drama/admin.php
	protected/modules/admin/views/drama/create.php
	protected/modules/admin/views/drama/index.php
	protected/modules/admin/views/drama/update.php
	protected/modules/admin/views/dramaVideo/_form.php
	protected/modules/admin/views/dramaVideo/_search.php
	protected/modules/admin/views/dramaVideo/_view.php
	protected/modules/admin/views/dramaVideo/admin.php
	protected/modules/admin/views/dramaVideo/create.php
	protected/modules/admin/views/dramaVideo/index.php
	protected/modules/admin/views/dramaVideo/update.php
	protected/modules/admin/views/dramaVideo/view.php
	protected/modules/admin/views/genre/_form.php
	protected/modules/admin/views/genre/_search.php
	protected/modules/admin/views/genre/_view.php
	protected/modules/admin/views/genre/admin.php
	protected/modules/admin/views/genre/create.php
	protected/modules/admin/views/genre/index.php
	protected/modules/admin/views/genre/update.php
	protected/modules/admin/views/genre/view.php
	protected/modules/admin/views/member/_form.php
	protected/modules/admin/views/member/_search.php
	protected/modules/admin/views/member/_view.php
	protected/modules/admin/views/member/admin.php
	protected/modules/admin/views/member/create.php
	protected/modules/admin/views/member/index.php
	protected/modules/admin/views/member/update.php
	protected/modules/admin/views/memberVideo/_form.php
	protected/modules/admin/views/memberVideo/_search.php
	protected/modules/admin/views/memberVideo/_view.php
	protected/modules/admin/views/memberVideo/admin.php
	protected/modules/admin/views/memberVideo/create.php
	protected/modules/admin/views/memberVideo/index.php
	protected/modules/admin/views/memberVideo/update.php
	protected/modules/admin/views/news/_form.php
	protected/modules/admin/views/news/_search.php
	protected/modules/admin/views/news/_view.php
	protected/modules/admin/views/news/admin.php
	protected/modules/admin/views/news/create.php
	protected/modules/admin/views/news/index.php
	protected/modules/admin/views/news/update.php
	protected/modules/admin/views/newsCategory/_form.php
	protected/modules/admin/views/newsCategory/_search.php
	protected/modules/admin/views/newsCategory/_view.php
	protected/modules/admin/views/newsCategory/admin.php
	protected/modules/admin/views/newsCategory/create.php
	protected/modules/admin/views/newsCategory/index.php
	protected/modules/admin/views/newsCategory/update.php
	protected/modules/admin/views/newsCategory/view.php
	protected/modules/admin/views/page/_form.php
	protected/modules/admin/views/page/_search.php
	protected/modules/admin/views/page/_view.php
	protected/modules/admin/views/page/admin.php
	protected/modules/admin/views/page/create.php
	protected/modules/admin/views/page/index.php
	protected/modules/admin/views/page/update.php
	protected/modules/admin/views/page/view.php
	protected/modules/admin/views/place/_form.php
	protected/modules/admin/views/place/_search.php
	protected/modules/admin/views/place/_view.php
	protected/modules/admin/views/place/admin.php
	protected/modules/admin/views/place/create.php
	protected/modules/admin/views/place/index.php
	protected/modules/admin/views/place/update.php
	protected/modules/admin/views/place/view.php
	protected/modules/admin/views/pollOption/_form.php
	protected/modules/admin/views/pollOption/_search.php
	protected/modules/admin/views/pollOption/_view.php
	protected/modules/admin/views/pollOption/admin.php
	protected/modules/admin/views/pollOption/create.php
	protected/modules/admin/views/pollOption/index.php
	protected/modules/admin/views/pollOption/update.php
	protected/modules/admin/views/pollOption/view.php
	protected/modules/admin/views/pollQuestion/_form.php
	protected/modules/admin/views/pollQuestion/_search.php
	protected/modules/admin/views/pollQuestion/_view.php
	protected/modules/admin/views/pollQuestion/admin.php
	protected/modules/admin/views/pollQuestion/create.php
	protected/modules/admin/views/pollQuestion/index.php
	protected/modules/admin/views/pollQuestion/update.php
	protected/modules/admin/views/pollQuestion/view.php
	protected/modules/admin/views/profile/_form.php
	protected/modules/admin/views/profile/_search.php
	protected/modules/admin/views/profile/_view.php
	protected/modules/admin/views/profile/admin.php
	protected/modules/admin/views/profile/create.php
	protected/modules/admin/views/profile/index.php
	protected/modules/admin/views/profile/update.php
	protected/modules/admin/views/profile/view.php
	protected/modules/admin/views/rating/_form.php
	protected/modules/admin/views/rating/_search.php
	protected/modules/admin/views/rating/_view.php
	protected/modules/admin/views/rating/admin.php
	protected/modules/admin/views/rating/create.php
	protected/modules/admin/views/rating/index.php
	protected/modules/admin/views/rating/update.php
	protected/modules/admin/views/rating/view.php
	protected/modules/admin/views/site/contact.php
	protected/modules/admin/views/site/error.php
	protected/modules/admin/views/site/index.php
	protected/modules/admin/views/site/login.php
	protected/modules/admin/views/slider/_form.php
	protected/modules/admin/views/slider/_search.php
	protected/modules/admin/views/slider/_view.php
	protected/modules/admin/views/slider/admin.php
	protected/modules/admin/views/slider/create.php
	protected/modules/admin/views/slider/index.php
	protected/modules/admin/views/slider/update.php
	protected/modules/admin/views/slider/view.php
	protected/modules/admin/views/subCategory/_form.php
	protected/modules/admin/views/subCategory/_search.php
	protected/modules/admin/views/subCategory/_view.php
	protected/modules/admin/views/subCategory/admin.php
	protected/modules/admin/views/subCategory/adminAll.php
	protected/modules/admin/views/subCategory/create.php
	protected/modules/admin/views/subCategory/index.php
	protected/modules/admin/views/subCategory/update.php
	protected/modules/admin/views/subCategory/view.php
	protected/modules/admin/views/tags/_form.php
	protected/modules/admin/views/tags/_search.php
	protected/modules/admin/views/tags/_view.php
	protected/modules/admin/views/tags/admin.php
	protected/modules/admin/views/tags/create.php
	protected/modules/admin/views/tags/index.php
	protected/modules/admin/views/tags/update.php
	protected/modules/admin/views/tags/view.php
	protected/modules/admin/views/talkshowEpisode/_form.php
	protected/modules/admin/views/talkshowEpisode/_search.php
	protected/modules/admin/views/talkshowEpisode/_view.php
	protected/modules/admin/views/talkshowEpisode/admin.php
	protected/modules/admin/views/talkshowEpisode/adminAll.php
	protected/modules/admin/views/talkshowEpisode/create.php
	protected/modules/admin/views/talkshowEpisode/index.php
	protected/modules/admin/views/talkshowEpisode/update.php
	protected/modules/admin/views/talkshowProgram/_form.php
	protected/modules/admin/views/talkshowProgram/_search.php
	protected/modules/admin/views/talkshowProgram/_view.php
	protected/modules/admin/views/talkshowProgram/admin.php
	protected/modules/admin/views/talkshowProgram/adminAll.php
	protected/modules/admin/views/talkshowProgram/create.php
	protected/modules/admin/views/talkshowProgram/index.php
	protected/modules/admin/views/talkshowProgram/update.php
	protected/modules/admin/views/talkshowVideo/_form.php
	protected/modules/admin/views/talkshowVideo/_search.php
	protected/modules/admin/views/talkshowVideo/_view.php
	protected/modules/admin/views/talkshowVideo/admin.php
	protected/modules/admin/views/talkshowVideo/create.php
	protected/modules/admin/views/talkshowVideo/index.php
	protected/modules/admin/views/talkshowVideo/update.php
	protected/modules/admin/views/talkshowVideo/view.php
	protected/modules/admin/views/video/_form.php
	protected/modules/admin/views/video/_search.php
	protected/modules/admin/views/video/_view.php
	protected/modules/admin/views/video/admin.php
	protected/modules/admin/views/video/create.php
	protected/modules/admin/views/video/index.php
	protected/modules/admin/views/video/update.php
	protected/modules/admin/views/videoSource/_form.php
	protected/modules/admin/views/videoSource/_search.php
	protected/modules/admin/views/videoSource/_view.php
	protected/modules/admin/views/videoSource/admin.php
	protected/modules/admin/views/videoSource/create.php
	protected/modules/admin/views/videoSource/index.php
	protected/modules/admin/views/videoSource/update.php
	protected/modules/admin/views/videoSource/view.php
	protected/views/layouts/main.php
	protected/views/layouts/right_index.php
	protected/views/site/index.php
	protected/views/talkshowProgram/index.php