Merge branch 'release/2.0.0' into develop
Update to iOS 7
Merge branch 'release/2.0.0'