Added filter icons
update to icons
Merge branch 'master' of https://github.com/SF-sense/sf-sense

Added icons
added new markers
update to CSS and functionality of displaying search options
Merge conflict resolved