merge pull reqeust fixing for iOS7 and Xcode5 into master