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