staff city state add
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution
from sendnotification to send_notification
change to branchCode from branchId
Email Send
Stafff changes done
1) City & State Ajax added
2) USerid Generation Code added
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/controllers/branch_manager_counsellor.php
	application/models/user_model.php
Course and Course Categories updated
CourseCode Generated by user
minor change in CourseManage.js
Course / Branch and staff updated
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
Frontend
Merge pull request #57 from dvlimbasiya/master

Frontend
Send Notification Complete