add friendSearch view
add user setting cell
Merge branch 'master' of https://github.com/matcher-git/Matchbox-iOS
Merge branch 'master' of https://github.com/matcher-git/Matchbox-iOS
Merge branch 'master' of https://github.com/matcher-git/Matchbox-iOS

Conflicts:
	MatchBox/View/MatchSuccessView.xib
add friend detail view