update login methods
Merge branch 'master' of https://github.com/matcher-git/Matchbox-iOS

Conflicts:
	MatchBox.xcodeproj/project.pbxproj
	MatchBox/App/AppDelegate.m
	MatchBox/MatchBox-Prefix.pch