fix pbx
Merge branch 'ui-redesign-2' of github.com:GrinnellAppDev/SandB-iOS into ui-redesign-2

Conflicts:
	SandB-iOS/SandB-iOS.xcodeproj/project.pbxproj