CourseCategory
username and database name changed
Merge remote branch 'upstream/master'
course category css file added
added coursecategory in controllers
modified
Course added
course.php modified
Change Password added
function name wrongly written so changed
course category changed
CourseCategoryManage.js modified
modified
ui design updated
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/views/backend/branch_manager/Batch.php
	application/views/backend/branch_manager/batch.php
	assets/pagescript/BatchManage.js
Merge pull request #7 from mohit0202/master

Event Module Display & Delete
UI design updated in all pages.
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/views/backend/branch_manager/event.php
	application/views/backend/branch_manager/target.php
minor change in target.php
Field added