merge release back into develop

 Changelog
 Changelog
 ---------
 ---------
 
 
+### 1.2.0
+#### June 23, 2014
+
+  - Added an `RMGreatCircleAnnotation` class for geodesic polylines. 
+  - Allow for additional touch gesture padding around thin `RMShape` layers. 
+  - Added an `RMTileCache` method for retrieving anticipated raster tile background download counts for a given coverage area. 
+  - Added some documentation to the now-supported `RMCompositeSource` for client-side raster tile compositing.
+  - Upgraded SMCalloutView with updated iOS 7+ support. 
+  - No longer allow callouts on non-marker annotation layers.
+  - Minor fix to center coordinate/zoom level animation method. 
+  - Use magnetic heading if true heading isn't accurate. 
+  - Added a debug log when using the default watermarked map style. 
+  - Updated some syntax to the newer boxed literals. 
+  - Removed some compiler flags that would over-optimize and make debugging difficult. 
+  - Made some improvements to the map view long-press gesture. 
+  - Fixed an issue with certain tile sources having wrong tile image request methods called. 
+  - Fixed some issues with the SQLite-backed tile cache not reclaiming freed disk space. 
+  - Fixed some retain cycle memory use bugs.
+  - Fixed a bug when toggling the logo bug and attribution button. 
+  - Fixed a crash when trying to add invalid annotations. 
+  - Fixed a bug with `RMStaticMapView` always using the default map style. 
+
 ### 1.1.0
 ### 1.1.0
 #### January 2, 2014
 #### January 2, 2014
 
 

 //
 //
-//  RMGreatCircleAnnotation.m
+//  RMGreatCircleAnnotation.h
 //  MapView
 //  MapView
 //
 //
 // Copyright (c) 2008-2013, Route-Me Contributors
 // Copyright (c) 2008-2013, Route-Me Contributors
@@ -28,11 +28,20 @@
 
 
 #import "RMShapeAnnotation.h"
 #import "RMShapeAnnotation.h"
 
 
+/** An RMGreatCircleAnnotation class represents a line shape that traces the shortest path along the surface of the Earth. You specify a great circle (also known as a geodesic polyline) using a pair of points. When displayed on a two-dimensional map view, the line segment between the two points may appear curved. */
 @interface RMGreatCircleAnnotation : RMShapeAnnotation
 @interface RMGreatCircleAnnotation : RMShapeAnnotation
 
 
+/** Initialize a great circle annotation using the specified coordinates.
+*   @param aMapView The map view on which to place the annotation.
+*   @param coordinate1 The starting coordinate.
+*   @param coordinate2 The ending coordinate. 
+*   @return An initialized great circle annotation object, or `nil` if an annotation was unable to be initialized. */
 - (id)initWithMapView:(RMMapView *)aMapView coordinate1:(CLLocationCoordinate2D)coordinate1 coordinate2:(CLLocationCoordinate2D)coordinate2;
 - (id)initWithMapView:(RMMapView *)aMapView coordinate1:(CLLocationCoordinate2D)coordinate1 coordinate2:(CLLocationCoordinate2D)coordinate2;
 
 
+/** The starting coordinate of the annotation. */
 @property (nonatomic, readonly, assign) CLLocationCoordinate2D coordinate1;
 @property (nonatomic, readonly, assign) CLLocationCoordinate2D coordinate1;
+
+/** The ending coordinate of the annotation. */
 @property (nonatomic, readonly, assign) CLLocationCoordinate2D coordinate2;
 @property (nonatomic, readonly, assign) CLLocationCoordinate2D coordinate2;
 
 
 @end
 @end

 Pod::Spec.new do |m|
 Pod::Spec.new do |m|
 
 
   m.name    = 'Mapbox'
   m.name    = 'Mapbox'
-  m.version = '1.1.0'
+  m.version = '1.2.0'
 
 
   m.summary     = 'Open source alternative to MapKit.'
   m.summary     = 'Open source alternative to MapKit.'
   m.description = 'Open source alternative to MapKit supporting custom tile sources, offline use, and complete cache control.'
   m.description = 'Open source alternative to MapKit supporting custom tile sources, offline use, and complete cache control.'