set SDKROOT to iphoneos to build for device
Merge branch 'newbranch'

Conflicts:
	fmdb.xcodeproj/project.pbxproj