update to iOS7
Merge branch 'work'