final commit before transition to iOS7, backup for iOS 6.1 SDK build