Merge remote branch 'upstream/master'

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

Conflicts:
	application/controllers/admin.php
frontend_pages
Validatin Solved
Merge pull request #64 from dvlimbasiya/master

Validatin Solved
from view page checkbox deleted and sort modified
frontend_event
Merge pull request #65 from UnnatiPatel/master

from view page checkbox deleted and sort modified
Batch manage Change
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	assets/pagescript/BatchManage.js
Student Register
Merge pull request #62 from Dragonn11/master

validation change
Merge remote branch 'upstream/master'

Conflicts:
	assets/pagescript/BookInventoryManage.js
in view page sort changed
validation for branch manager module
Login Issue solve
Merge pull request #69 from dvlimbasiya/master

validation for branch manager module
Merge pull request #68 from UnnatiPatel/master

in view page sort changed
Request mearge
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution