merging w luke
Merge branch 'master' of https://github.com/koroket/MKSTFA

Conflicts:
	TFE/SearchSettingViewController.m
pull pre table custom - masa
Merge branch 'master' of https://github.com/koroket/MKSTFA

Conflicts:
	TFE/Base.lproj/Main.storyboard
pics at tables working