Update Db
home utf-8
Merge remote-tracking branch 'origin/master'

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	WebContent/WEB-INF/jsp/student/student_header.jsp
update conflict file
Update DB