Update project settings for Xcode 5
Add super to fix category macros
Merge remote-tracking branch 'origin/develop'