Added search_controller_spec, moved some tests from people_controller_spec to search_controller_spec
Fixed merged conflict in Changelog
update routes and search controller
remove useless except from search controller
Fix indentation in search_controller