Update project settings for Xcode 5.1
Use instancetype for return type
Merge branch 'xcode6'