Fixes for iOS7 and Xcode5
Merge pull request #2873 from ricardoquesada/ios7_xcode5_fixes

Fixes for iOS7 and Xcode5