Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/ajax_manager.php
	application/controllers/branch_manager_counsellor.php
	application/models/batch_model.php
	application/models/fee_model.php
	application/models/student_batch_model.php
	application/models/user_model.php
	application/views/backend/branch_manager/sendnotification.php
	application/views/backend/branch_manager/student_register.php
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/ajax_manager.php
	application/controllers/branch_manager_counsellor.php
	application/models/batch_model.php
	application/models/fee_model.php
	application/models/student_batch_model.php
	application/models/user_model.php
	application/views/backend/branch_manager/sendnotification.php
	application/views/backend/branch_manager/student_register.php
Merge remote branch 'upstream/master'

Conflicts:
	application/views/backend/branch_manager/send_notification.php
Merge remote branch 'upstream/master'
Send Notification Complete
Course / Branch and staff updated
Send Notification Complete
View Updated
Merge branch 'master' of https://github.com/mohit0202/akshar_design_solution

Conflicts:
	application/controllers/staff.php
	application/models/fee_model.php
	application/models/user_model.php
	application/views/backend/branch_manager/send_notification.php
change
Merge remote branch 'upstream1/master'

Conflicts:
	application/views/backend/admin/branch.php
view
Merge pull request #57 from dvlimbasiya/master

Frontend
Email and Random Password Changed
Add View of Table in Branch,Course,Staff,Batch,event,Target,Inquiry
Routes.php change
Merge pull request #58 from vaishali91/master

Add View of table in Branch,course,staff,batch,inquiry,event,targetreport
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'