fixed JS and titles in template and fixed location filter name
Merge branch 'release/sunnyspring' of https://github.com/ImaginationForPeople/imaginationforpeople into release/sunnyspring

Conflicts:
	apps/i4p_base/static/js/search/search_filter.js