new filters
Merge branch 'master' into sean
filter removal
add custom cells, more filters
Merge branch 'master' into sean

Conflicts:
	Wilson.xcodeproj/project.pbxproj
Merge pull request #13 from evilstudios/sean

more filters and cells