diff --git a/Podfile.lock b/Podfile.lock
index a459704..2f295ca 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -15,10 +15,10 @@ PODS:
     - GoogleMaps
   - Google-Maps-iOS-Utils/QuadTree (2.1.0):
     - GoogleMaps
-  - GoogleMaps (2.5.0):
-    - GoogleMaps/Maps (= 2.5.0)
-  - GoogleMaps/Base (2.5.0)
-  - GoogleMaps/Maps (2.5.0):
+  - GoogleMaps (2.6.0):
+    - GoogleMaps/Maps (= 2.6.0)
+  - GoogleMaps/Base (2.6.0)
+  - GoogleMaps/Maps (2.6.0):
     - GoogleMaps/Base
   - Shimmer (1.0.2)
 
@@ -29,7 +29,7 @@ DEPENDENCIES:
 
 SPEC CHECKSUMS:
   Google-Maps-iOS-Utils: c32891ff472eaaa1fca032beedafa1a013af7875
-  GoogleMaps: c087b8e5dfe87ca6ebf59adb9b4894a4146bec4f
+  GoogleMaps: 42f91c68b7fa2f84d5c86597b18ceb99f5414c7f
   Shimmer: c5374be1c2b0c9e292fb05b339a513cf291cac86
 
 PODFILE CHECKSUM: 0b7b1edf68be7d024e470e8f004a2735bc18e5a8
diff --git a/Pods/GoogleMaps/Base/Frameworks/GoogleMapsBase.framework/GoogleMapsBase b/Pods/GoogleMaps/Base/Frameworks/GoogleMapsBase.framework/GoogleMapsBase
index 8780d47..6c408cd 100755
Binary files a/Pods/GoogleMaps/Base/Frameworks/GoogleMapsBase.framework/GoogleMapsBase and b/Pods/GoogleMaps/Base/Frameworks/GoogleMapsBase.framework/GoogleMapsBase differ
diff --git a/Pods/GoogleMaps/CHANGELOG b/Pods/GoogleMaps/CHANGELOG
index 55c83b1..13ba9c7 100755
--- a/Pods/GoogleMaps/CHANGELOG
+++ b/Pods/GoogleMaps/CHANGELOG
@@ -1,3 +1,23 @@
+Version 2.6.0 - February 2017
+=============================
+Features:
+  - Added a mechanism for Developers to enable experimental features.
+  - Added a click listener to the My Location dot. This allows developers to
+    respond to interactions with the My Location dot.
+  - Added a Source attribute to Panorama searches allowing them to be restricted
+    to outdoor-only results. Note that this feature is experimental and some
+    searches may still include indoor panoramas.
+
+Improvements:
+  - Updated the default marker to match the new Google Maps marker.
+  - iOS 11 OpenGL crash reduction.
+
+Resolved Issues:
+  - Fixed a compile error when the -Wobjc-property-no-attribute flag is used.
+
+Note:
+  - CoreImage has been added as a dependency.
+
 Version 2.5.0 - October 2017
 ============================
 Features:
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos.xcodeproj/project.pbxproj b/Pods/GoogleMaps/Example/GoogleMapsDemos.xcodeproj/project.pbxproj
index 01802d4..48e3ece 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos.xcodeproj/project.pbxproj
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos.xcodeproj/project.pbxproj
@@ -59,10 +59,10 @@
 		A0519847128EE65F32DFC710 /* MarkerEventsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9450C49DDD49AF9182779EB /* MarkerEventsViewController.m */; };
 		A1D6465072A5166D4F9DE0DA /* MapZoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B3D673FA7036FA5D07CB287 /* MapZoomViewController.m */; };
 		A1F2D1C33D98B28D454849A2 /* step2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F955F74654756E7F7DBD9C1 /* step2@2x.png */; };
-		A3AD48A0ED08A1058818A8EC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F4C119D42CF37317FA0DFA9 /* UIKit.framework */; };
 		B646C0BAD2A245557B519931 /* step1.png in Resources */ = {isa = PBXBuildFile; fileRef = D66EF243066A58A0D10280D4 /* step1.png */; };
 		B6FD2D297FB38A36DF99D9D7 /* MyLocationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BF0878372A9A7274B74BCBE0 /* MyLocationViewController.m */; };
 		B7739DA0E40B29386E103FBD /* BasicMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5AD93CD72DE8F5B004A621 /* BasicMapViewController.m */; };
+		B96B00239590850A49AC33AD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F4C119D42CF37317FA0DFA9 /* UIKit.framework */; };
 		BA2D028BE5ED8042FEB05D8F /* bulgaria.png in Resources */ = {isa = PBXBuildFile; fileRef = 2BC67BDB51522BC85EBFED8E /* bulgaria.png */; };
 		BB8A8CE2A1D1FBEA6A4CE003 /* GestureControlViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71CE23C2A26FD3C29E6AEEA7 /* GestureControlViewController.m */; };
 		C0210C5B8B348A0348D92DA9 /* step8@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D5E5AF68BBC86BA530755A20 /* step8@2x.png */; };
@@ -236,7 +236,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A3AD48A0ED08A1058818A8EC /* UIKit.framework in Frameworks */,
+				B96B00239590850A49AC33AD /* UIKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -247,7 +247,7 @@
 			isa = PBXGroup;
 			children = (
 				3F84FF5646DF0F79669A6A34 /* Source */,
-				5D746A04C18655A0D40C68B8 /* Frameworks */,
+				89188BA529E9696AD04AD794 /* Frameworks */,
 				9C667AD7285A7D36180D29BE /* Products */,
 			);
 			sourceTree = "<group>";
@@ -276,7 +276,7 @@
 			path = GoogleMapsDemos;
 			sourceTree = "<group>";
 		};
