adding search by text or filter
Merge branch 'dan-working' of https://github.com/AmericanRedCross/Mapfolio into dan-working

Conflicts:
	js/main.js