iO 7 Upgrade

Test and upgrade for iOS 7