更新
更新
Merge branch 'master' of https://github.com/wikimo/jinbi

Conflicts:
	build/classes/com/jinbi/action/LoginAction.class
	build/classes/com/jinbi/action/UsersAction.class
更新
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	WebContent/userdietactivity/diet.jsp
	src/com/jinbi/action/UserDietActivityAction.java
	src/com/jinbi/dto/UserDietActivityDTO.java
	src/com/jinbi/model/UserDietActivity.xml
	src/com/jinbi/service/impl/UserDietActivityServiceImpl.java