fixed encoding problems
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebRoot/meidiserver/admin/verifyCode.jsp
	src/database/DB.java