Fix travis CI build?
Fail over to unformatted xcodebuild output if xcpretty crashes
Merge branch 'develop' into numist/preferences

Conflicts:
	Podfile.lock