-		5D746A04C18655A0D40C68B8 /* Frameworks */ = {
+		89188BA529E9696AD04AD794 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 				6F4C119D42CF37317FA0DFA9 /* UIKit.framework */,
@@ -461,7 +461,6 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 0900;
 			};
 			buildConfigurationList = 80C3BB6A64A9375104C7ACB9 /* Build configuration list for PBXProject "GoogleMapsDemos" */;
 			compatibilityVersion = "Xcode 3.2";
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/DemoAppDelegate.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/DemoAppDelegate.m
index 71b0422..63dbc60 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/DemoAppDelegate.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/DemoAppDelegate.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/DemoAppDelegate.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Info.plist b/Pods/GoogleMaps/Example/GoogleMapsDemos/Info.plist
index 2bc0fc8..d5172fe 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Info.plist
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Info.plist
@@ -18,8 +18,6 @@
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/MasterViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/MasterViewController.m
index c798aa3..3ede05e 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/MasterViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/MasterViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/MasterViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/AnimatedCurrentLocationViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/AnimatedCurrentLocationViewController.m
index 280e39b..040a213 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/AnimatedCurrentLocationViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/AnimatedCurrentLocationViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/AnimatedCurrentLocationViewController.h"
 
 @implementation AnimatedCurrentLocationViewController {
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/AnimatedUIViewMarkerViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/AnimatedUIViewMarkerViewController.m
index 5414a96..e3e0596 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/AnimatedUIViewMarkerViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/AnimatedUIViewMarkerViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/AnimatedUIViewMarkerViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/BasicMapViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/BasicMapViewController.m
index c46c77f..2db2490 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/BasicMapViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/BasicMapViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/BasicMapViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/CameraViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/CameraViewController.m
index 0e43a3a..f9836c6 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/CameraViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/CameraViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/CameraViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/CustomIndoorViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/CustomIndoorViewController.m
index ab77449..f0c2b5d 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/CustomIndoorViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/CustomIndoorViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/CustomIndoorViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/CustomMarkersViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/CustomMarkersViewController.m
index f0d0bfc..882247b 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/CustomMarkersViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/CustomMarkersViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/CustomMarkersViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/DoubleMapViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/DoubleMapViewController.m
index e62c03b..f5890ef 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/DoubleMapViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/DoubleMapViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/DoubleMapViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/FitBoundsViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/FitBoundsViewController.m
index c68d91a..a81db15 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/FitBoundsViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/FitBoundsViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/FitBoundsViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/FixedPanoramaViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/FixedPanoramaViewController.m
index 56b9515..a33b72e 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/FixedPanoramaViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/FixedPanoramaViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/FixedPanoramaViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/FrameRateViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/FrameRateViewController.m
index 28d2a42..b27447e 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/FrameRateViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/FrameRateViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/FrameRateViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GeocoderViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GeocoderViewController.m
index c601f13..4f6ab8c 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GeocoderViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GeocoderViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/GeocoderViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GestureControlViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GestureControlViewController.m
index 6b44381..6de29b0 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GestureControlViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GestureControlViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/GestureControlViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GradientPolylinesViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GradientPolylinesViewController.m
index f6e0d9c..fb16545 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GradientPolylinesViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GradientPolylinesViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/GradientPolylinesViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GroundOverlayViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GroundOverlayViewController.m
index 17210ba..759cf70 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GroundOverlayViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/GroundOverlayViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/GroundOverlayViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/IndoorMuseumNavigationViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/IndoorMuseumNavigationViewController.m
index 36db445..aa2ca13 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/IndoorMuseumNavigationViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/IndoorMuseumNavigationViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/IndoorMuseumNavigationViewController.h"
 
 @implementation IndoorMuseumNavigationViewController {
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/IndoorViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/IndoorViewController.m
index 915aa88..4a11a0e 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/IndoorViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/IndoorViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/IndoorViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MapLayerViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MapLayerViewController.m
index 1e7f5e1..ac97044 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MapLayerViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MapLayerViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/MapLayerViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MapTypesViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MapTypesViewController.m
index 04c5e05..4723464 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MapTypesViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MapTypesViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/MapTypesViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MapZoomViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MapZoomViewController.m
index ffa4196..9c4ad6d 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MapZoomViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MapZoomViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/MapZoomViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkerEventsViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkerEventsViewController.m
index 79f2444..451e3af 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkerEventsViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkerEventsViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/MarkerEventsViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkerInfoWindowViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkerInfoWindowViewController.m
index e57f42b..9db5eb3 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkerInfoWindowViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkerInfoWindowViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/MarkerInfoWindowViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkerLayerViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkerLayerViewController.m
index 7ba2ff8..99e89c1 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkerLayerViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkerLayerViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/MarkerLayerViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkersViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkersViewController.m
index 063ea9c..84d9f71 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkersViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MarkersViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/MarkersViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MyLocationViewController.h b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MyLocationViewController.h
index a9e2723..2e6c16a 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MyLocationViewController.h
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MyLocationViewController.h
@@ -15,6 +15,8 @@
 
 #import <UIKit/UIKit.h>
 
-@interface MyLocationViewController : UIViewController
+#import <GoogleMaps/GoogleMaps.h>
+
+@interface MyLocationViewController : UIViewController <GMSMapViewDelegate>
 
 @end
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MyLocationViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MyLocationViewController.m
index e2c051b..fb7b32b 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MyLocationViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/MyLocationViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/MyLocationViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
@@ -33,6 +29,7 @@ - (void)viewDidLoad {
                                                                zoom:12];
 
   _mapView = [GMSMapView mapWithFrame:CGRectZero camera:camera];
+  _mapView.delegate = self;
   _mapView.settings.compassButton = YES;
   _mapView.settings.myLocationButton = YES;
 
@@ -50,6 +47,21 @@ - (void)viewDidLoad {
   });
 }
 
