iOS 7

merge iOS 7 changes into master