Merge branch 'search_with_thinkingsphinx' into custom