天一：注册那边有点bug

什么都不输也可以注册啊...有default值..
哈哈哈
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/login.jsp
	WebContent/registration.jsp