Some storyboard stuff
Merge branch 'master' of https://github.com/koroket/MKSTFA

# By koroket
# Via koroket
* 'master' of https://github.com/koroket/MKSTFA:
  server working

Conflicts:
	TFE/FBLogInViewController.m
Merge branch 'master' of https://github.com/koroket/MKSTFA

# By koroket
# Via koroket
* 'master' of https://github.com/koroket/MKSTFA:
  s
minor changes to Storyboard
Merge branch 'master' of https://github.com/koroket/MKSTFA

# By koroket
# Via koroket
* 'master' of https://github.com/koroket/MKSTFA:
  added google
New search working! New Location Working!
finished location
Merge branch 'master' of https://github.com/koroket/MKSTFA

# By koroket
# Via koroket
* 'master' of https://github.com/koroket/MKSTFA:
  fixed glitches
  fixed glitches
  final pop up working
  added google

Conflicts:
	GroupTableViewController.m
	TFE/Base.lproj/Main.storyboard
	TFE/FriendTableViewController.m