Merge branch 'master' of https://github.com/manilion/haoziwei

Conflicts:
	haoziwei/WebContent/recipes.html
Merge branch 'master' of https://github.com/manilion/haoziwei