+- (void)mapView:(GMSMapView *)mapView didTapMyLocation:(CLLocationCoordinate2D)location {
+  NSString *message = [NSString stringWithFormat:@"My Location Dot Tapped at: [lat: %f, lng: %f]",
+                                                 location.latitude, location.longitude];
+  UIAlertController *alertController =
+      [UIAlertController alertControllerWithTitle:@"Location Tapped"
+                                          message:message
+                                   preferredStyle:UIAlertControllerStyleAlert];
+  UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"OK"
+                                                     style:UIAlertActionStyleDefault
+                                                   handler:^(UIAlertAction *action){
+                                                   }];
+  [alertController addAction:okAction];
+  [self presentViewController:alertController animated:YES completion:nil];
+}
+
 - (void)dealloc {
   [_mapView removeObserver:self
                 forKeyPath:@"myLocation"
@@ -63,7 +75,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
                         change:(NSDictionary *)change
                        context:(void *)context {
   if (!_firstLocationUpdate) {
-    // If the first location update has not yet been recieved, then jump to that
+    // If the first location update has not yet been received, then jump to that
     // location.
     _firstLocationUpdate = YES;
     CLLocation *location = [change objectForKey:NSKeyValueChangeNewKey];
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PaddingBehaviorViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PaddingBehaviorViewController.m
index a28a5e0..f9c48d0 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PaddingBehaviorViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PaddingBehaviorViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/PaddingBehaviorViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PanoramaViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PanoramaViewController.m
index 7582714..4d2a221 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PanoramaViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PanoramaViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/PanoramaViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PolygonsViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PolygonsViewController.m
index 32c7158..0e21a87 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PolygonsViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PolygonsViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/PolygonsViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PolylinesViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PolylinesViewController.m
index 257e759..5313cf0 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PolylinesViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/PolylinesViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/PolylinesViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/Samples.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/Samples.m
index a22c21c..13d7a48 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/Samples.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/Samples.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/Samples.h"
 
 // Map Demos
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/SnapshotReadyViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/SnapshotReadyViewController.m
index 9dfa981..1193924 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/SnapshotReadyViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/SnapshotReadyViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/SnapshotReadyViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/StructuredGeocoderViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/StructuredGeocoderViewController.m
index 34ec2ed..e6fb1af 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/StructuredGeocoderViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/StructuredGeocoderViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/StructuredGeocoderViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/StyledMapViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/StyledMapViewController.m
index 00e2436..3fe7522 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/StyledMapViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/StyledMapViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/StyledMapViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/TileLayerViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/TileLayerViewController.m
index d67dbc8..fa07c9d 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/TileLayerViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/TileLayerViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/TileLayerViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/TrafficMapViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/TrafficMapViewController.m
index 08d6913..64c917a 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/TrafficMapViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/TrafficMapViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/TrafficMapViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/VisibleRegionViewController.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/VisibleRegionViewController.m
index e9d1491..ef02666 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/VisibleRegionViewController.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/Samples/VisibleRegionViewController.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import "GoogleMapsDemos/Samples/VisibleRegionViewController.h"
 
 #import <GoogleMaps/GoogleMaps.h>
diff --git a/Pods/GoogleMaps/Example/GoogleMapsDemos/main.m b/Pods/GoogleMaps/Example/GoogleMapsDemos/main.m
index 98e341e..ef39b8a 100755
--- a/Pods/GoogleMaps/Example/GoogleMapsDemos/main.m
+++ b/Pods/GoogleMaps/Example/GoogleMapsDemos/main.m
@@ -13,10 +13,6 @@
  * permissions and limitations under the License.
  */
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 #import <UIKit/UIKit.h>
 
 #import "GoogleMapsDemos/DemoAppDelegate.h"
diff --git a/Pods/GoogleMaps/Example/Podfile b/Pods/GoogleMaps/Example/Podfile
index 45ba670..c1b737a 100755
--- a/Pods/GoogleMaps/Example/Podfile
+++ b/Pods/GoogleMaps/Example/Podfile
@@ -1,5 +1,5 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
 target 'GoogleMapsDemos' do
-    pod 'GoogleMaps', '= 2.5.0'
+    pod 'GoogleMaps', '= 2.6.0'
 end
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/GoogleMaps b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/GoogleMaps
index 8290410..63701d7 100755
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/GoogleMaps and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/GoogleMaps differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSMapView.h b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSMapView.h
index 7c58d45..2bf67a2 100755
--- a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSMapView.h
+++ b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSMapView.h
@@ -183,6 +183,13 @@ NS_ASSUME_NONNULL_BEGIN;
  */
 - (BOOL)didTapMyLocationButtonForMapView:(GMSMapView *)mapView;
 
+/**
+ * Called when the My Location Dot is tapped.
+ *
+ * @param location The location of the user when the location dot was tapped.
+ */
+- (void)mapView:(GMSMapView *)mapView didTapMyLocation:(CLLocationCoordinate2D)location;
+
 /**
  * Called when tiles have just been requested or labels have just started rendering.
  */
@@ -434,7 +441,7 @@ typedef NS_ENUM(NSUInteger, GMSMapViewPaddingAdjustmentBehavior) {
  * If not nil, constrains the camera target so that gestures cannot cause it to leave the specified
  * bounds.
  */
-@property(nonatomic, nullable) GMSCoordinateBounds *cameraTargetBounds;
+@property(nonatomic, strong, nullable) GMSCoordinateBounds *cameraTargetBounds;
 
 /**
  * Builds and returns a GMSMapView, with a frame and camera target.
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSPanoramaService.h b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSPanoramaService.h
index 7d212de..d28fc63 100755
--- a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSPanoramaService.h
+++ b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSPanoramaService.h
@@ -10,6 +10,8 @@
 
 #import <CoreLocation/CoreLocation.h>
 
+#import "GMSPanoramaSource.h"
+
 @class GMSPanorama;
 
 NS_ASSUME_NONNULL_BEGIN;
@@ -47,6 +49,27 @@ typedef void (^GMSPanoramaCallback)(GMSPanorama *_Nullable panorama, NSError *_N
                                radius:(NSUInteger)radius
                              callback:(GMSPanoramaCallback)callback;
 
+/**
+ * Similar to requestPanoramaNearCoordinate:callback: but allows specifying the panorama source type
+ * near the given |coordinate|.
+ *
+ * This API is experimental and may not always filter by source.
+ */
+- (void)requestPanoramaNearCoordinate:(CLLocationCoordinate2D)coordinate
+                               source:(GMSPanoramaSource)source
+                             callback:(GMSPanoramaCallback)callback;
+
+/**
+ * Similar to requestPanoramaNearCoordinate:callback: but allows specifying a search radius (meters)
+ * and the panorama source type near the given |coordinate|.
+ *
+ * This API is experimental and may not always filter by source.
+ */
+- (void)requestPanoramaNearCoordinate:(CLLocationCoordinate2D)coordinate
+                               radius:(NSUInteger)radius
+                               source:(GMSPanoramaSource)source
+                             callback:(GMSPanoramaCallback)callback;
+
 /**
  * Retrieves information about a panorama with the given |panoramaID|.
  *
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSPanoramaSource.h b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSPanoramaSource.h
new file mode 100755
index 0000000..285a6b4
--- /dev/null
+++ b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSPanoramaSource.h
@@ -0,0 +1,30 @@
+//
+//  GMSPanoramaSource.h
+//  Google Maps SDK for iOS
+//
+//  Copyright 2017 Google Inc.
+//
+//  Usage of this SDK is subject to the Google Maps/Google Earth APIs Terms of
+//  Service: https://developers.google.com/maps/terms
+//
+
+#import <Foundation/Foundation.h>
+
+/**
+ * \defgroup PanoramaSource GMSPanoramaSource
+ * {@
+ */
+
+/**
+ * Source types for Panoramas. Used to specify the source of a StreetView Panorama.
+ *
+ * This API is experimental. Results may not always match expectations.
+ */
+typedef NS_ENUM(NSUInteger, GMSPanoramaSource) {
+  /** Panoramas of locations either inside or outside. */
+  kGMSPanoramaSourceDefault = 0,
+  /** Panoramas of locations outside. */
+  kGMSPanoramaSourceOutside,
+};
+
+/**@}*/
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSPanoramaView.h b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSPanoramaView.h
index ad6e109..127de96 100755
--- a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSPanoramaView.h
+++ b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSPanoramaView.h
@@ -13,6 +13,7 @@
 
 #import "GMSOrientation.h"
 #import "GMSPanoramaLayer.h"
+#import "GMSPanoramaSource.h"
 
 @class GMSMarker;
 @class GMSPanorama;
@@ -206,6 +207,23 @@ NS_ASSUME_NONNULL_BEGIN;
  */
 - (void)moveNearCoordinate:(CLLocationCoordinate2D)coordinate radius:(NSUInteger)radius;
 
+/**
+ * Similar to moveNearCoordinate: but allows specifying a source near |coordinate|.
+ *
+ * This API is experimental and may not always filter by source.
+ */
+- (void)moveNearCoordinate:(CLLocationCoordinate2D)coordinate source:(GMSPanoramaSource)source;
+
+/**
+ * Similar to moveNearCoordinate: but allows specifying a search radius (meters) around
+ * |coordinate| and a source.
+ *
+ * This API is experimental and may not always filter by source.
+ */
+- (void)moveNearCoordinate:(CLLocationCoordinate2D)coordinate
+                    radius:(NSUInteger)radius
+                    source:(GMSPanoramaSource)source;
+
 /**
  * Requests a panorama with |panoramaID|.
  *
@@ -255,6 +273,28 @@ NS_ASSUME_NONNULL_BEGIN;
                    nearCoordinate:(CLLocationCoordinate2D)coordinate
                            radius:(NSUInteger)radius;
 
+/**
+ * Convenience constructor for GMSPanoramaView, which searches for and displays a GMSPanorama near
+ * |coordinate|. This performs a similar action to that of moveNearCoordinate:source, and will call
+ * the same delegate methods.
+ *
+ * This API is experimental and may not always filter by source.
+ */
++ (instancetype)panoramaWithFrame:(CGRect)frame
+                   nearCoordinate:(CLLocationCoordinate2D)coordinate
+                           source:(GMSPanoramaSource)source;
+/**
+ * Convenience constructor for GMSPanoramaView, which searches for and displays a GMSPanorama near
+ * |coordinate|. This performs a similar action to that of moveNearCoordinate:radius:source, and
+ * will call the same delegate methods.
+ *
+ * This API is experimental and may not always filter by source.
+ */
++ (instancetype)panoramaWithFrame:(CGRect)frame
+                   nearCoordinate:(CLLocationCoordinate2D)coordinate
+                           radius:(NSUInteger)radius
+                           source:(GMSPanoramaSource)source;
+
 @end
 
 NS_ASSUME_NONNULL_END;
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSServices.h b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSServices.h
index 5192978..a21443d 100755
--- a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSServices.h
+++ b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSServices.h
@@ -36,10 +36,21 @@ NS_ASSUME_NONNULL_BEGIN;
  * This must be called exactly once by your application before any iOS Maps SDK object is
  * initialized.
  *
- * @return YES if the APIKey was successfully provided
+ * @return YES if the APIKey was successfully provided.
  */
 + (BOOL)provideAPIKey:(NSString *)APIKey;
 
+/**
+ * Provides your API options to the Google Maps SDK for iOS. Pass an array containing an NSString
+ * for each option. The options apply to all maps.
+ *
+ * This may be called exactly once by your application. It must be called before any iOS Maps SDK
+ * object is initialized.
+ *
+ * @return YES if all the APIOptions were successfully provided.
+ */
++ (BOOL)provideAPIOptions:(NSArray<NSString *> *)APIOptions;
+
 /**
  * Returns the open source software license information for Google Maps SDK for iOS. This
  * information must be made available within your application.
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GoogleMaps.h b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GoogleMaps.h
index 47b6ecc..e1e9fbb 100755
--- a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GoogleMaps.h
+++ b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GoogleMaps.h
@@ -34,4 +34,5 @@
 #import "GMSPanoramaLayer.h"
 #import "GMSPanoramaLink.h"
 #import "GMSPanoramaService.h"
+#import "GMSPanoramaSource.h"
 #import "GMSPanoramaView.h"
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Modules/module.modulemap b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Modules/module.modulemap
index 785678e..768c85f 100755
--- a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Modules/module.modulemap
+++ b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Modules/module.modulemap
@@ -7,6 +7,7 @@ framework module GoogleMaps {
   link framework "CoreData"
   link framework "CoreFoundation"
   link framework "CoreGraphics"
+  link framework "CoreImage"
   link framework "CoreLocation"
   link framework "CoreTelephony"
   link framework "CoreText"
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/StorageWithTileProto.mom b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/StorageWithTileProto.mom
new file mode 100755
index 0000000..1483b87
Binary files /dev/null and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/StorageWithTileProto.mom differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/StorageWithTileProto.omo b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/StorageWithTileProto.omo
new file mode 100755
index 0000000..20a49d1
Binary files /dev/null and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/StorageWithTileProto.omo differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/StorageWithTileVersionID.omo b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/StorageWithTileVersionID.omo
deleted file mode 100755
index 375a082..0000000
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/StorageWithTileVersionID.omo and /dev/null differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/VersionInfo.plist b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/VersionInfo.plist
index 26e1e13..c62ca0f 100755
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/VersionInfo.plist and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCacheStorage.momd/VersionInfo.plist differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/Assets.car b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/Assets.car
index 9a46abb..593e1af 100755
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/Assets.car and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/Assets.car differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/Info.plist b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/Info.plist
index 9207c0c..3a0cfdf 100755
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/Info.plist and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/Info.plist differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_fast.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_fast.png
new file mode 100755
index 0000000..3f5e3f1
Binary files /dev/null and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_fast.png differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_fast_night.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_fast_night.png
new file mode 100755
index 0000000..836c531
Binary files /dev/null and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_fast_night.png differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_greyscale1.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_greyscale1.png
deleted file mode 100755
index 3268f2a..0000000
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_greyscale1.png and /dev/null differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_greyscale2.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_greyscale2.png
deleted file mode 100755
index 811e99e..0000000
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_greyscale2.png and /dev/null differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_slow.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_slow.png
new file mode 100755
index 0000000..8d5d9ee
Binary files /dev/null and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_slow.png differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_slow_night.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_slow_night.png
new file mode 100755
index 0000000..6bfa2b5
Binary files /dev/null and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_slow_night.png differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_stop_and_go.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_stop_and_go.png
new file mode 100755
index 0000000..558b6ce
Binary files /dev/null and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_stop_and_go.png differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_stop_and_go_night.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_stop_and_go_night.png
new file mode 100755
index 0000000..8ae4fb9
Binary files /dev/null and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_stop_and_go_night.png differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_stopped.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_stopped.png
new file mode 100755
index 0000000..df39cd3
Binary files /dev/null and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_stopped.png differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_stopped_night.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_stopped_night.png
new file mode 100755
index 0000000..4632523
Binary files /dev/null and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/traffic_stopped_night.png differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/Info.plist b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/Info.plist
index 5f3b1c6..dd6100c 100755
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/Info.plist and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/Info.plist differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/default_marker.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/default_marker.png
index ad62a2b..521414c 100755
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/default_marker.png and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/default_marker.png differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/default_marker@2x.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/default_marker@2x.png
index 50fa00b..463657c 100755
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/default_marker@2x.png and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/default_marker@2x.png differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/default_marker@3x.png b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/default_marker@3x.png
index a368b46..d31aea6 100755
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/default_marker@3x.png and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/default_marker@3x.png differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/oss_licenses_maps.txt.gz b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/oss_licenses_maps.txt.gz
index 1d58f7c..a2f88cd 100755
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/oss_licenses_maps.txt.gz and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle/oss_licenses_maps.txt.gz differ
diff --git a/Pods/GoogleMaps/Maps/Frameworks/GoogleMapsCore.framework/GoogleMapsCore b/Pods/GoogleMaps/Maps/Frameworks/GoogleMapsCore.framework/GoogleMapsCore
index e93c1ad..1149937 100755
Binary files a/Pods/GoogleMaps/Maps/Frameworks/GoogleMapsCore.framework/GoogleMapsCore and b/Pods/GoogleMaps/Maps/Frameworks/GoogleMapsCore.framework/GoogleMapsCore differ
diff --git a/Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPanoramaSource.h b/Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPanoramaSource.h
new file mode 120000
index 0000000..d21075b
--- /dev/null
+++ b/Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPanoramaSource.h
@@ -0,0 +1 @@
+../../../../GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Headers/GMSPanoramaSource.h
\ No newline at end of file
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
index a459704..2f295ca 100644
--- a/Pods/Manifest.lock
+++ b/Pods/Manifest.lock
@@ -15,10 +15,10 @@ PODS:
     - GoogleMaps
   - Google-Maps-iOS-Utils/QuadTree (2.1.0):
     - GoogleMaps
-  - GoogleMaps (2.5.0):
-    - GoogleMaps/Maps (= 2.5.0)
-  - GoogleMaps/Base (2.5.0)
-  - GoogleMaps/Maps (2.5.0):
+  - GoogleMaps (2.6.0):
+    - GoogleMaps/Maps (= 2.6.0)
+  - GoogleMaps/Base (2.6.0)
+  - GoogleMaps/Maps (2.6.0):
     - GoogleMaps/Base
   - Shimmer (1.0.2)
 
@@ -29,7 +29,7 @@ DEPENDENCIES:
 
 SPEC CHECKSUMS:
   Google-Maps-iOS-Utils: c32891ff472eaaa1fca032beedafa1a013af7875
-  GoogleMaps: c087b8e5dfe87ca6ebf59adb9b4894a4146bec4f
+  GoogleMaps: 42f91c68b7fa2f84d5c86597b18ceb99f5414c7f
   Shimmer: c5374be1c2b0c9e292fb05b339a513cf291cac86
 
 PODFILE CHECKSUM: 0b7b1edf68be7d024e470e8f004a2735bc18e5a8
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
index e2726da..61c510f 100644
--- a/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Pods/Pods.xcodeproj/project.pbxproj
@@ -110,7 +110,7 @@
 		13272721D3A33A401F454E07EFC78544 /* Google-Maps-iOS-Utils.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Google-Maps-iOS-Utils.xcconfig"; sourceTree = "<group>"; };
 		157FA3BE64F968DB849B40BF49DA3362 /* GMUNonHierarchicalDistanceBasedAlgorithm.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GMUNonHierarchicalDistanceBasedAlgorithm.h; path = src/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.h; sourceTree = "<group>"; };
 		16052B069949815F4127DBD142AD9B3C /* GMUFeature.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GMUFeature.h; path = src/Geometry/Model/GMUFeature.h; sourceTree = "<group>"; };
-		17071756D37A78A69E7F8CCF87A917A4 /* libGoogle-Maps-iOS-Utils.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libGoogle-Maps-iOS-Utils.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		17071756D37A78A69E7F8CCF87A917A4 /* libGoogle-Maps-iOS-Utils.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libGoogle-Maps-iOS-Utils.a"; path = "libGoogle-Maps-iOS-Utils.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		17B26B0CE37959658CE52A32F3B53F22 /* Shimmer.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Shimmer.xcconfig; sourceTree = "<group>"; };
 		17D732241FE7053D56182027845C3F14 /* GMUClusterItem.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GMUClusterItem.h; path = src/Clustering/GMUClusterItem.h; sourceTree = "<group>"; };
 		19627FEC2E832F65D350541B235E9404 /* GMUHeatmapTileLayer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GMUHeatmapTileLayer.m; path = src/Heatmap/GMUHeatmapTileLayer.m; sourceTree = "<group>"; };
@@ -122,7 +122,7 @@
 		330861927723D412351E2E3D85DE5B99 /* GQTPoint.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GQTPoint.h; path = src/QuadTree/GQTPoint.h; sourceTree = "<group>"; };
 		3400B2108C72394EAF24AFE649309E14 /* GMUGroundOverlay.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GMUGroundOverlay.h; path = src/Geometry/Model/GMUGroundOverlay.h; sourceTree = "<group>"; };
 		3902933AA724BDB258593E1BF31D3779 /* Pods-harta-banilor-publici-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-harta-banilor-publici-acknowledgements.plist"; sourceTree = "<group>"; };
-		3946606D397D0C401249D45C99C7CF66 /* libPods-harta-banilor-publici.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-harta-banilor-publici.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		3946606D397D0C401249D45C99C7CF66 /* libPods-harta-banilor-publici.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libPods-harta-banilor-publici.a"; path = "libPods-harta-banilor-publici.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3E034844805D9A6F4810ED4982BB6B8C /* GMUDefaultClusterIconGenerator.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GMUDefaultClusterIconGenerator.m; path = src/Clustering/View/GMUDefaultClusterIconGenerator.m; sourceTree = "<group>"; };
 		3E2F6F68D4FE4C237CC6C9DF6BB7CEA9 /* GMUGeometryCollection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GMUGeometryCollection.h; path = src/Geometry/Model/GMUGeometryCollection.h; sourceTree = "<group>"; };
 		3FBE7F26AD2C60DD145F312BD06E5FC9 /* GQTPointQuadTree.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GQTPointQuadTree.m; path = src/QuadTree/GQTPointQuadTree.m; sourceTree = "<group>"; };
@@ -153,10 +153,10 @@
 		858E409644DFE0ED8DF2F286D3154A7B /* GMUSimpleClusterAlgorithm.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GMUSimpleClusterAlgorithm.m; path = src/Clustering/Algo/GMUSimpleClusterAlgorithm.m; sourceTree = "<group>"; };
 		8AD5A3FE9A037F6D004BA14A40F126DF /* GMUDefaultClusterRenderer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GMUDefaultClusterRenderer.h; path = src/Clustering/View/GMUDefaultClusterRenderer.h; sourceTree = "<group>"; };
 		9074DF593B467C5E7C9D36C0F868999C /* GMUNonHierarchicalDistanceBasedAlgorithm.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GMUNonHierarchicalDistanceBasedAlgorithm.m; path = src/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.m; sourceTree = "<group>"; };
-		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		969B3CCE420FBE1446A90AEEDCBAD736 /* GQTPointQuadTreeChild.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GQTPointQuadTreeChild.m; path = src/QuadTree/GQTPointQuadTreeChild.m; sourceTree = "<group>"; };
 		993AF7C6DE1EA74530F7C7E42F80F312 /* GMUWrappingDictionaryKey.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GMUWrappingDictionaryKey.m; path = src/Clustering/Algo/GMUWrappingDictionaryKey.m; sourceTree = "<group>"; };
-		9A997B0076DF428090A855878BCA9CC9 /* libShimmer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libShimmer.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		9A997B0076DF428090A855878BCA9CC9 /* libShimmer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libShimmer.a; path = libShimmer.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		9CD5FC33B02B695E7A556244894050BD /* GQTBounds.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GQTBounds.h; path = src/QuadTree/GQTBounds.h; sourceTree = "<group>"; };
 		9DB2B931E9674C0F4B39056D1C4449D7 /* GMUSimpleClusterAlgorithm.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GMUSimpleClusterAlgorithm.h; path = src/Clustering/Algo/GMUSimpleClusterAlgorithm.h; sourceTree = "<group>"; };
 		9DFD413E714D2540BB8B5C399648209A /* GoogleMaps.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleMaps.framework; path = Maps/Frameworks/GoogleMaps.framework; sourceTree = "<group>"; };
@@ -391,6 +391,7 @@
 				5C5E7EF8209E063A6C0948EAE1C747DF /* QuadTree */,
 				E250A7A1188E522AAB67A672811B23FB /* Support Files */,
 			);
+			name = "Google-Maps-iOS-Utils";
 			path = "Google-Maps-iOS-Utils";
 			sourceTree = "<group>";
 		};
@@ -408,6 +409,7 @@
 				35F81A5CF516BECCF7A10B4EB82CB1DD /* Base */,
 				06F2234E92F639CD4FD5DFD49D964CE9 /* Maps */,
 			);
+			name = GoogleMaps;
 			path = GoogleMaps;
 			sourceTree = "<group>";
 		};
@@ -462,6 +464,7 @@
 				A853C886E62136D2390F2E933746F53B /* FBShimmeringView.m */,
 				93EC9D21AD55F05710A472177D817451 /* Support Files */,
 			);
