Merge origin/master

Conflicts:
	grails-app/views/huinong/index/chuxiao.gsp
	grails-app/views/huinong/index/index.gsp
Signed-off-by:Administrator <Administrator@LBWin7>