报名页面
Merge branch 'master' of github.com:man-man/man

Conflicts:
	res/values/strings.xml