+			name = Shimmer;
 			path = Shimmer;
 			sourceTree = "<group>";
 		};
@@ -601,7 +604,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 0700;
 			};
 			buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -801,7 +804,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				GCC_PREFIX_HEADER = "Target Support Files/Google-Maps-iOS-Utils/Google-Maps-iOS-Utils-prefix.pch";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PRIVATE_HEADERS_FOLDER_PATH = "";
@@ -879,7 +882,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				GCC_PREFIX_HEADER = "Target Support Files/Shimmer/Shimmer-prefix.pch";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PRIVATE_HEADERS_FOLDER_PATH = "";
@@ -902,7 +905,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				GCC_PREFIX_HEADER = "Target Support Files/Google-Maps-iOS-Utils/Google-Maps-iOS-Utils-prefix.pch";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PRIVATE_HEADERS_FOLDER_PATH = "";
@@ -924,7 +927,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				GCC_PREFIX_HEADER = "Target Support Files/Shimmer/Shimmer-prefix.pch";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PRIVATE_HEADERS_FOLDER_PATH = "";
diff --git a/Pods/Target Support Files/Pods-harta-banilor-publici/Pods-harta-banilor-publici.debug.xcconfig b/Pods/Target Support Files/Pods-harta-banilor-publici/Pods-harta-banilor-publici.debug.xcconfig
index 7c11c64..9ab857c 100644
--- a/Pods/Target Support Files/Pods-harta-banilor-publici/Pods-harta-banilor-publici.debug.xcconfig	
+++ b/Pods/Target Support Files/Pods-harta-banilor-publici/Pods-harta-banilor-publici.debug.xcconfig	
@@ -3,7 +3,7 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Google-Maps-iOS-Utils" "${PODS_ROOT}/Headers/Public/GoogleMaps" "${PODS_ROOT}/Headers/Public/Shimmer"
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Google-Maps-iOS-Utils" "${PODS_CONFIGURATION_BUILD_DIR}/Shimmer"
 OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Google-Maps-iOS-Utils" -isystem "${PODS_ROOT}/Headers/Public/GoogleMaps" -isystem "${PODS_ROOT}/Headers/Public/Shimmer"
