Merge branch 'master' into navdrawer-api

Conflicts:
	mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java

code/map_data_calc_tools.js

@@ -6,7 +6,7 @@
 // tile and a quadkey. Both the bounds and the quadkey are “somewhat”
 // required to get complete data.
 //
-// Convertion functions courtesy of
+// Conversion functions courtesy of
 // http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames
 
 

code/map_data_render.js

@@ -470,7 +470,7 @@ window.Render.prototype.addPortalToMapLayer = function(portal) {
 
   this.portalClusters[cid].push(portal.options.guid);
 
-  // now, at this point, we could match the above re-clustr code - sorting, and adding/removing as necessary
+  // now, at this point, we could match the above re-cluster code - sorting, and adding/removing as necessary
   // however, it won't make a lot of visible difference compared to just pushing to the end of the list, then
   // adding to the visible layer if the list is below the limit
   if (this.portalClusters[cid].length < this.CLUSTER_PORTAL_LIMIT || portal.options.guid == selectedPortal || artifact.isInterestingPortal(portal.options.guid)) {

code/portal_detail.js

@@ -1,5 +1,5 @@
 /// PORTAL DETAIL //////////////////////////////////////
-// code to retrieve the new potal detail data from the servers
+// code to retrieve the new portal detail data from the servers
 
 // NOTE: the API for portal detailed information is NOT FINAL
 // this is a temporary measure to get things working again after a major change to the intel map
@@ -54,6 +54,6 @@ window.portalDetail.request = function(guid) {
 
 
 
-})(); // anonumous wrapper function end
+})(); // anonymous wrapper function end
 
 

mobile/AndroidManifest.xml

@@ -99,7 +99,7 @@
             android:enabled="true"
             android:excludeFromRecents="true"
             android:exported="false"
-            android:icon="@drawable/copy"
+            android:icon="@drawable/ic_action_copy"
             android:label="@string/activity_share_to_clipboard"
             android:noHistory="false">
             <intent-filter>