FilterStore update
Merge remote-tracking branch 'origin/master'

Conflicts:
	State/src/com/snyder/state/store/FilterStore.java