-OTHER_LDFLAGS = $(inherited) -ObjC -l"Google-Maps-iOS-Utils" -l"Shimmer" -l"c++" -l"z" -framework "Accelerate" -framework "CoreData" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "GLKit" -framework "GoogleMaps" -framework "GoogleMapsBase" -framework "GoogleMapsCore" -framework "ImageIO" -framework "OpenGLES" -framework "QuartzCore" -framework "SystemConfiguration" -framework "UIKit"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"Google-Maps-iOS-Utils" -l"Shimmer" -l"c++" -l"z" -framework "Accelerate" -framework "CoreData" -framework "CoreGraphics" -framework "CoreImage" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "GLKit" -framework "GoogleMaps" -framework "GoogleMapsBase" -framework "GoogleMapsCore" -framework "ImageIO" -framework "OpenGLES" -framework "QuartzCore" -framework "SystemConfiguration" -framework "UIKit"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
diff --git a/Pods/Target Support Files/Pods-harta-banilor-publici/Pods-harta-banilor-publici.release.xcconfig b/Pods/Target Support Files/Pods-harta-banilor-publici/Pods-harta-banilor-publici.release.xcconfig
index 7c11c64..9ab857c 100644
--- a/Pods/Target Support Files/Pods-harta-banilor-publici/Pods-harta-banilor-publici.release.xcconfig	
+++ b/Pods/Target Support Files/Pods-harta-banilor-publici/Pods-harta-banilor-publici.release.xcconfig	
@@ -3,7 +3,7 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Google-Maps-iOS-Utils" "${PODS_ROOT}/Headers/Public/GoogleMaps" "${PODS_ROOT}/Headers/Public/Shimmer"
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Google-Maps-iOS-Utils" "${PODS_CONFIGURATION_BUILD_DIR}/Shimmer"
 OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Google-Maps-iOS-Utils" -isystem "${PODS_ROOT}/Headers/Public/GoogleMaps" -isystem "${PODS_ROOT}/Headers/Public/Shimmer"
