Adds support for initial filter data.
Merge branch 'master' into HEAD

Conflicts:
	datafilters/views.py