Authored by cailing

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

# Conflicts:
#	template/m.yohobuy.com/actions/index/home/i-help.phtml
#	yohobuy/m.yohobuy.com/application/controllers/Home.php