Added per Xcode 5 warning
Merge branch 'develop' into CPTDevelopment