Fix login and logout bug
Merge fix login and logout bug

Conflicts:
	NetworkedLifeWithFB/LoginViewController.m
	NetworkedLifeWithFB/en.lproj/MainStoryboard.storyboard