still working on filters
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/resources/filters/poison/StatePoisonFilter.txt