add sphinx search
add search controller
add search form
fix merge conflict