Automatic Xcode changes
Merge branch 'master' of github.com:fluxtream/fluxtream-capture-ios

Conflicts:
	FluxtreamCapture.xcodeproj/project.pbxproj
Automatic xcode change