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

Conflicts:
	TFE/Base.lproj/Main.storyboard
added loading
Merge branch 'master' of https://github.com/koroket/MKSTFA

Conflicts:
	TFE/Base.lproj/Main.storyboard
	TFE/SearchSettingViewController.m
badges
Merge branch 'master' of https://github.com/koroket/MKSTFA