added filter (not working correctly) and icons
Merge branch 'develop' into shane
Merge pull request #24 from palmerhyde/shane

Added filter but not really working