Merge branch 'search_form' into 'permission_fix'

# Conflicts:
#   test/controllers/sectors_controller_test.rb
1 job for permission_fix in 2 minutes and 35 seconds (queued for 2 seconds)