added filters
Merge branch 'master' of https://github.com/koroket/MKSTFA

Conflicts:
	ChoosePersonViewController.m
	TFE/Base.lproj/Main.storyboard
unlimited