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