updated project settings
Project Settings
Project Settings
Merge branch 'master' of https://github.com/facebook/AsyncDisplayKit

Conflicts:
	AsyncDisplayKit.xcodeproj/project.pbxproj