recommend image
Merge branch 'master' of https://github.com/huangtao800/waterTip.git

Conflicts:
	res/values/recommend.xml