proxy server for search
Merge branch 'server'