-OTHER_LDFLAGS = $(inherited) -ObjC -l"Google-Maps-iOS-Utils" -l"Shimmer" -l"c++" -l"z" -framework "Accelerate" -framework "CoreData" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "GLKit" -framework "GoogleMaps" -framework "GoogleMapsBase" -framework "GoogleMapsCore" -framework "ImageIO" -framework "OpenGLES" -framework "QuartzCore" -framework "SystemConfiguration" -framework "UIKit"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"Google-Maps-iOS-Utils" -l"Shimmer" -l"c++" -l"z" -framework "Accelerate" -framework "CoreData" -framework "CoreGraphics" -framework "CoreImage" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "GLKit" -framework "GoogleMaps" -framework "GoogleMapsBase" -framework "GoogleMapsCore" -framework "ImageIO" -framework "OpenGLES" -framework "QuartzCore" -framework "SystemConfiguration" -framework "UIKit"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
diff --git a/harta-banilor-publici.xcodeproj/project.pbxproj b/harta-banilor-publici.xcodeproj/project.pbxproj
index a4cc4d0..4db1991 100644
--- a/harta-banilor-publici.xcodeproj/project.pbxproj
+++ b/harta-banilor-publici.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3A36CBE42052783D009B62C0 /* mapstyle.json in Resources */ = {isa = PBXBuildFile; fileRef = 3A36CBE32052783D009B62C0 /* mapstyle.json */; };
 		3A5580DA1F594178009661D9 /* ApiHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A5580D91F594178009661D9 /* ApiHelper.swift */; };
 		3A6925511F836BF300EABAC7 /* CompanieViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A6925501F836BF300EABAC7 /* CompanieViewController.swift */; };
 		3A6925531F836E1900EABAC7 /* ContractViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A6925521F836E1900EABAC7 /* ContractViewController.swift */; };
@@ -48,6 +49,7 @@
 /* Begin PBXFileReference section */
 		39349E64E96C127385D2AA19 /* libPods-harta-banilor-publici.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-harta-banilor-publici.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3A1B217F1F91036F00EEE2A3 /* institutii_publice_pins_v0.csv */ = {isa = PBXFileReference; lastKnownFileType = text; path = institutii_publice_pins_v0.csv; sourceTree = "<group>"; };
+		3A36CBE32052783D009B62C0 /* mapstyle.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = mapstyle.json; sourceTree = "<group>"; };
 		3A3ADB071F739B8D00356210 /* harta-banilor-publici.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "harta-banilor-publici.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3A3ADB081F739B8D00356210 /* harta-banilor-publiciTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "harta-banilor-publiciTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3A3ADB091F739B8D00356210 /* harta-banilor-publiciUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "harta-banilor-publiciUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -134,6 +136,7 @@
 				3AA402EA1F447CDD009490EB /* Main.storyboard */,
 				3AE529582013730C0087BB3A /* LaunchScreen.storyboard */,
 				3AA402F21F447CDD009490EB /* Info.plist */,
+				3A36CBE32052783D009B62C0 /* mapstyle.json */,
 				3A1B217F1F91036F00EEE2A3 /* institutii_publice_pins_v0.csv */,
 				3AEFE91120122E8300263A8E /* Assets.xcassets */,
 				3AA403141F447DF7009490EB /* harta-banilor-publici-Bridging-Header.h */,
@@ -292,6 +295,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3A36CBE42052783D009B62C0 /* mapstyle.json in Resources */,
 				3AECEFD01F91CE8900E0B2EC /* CustomInfoWindow.xib in Resources */,
 				3AECEFD11F91D1E400E0B2EC /* institutii_publice_pins_v0.csv in Resources */,
 				3AEFE91220122E8300263A8E /* Assets.xcassets in Resources */,
diff --git a/harta-banilor-publici/ApiHelper.swift b/harta-banilor-publici/ApiHelper.swift
index 5fe84ca..46bc1b8 100644
--- a/harta-banilor-publici/ApiHelper.swift
+++ b/harta-banilor-publici/ApiHelper.swift
@@ -549,12 +549,41 @@ class ApiHelper {
         task.resume()
     }
     
