Updated Xcode config.
Merge branch 'master' into develop
Demo compiles with iOS 7 SDK.
Improved compatibility with iOS 7.