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

Conflicts:
	csv/index.php
	protected/components/views/widgetUserProfile.php
	protected/config/main.php
	protected/controllers/UserController.php
	protected/models/Articles.php
	protected/models/Career.php
	protected/models/CareerAssessment.php
	protected/models/CareerCategories.php
	protected/models/CareerHasStream.php
	protected/models/CareerOptions.php
	protected/models/CareerOptionsHasInstitutes.php
	protected/models/CareerOptionsHasStream.php
	protected/models/Cities.php
	protected/models/City.php
	protected/models/Collage.php
	protected/models/Counselling.php
	protected/models/CounselorDetails.php
	protected/models/Countries.php
	protected/models/Course.php
	protected/models/CourseStream.php
	protected/models/Courses.php
	protected/models/EntranceCategory.php
	protected/models/EntranceExams.php
	protected/models/Events.php
	protected/models/GenerateGudaakIds.php
	protected/models/Images.php
	protected/models/Institutes.php
	protected/models/InstitutesHasAffiliations.php
	protected/models/InstitutesHasCourses.php
	protected/models/Interest.php
	protected/models/Interests.php
	protected/models/Messages.php
	protected/models/News.php
	protected/models/OrientCategories.php
	protected/models/OrientItems.php
	protected/models/QuestionOptions.php
	protected/models/Register.php
	protected/models/RetakeTestRequest.php
	protected/models/Schools.php
	protected/models/SchoolsHasUserLogin.php
	protected/models/SiteSetting.php
	protected/models/Slider.php
	protected/models/State.php
	protected/models/States.php
	protected/models/Stream.php
	protected/models/StreamHasCareer.php
	protected/models/StreamHasSubjects.php
	protected/models/Subjects.php
	protected/models/Summary.php
	protected/models/TestReports.php
	protected/models/Tickets.php
	protected/models/UserAcademicMedium.php
	protected/models/UserCareerPreference.php
	protected/models/UserClass.php
	protected/models/UserComments.php
	protected/models/UserEducation.php
	protected/models/UserFeedback.php
	protected/models/UserLogin.php
	protected/models/UserProfiles.php
	protected/models/UserProfilesHasInstitutes.php
	protected/models/UserProfilesHasInterests.php
	protected/models/UserProfilesHasStream.php
	protected/models/UserProfilesHasUserSubjects.php
	protected/models/UserRating.php
	protected/models/UserReports.php
	protected/models/UserRole.php
	protected/models/UserScores.php
	protected/models/UserStreamComments.php
	protected/models/UserStreamRating.php
	protected/models/UserSubjects.php
	protected/models/userCareerComments.php
	protected/modules/admin/controllers/ArticlesController.php
	protected/modules/admin/controllers/EntranceExamsController.php
	protected/modules/admin/views/careerOptions/_form.php
	protected/modules/admin/views/careerOptions/_form1.php
	protected/modules/admin/views/careerOptions/form.php
	protected/modules/admin/views/entranceExams/_form.php
	protected/modules/admin/views/entranceExams/admin.php
	protected/modules/admin/views/layouts/admin.php
	protected/runtime/application.log
	themes/template/js/profle-pop-up.js
	themes/template/views/layouts/custom.js
	themes/template/views/school/_counsellorComments.php
	themes/template/views/school/_detailedReport.php
	themes/template/views/school/_detailedReport2.php
	themes/template/views/site/articals.php
	themes/template/views/site/article.php
	themes/template/views/site/articles.php
	themes/template/views/user/_talk.php
	themes/template/views/user/careerPdfReport.php
	themes/template/views/user/careerPdfReport1.php
	themes/template/views/user/careerPdfReportTemp.php
	themes/template/views/user/collage.php
	themes/template/views/user/detailedReport.php
	themes/template/views/user/detailedReport2.php
	themes/template/views/user/news.php
	themes/template/views/user/newsUpdates.php
	themes/template/views/user/pdfReport.php
	themes/template/views/user/pdfReport1.php
	themes/template/views/user/talk.php