add nutrition model
update by david
Merge branch 'master' of https://github.com/davidHuanghw/ZZJZ

Conflicts:
	Tpl/Portal/Public/header.html