Merge origin/master 2014.3.31 14:08  hxm modify travel-channel.gsp
Merge origin/master 2014.3.31 14:08  hxm modify search.gsp