diff --git a/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java b/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java
index 3ef87f3d0b..c8c9fd3b0a 100644
--- a/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java
+++ b/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java
@@ -486,7 +486,6 @@ public class TileSourceManager {
 		}
 		
 	}
-	
 
 	
 }
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 9d80565026..b7328ccf46 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -320,7 +320,7 @@ Destination point is widely used to measure distance and to straight forward nav
 	<string name="route_head">Head</string>
 	<string name="first_time_continue">Continue</string>
 	<string name="first_time_download">Download regions</string>
-	<string name="first_time_msg">Thank you for choosing OsmAnd. \nTo use all features of the application you need index files, which you can download (Settings -&gt; Data) or prepare yourself. Afterwards, you will be able to search by address, search for POIs, and search for public transport.</string>
+	<string name="first_time_msg">Thank you for choosing OsmAnd. \nTo use all features of the application you need map/voice data files, which you can download (Settings -&gt; Data) or prepare yourself. Afterwards, you will be able to search by address, search for POIs, listen voice instructions and search for public transport.</string>
 	<string name="search_poi_location">Searching signal...</string>
 	<string name="search_near_map">Search near last map location</string>
 	<string name="search_nearby">Search nearby</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java b/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
index 33d6ca648c..36b2e5e26f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
@@ -48,7 +48,6 @@ public class ContributionVersionActivity extends ListActivity {
 	
 	private static final String URL_TO_RETRIEVE_BUILDS = "http://download.osmand.net/builds.php";
 	private static final String URL_GET_BUILD = "http://download.osmand.net/";
-	private static final String CONTRIBUTION_INSTALL_APP_DATE = "CONTRIBUTION_INSTALL_APP_DATE";
 	
 	private ProgressDialog progressDlg;
 	private Date currentInstalledDate;
diff --git a/config/site/tile_sources.xml b/config/site/tile_sources.xml
index dc86fdc386..3b3386f8cd 100644
--- a/config/site/tile_sources.xml
+++ b/config/site/tile_sources.xml
@@ -45,6 +45,17 @@
    <tile_source name="OpenWandelkaartBaseLayer (BE,NL)" url_template="http://overlay.openstreet.nl/basemap/{0}/{1}/{2}.png" ext=".png" min_zoom="1" max_zoom="18" tile_size="256" img_density="16" avg_img_size="18000"/> 
    <tile_source name="OpenWandelkaartRoads (BE,NL)" url_template="http://overlay.openstreet.nl/roads/{0}/{1}/{2}.png" ext=".png" min_zoom="7" max_zoom="18" tile_size="256" img_density="16" avg_img_size="18000"/>
 
+   <tile_source name="Statkart Topo (NO)" url_template="http://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=topo2&amp;zoom={0}&amp;x={1}&amp;y={2}" ext=".png" min_zoom="5" max_zoom="17" tile_size="256" img_density="32" avg_img_size="18000"/>
+   <tile_source name="Statkart Nautical (NO)" url_template="http://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=sjo_hovedkart2&amp;zoom={0}&amp;x={1}&amp;y={2}" ext=".png" min_zoom="3" max_zoom="14" tile_size="256" img_density="32" avg_img_size="18000"/>
+   
+   <tile_source name="Eniro Map (NO,SE,FI,DK,PL))" rule="beanshell" ext=".png" min_zoom="2" max_zoom="20" tile_size="256" img_density="16" avg_img_size="18000"
+   		url_template='String getTileUrl(int z, int x, int y) {return "http://map.eniro.com/geowebcache/service/tms1.0.0/map/"+z+"/"+x+"/"+((1 &lt;&lt; z) - 1 - y) + ".png";}'/>
+   <tile_source name="Eniro Aerial (NO,SE,DK)" rule="beanshell" ext=".png" min_zoom="2" max_zoom="19" tile_size="256" img_density="16" avg_img_size="18000"
+   		url_template='String getTileUrl(int z, int x, int y) {return "http://map.eniro.com/geowebcache/service/tms1.0.0/aerial/"+z+"/"+x+"/"+((1 &lt;&lt; z) - 1 - y) + ".png";}'/>
+   <tile_source name="Eniro Nautical (NO,SE)" rule="beanshell" ext=".png" min_zoom="5" max_zoom="16" tile_size="256" img_density="32" avg_img_size="18000"
+   		url_template='String getTileUrl(int z, int x, int y) {return "http://map.eniro.com/geowebcache/service/tms1.0.0/nautical/"+z+"/"+x+"/"+((1 &lt;&lt; z) - 1 - y) + ".png";}'/>	
+   
+
 <!--
    <tile_source rule="wms_tile" url_template="http://wms.latlon.org" name="Genshtab (BLR)" layer="gshtab" ext=".jpg" min_zoom="5" max_zoom="17" tile_size="256" img_density="32" avg_img_size="18000"/>  NOT WORK ?-->