Merge origin/master 2014.3.31 14:31  hxm modify travel-content.gsp
Merge origin/master 2014.3.31 14:31  hxm add pictures to huinong2-hxmpic
Merge origin/master 2014.3.31 14:48  hxm modify fresh-channel.gsp
Merge origin/master 2014.3.31 15:07  hxm modify fresh-channel.gsp
Merge origin/master 2014.3.31 15:11  hxm modify fresh-channel.gsp
Merge origin/master