。。
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	WebContent/userdietactivity/diet.jsp