Nukes folders marked as submodules
Fixes pods issues
Merge branch 'develop' into new-model

Conflicts:
	Pods/Pods.xcodeproj/project.pbxproj