Update build target for iOS 7
Merge remote-tracking branch 'origin/develop' into develop