Merge origin/master 2014.4.15 10:27  hxm modify tea-channel.gsp