整合我的注册
Merge remote-tracking branch 'origin/master'

Conflicts:
	srcresources/server.properties
fix welcome page