Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/admin.php
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/admin.php
course frontend
inquiry City/ State update not done
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	assets/pagescript/InquiryManage.js
Merge branch 'master' of https://github.com/dvlimbasiya/akshar_design_solution into dvlimbasiya-master

Conflicts:
	application/models/course_model.php
Merge branch 'dvlimbasiya-master'
validation change
Send Notification Complete
frontend_pages
Course and Search
Merge branch 'master' of https://github.com/mohit0202/akshar_design_solution

Conflicts:
	application/controllers/branch_manager_counsellor.php
Validations of Admin module
View Done of Branch staff
Merge pull request #61 from dvlimbasiya/master

Validations of Admin module
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/models/course_model.php
	application/views/backend/admin/course.php
Changes For Error Part 1
Search
Merge branch 'master' of https://github.com/mohit0202/akshar_design_solution
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/config/routes.php
	application/models/course_model.php