student modify error fixed
merge
Merge branch 'master' of https://github.com/isuruf/OOSDWeb

Conflicts:
	web/schoolDashboard.jsp
Merge branch 'master' of https://github.com/isuruf/OOSDWeb

Conflicts:
	web/schoolDashboard.jsp