Facebook oauth changes
Merge branch 'master' of github.com:chrisballinger/ChatSecure-iOS

Conflicts:
	ChatSecure.xcodeproj/project.pbxproj
	Podfile.lock
updated Facebook