Merge branch 'master' into design/initial

* master:
  Upgrade to ruby-2.0.0-p247
  Add test for html email for authority comment notification. Include test for multiple paragraphs
  Update newrelic agent for extra features
  Use maps client id if it is available for maps api use
  Move list of assets to precompile over to application.rb so it is available even when production.rb is overridden
  Actually make it possible to use maps api v3 in production
  Use google maps api v3 (via mapstraction) and add satelite option to map
  Applied fix for googlev3 controls not showing from mapstraction/mxn#257
  Updated to Mapstraction v 2.0.18 (and added googlev3 support)
  don't need our own backported geokit anymore. Can use a release version

Conflicts:
	config/environments/production.rb

Author: DylanFM

.ruby-version

@@ -1 +1 @@
-ruby-1.8.7-p370
+ruby-2.0.0-p247

Gemfile

@@ -20,10 +20,7 @@ gem "jquery-ui-rails"
 
 gem "capistrano"
 gem "haml"
-# Latest release of geokit at this time (1.6.5) doesn't yet contain support for Google Maps Business API
-# and HEAD of the project has broken Ruby 1.8 support so backported the Google Maps Business API changes
-# on to geokit 1.6.5.
-gem "geokit", :git => "https://github.com/mlandauer/geokit.git", :branch => "back_port_google_maps_business_api"
+gem "geokit"
 gem "nokogiri"
 gem "foreigner"
 gem 'httparty'

Gemfile.lock

@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/mlandauer/geokit.git
-  revision: a541ba216b8004e82e66d57b68dca2e27cf47ab7
-  branch: back_port_google_maps_business_api
-  specs:
-    geokit (1.6.5)
-      multi_json
-
 GIT
   remote: https://github.com/openaustralia/atdis.git
   revision: 9122c9dd4d930ad2deee1da5df5f10cc7700b888
@@ -147,6 +139,8 @@ GEM
       actionpack (>= 3.0)
     fssm (0.2.10)
     geocoder (1.1.6)
+    geokit (1.6.7)
+      multi_json (>= 1.3.2)
     guard (1.6.2)
       listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
@@ -199,7 +193,7 @@ GEM
       polyamorous (~> 0.5.0)
     method_source (0.8.1)
     mime-types (1.25)
-    multi_json (1.8.0)
+    multi_json (1.8.1)
     multi_xml (0.5.3)
     multipart-post (1.2.0)
     mysql2 (0.3.11)
@@ -210,7 +204,7 @@ GEM
     net-ssh (2.6.6)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    newrelic_rpm (3.5.8.72)
+    newrelic_rpm (3.6.8.164)
     nokogiri (1.5.6)
     oj (2.1.4)
     orm_adapter (0.4.0)
@@ -370,7 +364,7 @@ DEPENDENCIES
   foreigner
   formtastic
   geocoder
-  geokit!
+  geokit
   guard
   guard-livereload
   guard-rspec

app/assets/javascripts/maps.js

@@ -1,8 +1,8 @@
 function initialiseMaps(latitude, longitude, address) {
-  var map = new mxn.Mapstraction("map_div","google");
+  var map = new mxn.Mapstraction("map_div","googlev3");
   point = new mxn.LatLonPoint(latitude, longitude);
   map.setCenterAndZoom(point,16);
-  map.addControls({ zoom: 'small' });
+  map.addControls({ zoom: 'small', map_type: true });
   marker = new mxn.Marker(point)
   marker.setLabel(address);
   map.addMarker(marker);