integrating CocoaPods fix from @ccarse
add temp note about iOS 7
Merge branch 'release' of https://github.com/mapbox/mapbox-ios-sdk into smartmap-mapbox

Conflicts:
	MapBox.podspec