Fixing broken project file
fixes to project file
Merge branch 'temp'

Conflicts:
	Pods/Pods.xcodeproj/project.pbxproj