recipe procedure image upload
Merge branch 'master' of https://github.com/yang-chao/GoCook_Android

Conflicts:
	GoCook/res/values/strings.xml