小修改  请更新
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	WebContent/js/dietlist.js
	WebContent/userdietactivity/dietlist.jsp