更新

1.模块功能细化
2.添加了季节模块
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	WebContent/usereats/UserEats_selectAll.jsp
	WebContent/usereats/userSportslist.jsp
	WebContent/usersports/update.jsp
	src/application_userdata.xml
	src/log4j.properties
更新
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	src/com/jinbi/service/UserEatsService.java
	src/com/jinbi/service/UserSportsService.java
登陆模块更新

添加了用户登陆的验证
上次登陆时间、上次登陆IP功能完成