Merge origin/master   hxm modify index.gsp
Signed-off-by:Administrator <Administrator@LBWin7>
Merge origin/master
Merge origin/master   hxm modify index.gsp
Signed-off-by:Administrator <Administrator@LBWin7>
Merge origin/master   hxm modify index.gsp
Signed-off-by:Administrator <Administrator@LBWin7>
Merge origin/master   hxm modify index.gsp
Signed-off-by:Administrator <Administrator@LBWin7>
Merge origin/master   hxm modify tea-gsp
Signed-off-by:Administrator <Administrator@LBWin7>
Merge origin/master   hxm modify index.gsp
Signed-off-by:Administrator <Administrator@LBWin7>
Merge origin/master

Conflicts:
	grails-app/views/huinong/index/chuxiao.gsp
	grails-app/views/huinong/index/index.gsp

Signed-off-by:Administrator <Administrator@LBWin7>