-    func searchCompanies(pattern: String, handler: @escaping ([CompanieByInstitution], URLResponse?, Error?) -> Void) {
+    func searchADCompanies(pattern: String, handler: @escaping ([CompanieByInstitution], URLResponse?, Error?) -> Void) {
         var companieResults: [CompanieByInstitution] = []
         
-        let url = self.apiURL + "/SearchCompany/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trailingTrim(.whitespaces).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
-        print("Searching Companies: " + url)
-
+        let url = self.apiURL + "SearchADCompany/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trailingTrim(.whitespaces).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
+        print("Searching AD Companies: " + url)
+        
+        let task = URLSession.shared.dataTask(with: URL(string: url)!) { data, response, error in
+            guard error == nil else {
+                handler(companieResults, response, error)
+                return
+            }
+            guard let data = data else {
+                handler(companieResults, response, error)
+                return
+            }
+            do {
+                companieResults = try JSONDecoder().decode([CompanieByInstitution].self, from: data)
+                for index in 0..<companieResults.count {
+                    companieResults[index].ad = true
+                }
+                handler(companieResults, response, error)
+            } catch let error {
+                print("json error: \(error)")
+                handler(companieResults, response, error)
+            }
+        }
+        task.resume()
+    }
+    
+    func searchTenderCompanies(pattern: String, handler: @escaping ([CompanieByInstitution], URLResponse?, Error?) -> Void) {
+        var companieResults: [CompanieByInstitution] = []
+        
+        let url = self.apiURL + "SearchTenderCompany/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trailingTrim(.whitespaces).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
+        print("Searching Tender Companies: " + url)
+        
         let task = URLSession.shared.dataTask(with: URL(string: url)!) { data, response, error in
             guard error == nil else {
                 handler(companieResults, response, error)
@@ -566,6 +595,9 @@ class ApiHelper {
             }
             do {
                 companieResults = try JSONDecoder().decode([CompanieByInstitution].self, from: data)
+                for index in 0..<companieResults.count {
+                    companieResults[index].ad = false
+                }
                 handler(companieResults, response, error)
             } catch let error {
                 print("json error: \(error)")
@@ -574,6 +606,7 @@ class ApiHelper {
         }
         task.resume()
     }
+
     
     func searchContracts(pattern: String, handler: @escaping ([InstitutionContract], URLResponse?, Error?) -> Void) {
         var contractResults: [InstitutionContract] = []
diff --git a/harta-banilor-publici/AppDelegate.swift b/harta-banilor-publici/AppDelegate.swift
index 31d82eb..7d3b6d0 100644
--- a/harta-banilor-publici/AppDelegate.swift
+++ b/harta-banilor-publici/AppDelegate.swift
@@ -6,7 +6,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         GMSServices.provideAPIKey("AIzaSyCoozczgogGgRz3XnercMCy-OYbiyfXYNY")
-        UINavigationBar.appearance().barTintColor = UIColor(red: 116/255, green: 197/255, blue: 201/255, alpha: 1)
+        UINavigationBar.appearance().barTintColor = UIColor(red: 80/255, green: 0/255, blue: 20/255, alpha: 1)
         return true
     }
 }
diff --git a/harta-banilor-publici/Base.lproj/Main.storyboard b/harta-banilor-publici/Base.lproj/Main.storyboard
index 7c079af..0f3d688 100644
--- a/harta-banilor-publici/Base.lproj/Main.storyboard
+++ b/harta-banilor-publici/Base.lproj/Main.storyboard
@@ -53,7 +53,7 @@
                         <rect key="frame" x="0.0" y="975" width="768" height="49"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                         <color key="backgroundColor" red="0.52156862749999999" green="0.80392156859999997" blue="0.81568627449999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <color key="selectedImageTintColor" red="0.52156862749999999" green="0.80392156859999997" blue="0.81568627449999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="selectedImageTintColor" red="0.31372549019607843" green="0.0" blue="0.078431372549019607" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </tabBar>
                     <connections>
                         <segue destination="xtV-Pc-eaH" kind="relationship" relationship="viewControllers" id="mRB-pD-aAK"/>
@@ -96,7 +96,7 @@
             </objects>
             <point key="canvasLocation" x="1863.2" y="-714.69265367316348"/>
         </scene>
-        <!--Instituție-->
+        <!--Institutie-->
         <scene sceneID="mVQ-mf-VWH">
             <objects>
                 <viewController storyboardIdentifier="InstitutionViewController" id="mwM-rY-90A" customClass="InstitutionViewController" customModule="harta_banilor_publici" customModuleProvider="target" sceneMemberID="viewController">
@@ -104,7 +104,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="618"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3XR-Qk-RlX">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3XR-Qk-RlX">
                                 <rect key="frame" x="65" y="72" width="294" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                 <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="17"/>
@@ -116,7 +116,7 @@
                                 <autoresizingMask key="autoresizingMask"/>
                             </imageView>
                             <segmentedControl opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="R8s-Pq-APZ">
-                                <rect key="frame" x="-3" y="176" width="381" height="29"/>
+                                <rect key="frame" x="7" y="176" width="361" height="29"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                                 <segments>
@@ -124,7 +124,7 @@
                                     <segment title="Licitații"/>
                                     <segment title="Companii"/>
                                 </segments>
-                                <color key="tintColor" red="0.52156862749999999" green="0.80392156859999997" blue="0.81568627449999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="tintColor" red="0.31372549020000001" green="0.0" blue="0.078431372550000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <connections>
                                     <action selector="indexChanged:" destination="mwM-rY-90A" eventType="valueChanged" id="41N-Aw-Kr2"/>
                                 </connections>
@@ -142,44 +142,31 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="64.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UIb-KU-fnw" customClass="ShimmerLabel" customModule="harta_banilor_publici" customModuleProvider="target">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UIb-KU-fnw" customClass="ShimmerLabel" customModule="harta_banilor_publici" customModuleProvider="target">
                                                     <rect key="frame" x="15" y="11" width="222" height="43"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="14"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xrR-Qu-n2p" customClass="ShimmerLabel" customModule="harta_banilor_publici" customModuleProvider="target">
-                                                    <rect key="frame" x="245" y="11" width="67" height="43"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="dfsfsd" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xrR-Qu-n2p" customClass="ShimmerLabel" customModule="harta_banilor_publici" customModuleProvider="target">
+                                                    <rect key="frame" x="245" y="11" width="96" height="43"/>
+                                                    <color key="backgroundColor" red="0.31372549020000001" green="0.0" blue="0.078431372550000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="67" id="dOn-YG-wfZ"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="15"/>
-                                                    <nil key="textColor"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="55" translatesAutoresizingMaskIntoConstraints="NO" id="DGl-td-Hmo" customClass="ShimmerLabel" customModule="harta_banilor_publici" customModuleProvider="target">
-                                                    <rect key="frame" x="320" y="0.0" width="55" height="65"/>
-                                                    <color key="backgroundColor" red="0.52156862749999999" green="0.80392156859999997" blue="0.81568627449999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="55" id="yFG-cX-hnF"/>
-                                                    </constraints>
-                                                    <fontDescription key="fontDescription" name="AvenirNext-DemiBold" family="Avenir Next" pointSize="17"/>
-                                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="&gt;" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B7B-T9-Zry" customClass="ShimmerLabel" customModule="harta_banilor_publici" customModuleProvider="target">
+                                                    <rect key="frame" x="349" y="22" width="11" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="AvenirNext-DemiBold" family="Avenir Next" pointSize="20"/>
+                                                    <color key="textColor" red="0.31372549020000001" green="0.0" blue="0.078431372550000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
-                                            <constraints>
-                                                <constraint firstItem="UIb-KU-fnw" firstAttribute="leading" secondItem="CBs-gi-FUC" secondAttribute="leadingMargin" id="1We-Pf-HCO"/>
-                                                <constraint firstItem="xrR-Qu-n2p" firstAttribute="leading" secondItem="UIb-KU-fnw" secondAttribute="trailing" constant="8" symbolic="YES" id="5An-q5-YeX"/>
-                                                <constraint firstAttribute="trailing" secondItem="DGl-td-Hmo" secondAttribute="trailing" id="DnR-kj-ywT"/>
-                                                <constraint firstItem="UIb-KU-fnw" firstAttribute="top" secondItem="CBs-gi-FUC" secondAttribute="topMargin" id="J8v-Xd-gHM"/>
-                                                <constraint firstItem="UIb-KU-fnw" firstAttribute="top" secondItem="xrR-Qu-n2p" secondAttribute="top" id="LB0-zK-iul"/>
-                                                <constraint firstItem="UIb-KU-fnw" firstAttribute="baseline" secondItem="xrR-Qu-n2p" secondAttribute="baseline" id="M3u-jC-FVN"/>
-                                                <constraint firstItem="DGl-td-Hmo" firstAttribute="top" secondItem="CBs-gi-FUC" secondAttribute="topMargin" constant="-9" id="MTj-gQ-mfy"/>
-                                                <constraint firstItem="UIb-KU-fnw" firstAttribute="centerY" secondItem="CBs-gi-FUC" secondAttribute="centerY" id="sMv-Ms-arw"/>
-                                                <constraint firstItem="DGl-td-Hmo" firstAttribute="leading" secondItem="xrR-Qu-n2p" secondAttribute="trailing" constant="8" symbolic="YES" id="vaS-pc-lIX"/>
-                                                <constraint firstItem="DGl-td-Hmo" firstAttribute="centerY" secondItem="CBs-gi-FUC" secondAttribute="centerY" id="zXA-CN-qqP"/>
-                                            </constraints>
                                         </tableViewCellContentView>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="color" keyPath="layer.selectionColor">
@@ -187,7 +174,7 @@
                                             </userDefinedRuntimeAttribute>
                                         </userDefinedRuntimeAttributes>
                                         <connections>
-                                            <outlet property="button" destination="DGl-td-Hmo" id="Gy2-mI-njB"/>
+                                            <outlet property="button" destination="B7B-T9-Zry" id="NuG-Jh-s3A"/>
                                             <outlet property="priceLabel" destination="xrR-Qu-n2p" id="CEB-ox-8vG"/>
                                             <outlet property="titleLabel" destination="UIb-KU-fnw" id="JDE-i6-Gax"/>
                                         </connections>
@@ -195,7 +182,7 @@
                                 </prototypes>
                             </tableView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Adresă:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EZG-Lb-BA8">
-                                <rect key="frame" x="16" y="124" width="42" height="21"/>
+                                <rect key="frame" x="16" y="118" width="42" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" name="AvenirNext-Regular" family="Avenir Next" pointSize="11"/>
                                 <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
@@ -254,7 +241,7 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <viewLayoutGuide key="safeArea" id="qPy-y0-Uwp"/>
                     </view>
-                    <navigationItem key="navigationItem" title="Instituție" id="vKJ-8K-xNR">
+                    <navigationItem key="navigationItem" title="Institutie" id="vKJ-8K-xNR">
                         <barButtonItem key="backBarButtonItem" title=" " id="eXj-Jb-w90"/>
                         <barButtonItem key="rightBarButtonItem" systemItem="action" id="LWK-qg-1B5"/>
                     </navigationItem>
diff --git a/harta-banilor-publici/InstitutionViewController.swift b/harta-banilor-publici/InstitutionViewController.swift
index e0287bf..37a0a46 100644
--- a/harta-banilor-publici/InstitutionViewController.swift
+++ b/harta-banilor-publici/InstitutionViewController.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Foundation
 
-let hbpBlue = UIColor(red: 133/255, green: 205/255, blue: 208/255, alpha: 1)
+let hbpBlue = UIColor(red: 80/255, green: 0/255, blue: 20/255, alpha: 1)
 
 class ShimmerLabel: UILabel {
     var shimmer: FBShimmeringView!
@@ -36,6 +36,12 @@ class TableCell: UITableViewCell {
     var addedShimmerViews: Bool = false
     var bgview: UIView!
     
+    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.priceLabel.layer.cornerRadius = 5
+
+    }
+    
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)!
         self.bgview = UIView()
@@ -323,6 +329,7 @@ class InstitutionViewController: UIViewController, UITableViewDelegate, UITableV
             cell.stopShimmer()
             cell.titleLabel.text = contracte[indexPath.row].titluContract.capitalized(with: Locale(identifier: "ro"))
             cell.priceLabel.text = String(contracte[indexPath.row].valoareRON) + "\nRON"
+            cell.priceLabel.layer.cornerRadius = 5
             cell.button.text = ">"
             self.tableView.allowsSelection = true
             self.tableView.isScrollEnabled = true
diff --git a/harta-banilor-publici/MapViewController.swift b/harta-banilor-publici/MapViewController.swift
index 3089d7b..5551e11 100644
--- a/harta-banilor-publici/MapViewController.swift
+++ b/harta-banilor-publici/MapViewController.swift
@@ -44,7 +44,7 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, GMUCluster
         mapView = GMSMapView.map(withFrame: .zero, camera: camera)
         do {
             // Set the map style by passing the URL of the local file.
-            if let styleURL = Bundle.main.url(forResource: "lightbluemaps", withExtension: "json") {
+            if let styleURL = Bundle.main.url(forResource: "mapstyle", withExtension: "json") {
                 mapView.mapStyle = try GMSMapStyle(contentsOfFileURL: styleURL)
             } else {
                 NSLog("Unable to find style.json")
diff --git a/harta-banilor-publici/SearchViewController.swift b/harta-banilor-publici/SearchViewController.swift
index be00983..d2d295c 100644
--- a/harta-banilor-publici/SearchViewController.swift
+++ b/harta-banilor-publici/SearchViewController.swift
@@ -170,8 +170,9 @@ class SearchViewController: UIViewController, UITableViewDataSource,
             DispatchQueue.main.async {
                 self.tableView.reloadData()
             }
+            let search_pattern = searchBar.text!
 
-            api.searchCompanies(pattern: searchBar.text!) { (companieResults, _ response, error) -> Void in
+            api.searchADCompanies(pattern: search_pattern) { (companieResults, _ response, error) -> Void in
                 guard error == nil else {
                     self.isSearchingCompanies = false
                     self.companieResults = []
@@ -183,13 +184,16 @@ class SearchViewController: UIViewController, UITableViewDataSource,
                     return
                 }
                 self.companieResults = companieResults
-                self.isSearchingCompanies = false
+                self.api.searchTenderCompanies(pattern: search_pattern) { (companieResults, _ response, error) -> Void in
+                    self.companieResults += companieResults
+                    self.isSearchingCompanies = false
 
-                DispatchQueue.main.async {
-                    NSLog("DONE Fetching Companies")
-                    self.tableView.allowsSelection = true
-                    self.tableView.isScrollEnabled = true
-                    self.tableView.reloadData()
+                    DispatchQueue.main.async {
+                        NSLog("DONE Fetching Companies")
+                        self.tableView.allowsSelection = true
+                        self.tableView.isScrollEnabled = true
+                        self.tableView.reloadData()
+                    }
                 }
             }
         case 2:
@@ -327,7 +331,9 @@ class SearchViewController: UIViewController, UITableViewDataSource,
                     self.tableView.reloadData()
                 }
                 
-                api.searchCompanies(pattern: searchBar.text!) { (companieResults, _ response, error) -> Void in
+                let search_pattern = searchBar.text!
+                
+                api.searchADCompanies(pattern: search_pattern) { (companieResults, _ response, error) -> Void in
                     guard error == nil else {
                         self.isSearchingCompanies = false
                         self.companieResults = []
@@ -339,13 +345,18 @@ class SearchViewController: UIViewController, UITableViewDataSource,
                         return
                     }
                     self.companieResults = companieResults
-                    self.isSearchingCompanies = false
-                    
-                    DispatchQueue.main.async {
-                        NSLog("DONE Fetching Companies")
-                        self.tableView.allowsSelection = true
-                        self.tableView.isScrollEnabled = true
-                        self.tableView.reloadData()
+                    self.api.searchTenderCompanies(pattern: search_pattern) { (companieResults, _ response, error) -> Void in
+                        if error == nil {
+                            self.companieResults += companieResults
+                            self.isSearchingCompanies = false
+                            
+                            DispatchQueue.main.async {
+                                NSLog("DONE Fetching Companies")
+                                self.tableView.allowsSelection = true
+                                self.tableView.isScrollEnabled = true
+                                self.tableView.reloadData()
+                            }
+                        }
                     }
                 }
             } else {
@@ -551,7 +562,7 @@ class SearchViewController: UIViewController, UITableViewDataSource,
         case 1:
             let controller = storyboard?.instantiateViewController(withIdentifier: "CompanieViewController") as! CompanieViewController
             controller.id = self.companieResults[indexPath.row].id
-            //controller.cui = "7" //TODO self.companieResults[indexPath.row].cui
+            controller.ad = self.companieResults[indexPath.row].ad
             show(controller, sender: self)
         case 2:
             let controller = storyboard?.instantiateViewController(withIdentifier: "ContractViewController") as! ContractViewController
diff --git a/harta-banilor-publici/mapstyle.json b/harta-banilor-publici/mapstyle.json
new file mode 100644
index 0000000..3554b16
--- /dev/null
+++ b/harta-banilor-publici/mapstyle.json
@@ -0,0 +1,160 @@
+ [
+  {
+  "elementType": "geometry",
+  "stylers": [
+              {
+              "color": "#f5f5f5"
+              }
+              ]
+  },
+  {
+  "elementType": "labels.icon",
+  "stylers": [
+              {
+              "visibility": "off"
+              }
+              ]
+  },
+  {
+  "elementType": "labels.text.fill",
+  "stylers": [
+              {
+              "color": "#616161"
+              }
+              ]
+  },
+  {
+  "elementType": "labels.text.stroke",
+  "stylers": [
+              {
+              "color": "#f5f5f5"
+              }
+              ]
+  },
+  {
+  "featureType": "administrative.land_parcel",
+  "elementType": "labels.text.fill",
+  "stylers": [
+              {
+              "color": "#bdbdbd"
+              }
+              ]
+  },
+  {
+  "featureType": "poi",
+  "elementType": "geometry",
+  "stylers": [
+              {
+              "color": "#eeeeee"
+              }
+              ]
+  },
+  {
+  "featureType": "poi",
+  "elementType": "labels.text.fill",
+  "stylers": [
+              {
+              "color": "#757575"
+              }
+              ]
+  },
+  {
+  "featureType": "poi.park",
+  "elementType": "geometry",
+  "stylers": [
+              {
+              "color": "#e5e5e5"
+              }
+              ]
+  },
+  {
+  "featureType": "poi.park",
+  "elementType": "labels.text.fill",
+  "stylers": [
+              {
+              "color": "#9e9e9e"
+              }
+              ]
+  },
+  {
+  "featureType": "road",
+  "elementType": "geometry",
+  "stylers": [
+              {
+              "color": "#ffffff"
+              }
+              ]
+  },
+  {
+  "featureType": "road.arterial",
+  "elementType": "labels.text.fill",
+  "stylers": [
+              {
+              "color": "#757575"
+              }
+              ]
+  },
+  {
+  "featureType": "road.highway",
+  "elementType": "geometry",
+  "stylers": [
+              {
+              "color": "#dadada"
+              }
+              ]
+  },
+  {
+  "featureType": "road.highway",
+  "elementType": "labels.text.fill",
+  "stylers": [
+              {
+              "color": "#616161"
+              }
+              ]
+  },
+  {
+  "featureType": "road.local",
+  "elementType": "labels.text.fill",
+  "stylers": [
+              {
+              "color": "#9e9e9e"
+              }
+              ]
+  },
+  {
+  "featureType": "transit.line",
+  "elementType": "geometry",
+  "stylers": [
+              {
+              "color": "#e5e5e5"
+              }
+              ]
+  },
+  {
+  "featureType": "transit.station",
+  "elementType": "geometry",
+  "stylers": [
+              {
+              "color": "#eeeeee"
+              }
+              ]
+  },
+  {
+  "featureType": "water",
+  "elementType": "geometry",
+  "stylers": [
+              {
+              "color": "#c9c9c9"
+              }
+              ]
+  },
+  {
+  "featureType": "water",
+  "elementType": "labels.text.fill",
+  "stylers": [
+              {
+              "color": "#9e9e9e"
+              }
+              ]
+  }
+  ]