Created filters so a client can load all their data and just change the filters and re-render
Merge branch 'master' into gh-pages
Updated gh-pages