Updates for iOS 7.
Merge branch 'working'

* working:
  Updates for iOS 7.