changes
changes
Merge branch 'master' of https://github.com/satnambajwa85/testing

Conflicts:
	protected/components/views/widgetSchoolMenu.php
	protected/components/views/widgetUserProfile.php
	protected/config/main.php
	protected/controllers/UserController.php
	protected/models/CollagesCoursesSpecialization.php
	protected/modules/admin/controllers/CareerAssessmentController.php
	protected/runtime/application.log
	save/protected/controllers/UserController.php
	save/themes/template/js/profle-pop-up.js
	themes/template/css/dashboard.css
	themes/template/js/custom2.js
	themes/template/views/school/_talk.php
	themes/template/views/school/talk.php
	themes/template/views/site/article.php
	themes/template/views/site/articles.php
	themes/template/views/user/_entranceExams.php
	themes/template/views/user/application.php
	themes/template/views/user/application1.php
Merge branch 'master' of https://github.com/satnambajwa85/testing

Conflicts:
	protected/controllers/CounsellorController.php
	protected/modules/admin/controllers - Copywithout cascade delete/AdminController.php
	protected/modules/admin/controllers - Copywithout cascade delete/ArticlesController.php
	protected/modules/admin/controllers - Copywithout cascade delete/CareerAssessmentController.php
	protected/modules/admin/controllers - Copywithout cascade delete/CareerCategoriesController.php
	protected/modules/admin/controllers - Copywithout cascade delete/CareerController.php
	protected/modules/admin/controllers - Copywithout cascade delete/CareerDetailsController.php
	protected/modules/admin/controllers - Copywithout cascade delete/CareerOptionsController.php
	protected/modules/admin/controllers - Copywithout cascade delete/EntranceExamsController.php
	protected/modules/admin/controllers - Copywithout cascade delete/EventsController.php
	protected/modules/admin/controllers - Copywithout cascade delete/GenerateGudaakIdsController.php
	protected/modules/admin/controllers - Copywithout cascade delete/ImagesController.php
	protected/modules/admin/controllers - Copywithout cascade delete/NewsController.php
	protected/modules/admin/controllers - Copywithout cascade delete/StreamController.php
	protected/modules/admin/controllers - Copywithout cascade delete/StreamHasCareerOptionsController.php
	protected/modules/admin/controllers/CitiesController.php
	protected/runtime/application.log
	themes/template/views/counsellor/_session.php
	themes/template/views/counsellor/school.php
	themes/template/views/counsellor/session.php
	themes/template/views/site/articlesList.php
	themes/template/views/user/_collage.php
	themes/template/views/user/collage1.php
	themes/template/views/user/detailedReportS.php