Integrating XMPPFramework as git submodule.
Merge branch 'master' of ssh://github.com/basl/social

Conflicts:
	Social.xcodeproj/project.pbxproj
Resolved Xcode project file conflict.