Merge origin/master 2014.3.31 14:13  hxm modify tea-channel.gsp