updated models !!
navigation updated
update
updates
Merge branch 'master' of https://github.com/venturepact/platform

Conflicts:
	protected/controllers/SiteController.php
	protected/models1/Developer.php
	protected/runtime/application.log
	themes/VP/views/admin1/jobs/_form.php
	themes/VP/views/user/dashboard.php
	themes/VP/views/user/jobs.php
	themes/VP/views/user/ndashboard.php
	themes/VP/views/user/status.php
updated
admin retrived
Image folder added!!
assests
updated
Merge branch 'master' of https://github.com/venturepact/platform

Conflicts:
	protected/models/Developer.php
	protected/modules/admin/controllers/AccountsController.php
	protected/modules/admin/controllers/CompanyController.php
	protected/modules/admin/controllers/CompanyHasDeveloperController.php
Updated with new Code!!
	protected/modules/admin/controllers/CompanyHasJobsController.php
	protected/modules/admin/controllers/DeveloperController.php
	protected/modules/admin/controllers/JobsController.php
	protected/modules/admin/controllers/TimeslotController.php
	protected/runtime/application.log
updated
Developer
updated
updated DynamicCity
Updated default location of links!!
Updated filter and view in admin.php
Updated all the views
Merge branch 'master' of https://github.com/venturepact/platform

Conflicts:
	protected/runtime/application.log