fix library/framework search paths
Merge branch 'develop' into features/storyboard

Conflicts:
	CashFlow.xcodeproj/project.pbxproj