Got Settings View Controller Finished!
Got Map View Controller Finished!
Merge branch 'master' of https://github.com/koroket/MKSTFA

# By koroket
# Via koroket
* 'master' of https://github.com/koroket/MKSTFA:
  linking details done

Conflicts:
	TFE/SavedCardsDetailViewController.m