Merge origin/master 2014.3.28 16:36  hxm modify tea-channel.gsp