Fixes pods project
Merge branch 'develop' into new-model

Conflicts:
	Pods/Pods.xcodeproj/project.pbxproj