更新: 修改饮食 时  还有 BUG  上传图片 有关
更新
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	build/classes/com/jinbi/action/BaseAction.class
	build/classes/com/jinbi/action/UserDataAction.class
	build/classes/com/jinbi/action/UserEatsAction.class
	build/classes/com/jinbi/action/UsersAction.class
	build/classes/com/jinbi/util/Tools.class