recompile with Xcode 5.0.1 and iOS 7.0
Merge branch 'develop'