update from FTP files
satnambajwa
Merge branch 'master' of https://github.com/satnambajwa85/gudaak

Conflicts:
	image/logo_large.png
	protected/components/views/widgetUserProfile.php
	protected/controllers/SchoolController.php
	protected/controllers/UserController - Copy.php
	protected/controllers/UserController.php
	protected/models/CareerOptions.php
	protected/models/Tickets.php
	protected/models/UserProfiles.php
	protected/modules/admin/controllers/ArticlesController.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/careerOptions/update.php
	protected/runtime/application.log
	themes/template/css/dashboard.css
	themes/template/css/main-style-sheet.css
	themes/template/js/custom2.js
	themes/template/js/profle-pop-up.js
	themes/template/views/layouts/custom.js
	themes/template/views/layouts/dashboard.php
	themes/template/views/school/_counsellorComments.php
	themes/template/views/school/_detailedReport.php
	themes/template/views/school/_detailedReport2.php
	themes/template/views/school/studentDetails.php
	themes/template/views/site/articals.php
	themes/template/views/site/article.php
	themes/template/views/site/articles.php
	themes/template/views/user/_detailedReport.php
	themes/template/views/user/_detailedReport2.php
	themes/template/views/user/_subjectDetails.php
	themes/template/views/user/_talk.php
	themes/template/views/user/articles.php
	themes/template/views/user/articlesList.php
	themes/template/views/user/career.php
	themes/template/views/user/careerDetails.php
	themes/template/views/user/careerPdfReport.php
	themes/template/views/user/careerPdfReport1.php
	themes/template/views/user/detailedReport.php
	themes/template/views/user/detailedReport2.php
	themes/template/views/user/explore.php
	themes/template/views/user/index.php
	themes/template/views/user/pdfReport.php
	themes/template/views/user/pdfReport1.php
	themes/template/views/user/talk.php
	uploads/career/small/noimage.jpg
	uploads/schools/original/1393569759.jpg
	uploads/schools/original/1393569805.jpg
	uploads/schools/original/1393569858.jpg
	uploads/schools/original/1393569885.jpg
	uploads/schools/original/1393570027.jpg
	uploads/schools/original/1393570111.jpg
	uploads/schools/original/1393570174.jpg
	uploads/schools/original/1393570227.jpg
	uploads/schools/original/1393570338.jpg
	uploads/schools/original/1393570376.jpg
	uploads/schools/original/1393570605.jpg
	uploads/schools/original/1393570690.jpg
	uploads/schools/original/1393571028.jpg
change