fixed bad action link in header search form
remaining dirty code removed
Merge branch 'release/sunnyspring' of https://github.com/ImaginationForPeople/imaginationforpeople into release/sunnyspring