refs #326: revert to upstream, finalized iOS 7 callouts
Merge branch 'develop' of github.com:mapbox/mapbox-ios-sdk into develop
is that normal?