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