remove application.js/.css from cache
working on search form
add search to adults/scouts/merit_badges index page
merge conflict fix