project
Merge branch 'master' of github.com:pffair/wjw

Conflicts:
	project.properties
修改注册页面
添加体现明晰