Merge origin/master 2014.4.4 15:26  hxm modify tea-search.gsp