diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
index 7a256a46eb..e6c718a67b 100644
--- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
+++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
@@ -66,15 +66,16 @@ public class BinaryInspector {
 		// test cases show info
 		if(args.length == 1 && "test".equals(args[0])) {
 			in.inspector(new String[]{
-				"-vpoi",
-//				"-vmap", "-vmapobjects",  //	"-vmapcoordinates", 
+//				"-vpoi",
+				"-vmap", "-vmapobjects", // "-vmapcoordinates", 
 //				"-vrouting",
 //				"-vaddress", "-vcities","-vstreetgroups", 
 //				"-vstreets", "-vbuildings", "-vintersections", 
 //				"-zoom=15",
 //				"-bbox=1.74,51.17,1.75,51.16",
 //				"-vstats",
-				"/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf"
+				"/Users/victorshcherb/osmand/temp/Germany_bremen_europe_15_08_00.obf"
+//				"/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf"
 //				"/Users/victorshcherb/osmand/maps/Map.obf"
 //				"/Users/victorshcherb/osmand/temp/Czech-republic_jihovychod_europe_2.road.obf"
 					});
@@ -813,6 +814,7 @@ public class BinaryInspector {
 								} catch (IOException e) {
 									throw new RuntimeException(e);
 								}
+//							} else if(obj.getId() >> 1 == 205743436l) {
 							} else {
 								printMapDetails(obj, b, vInfo.vmapCoordinates);
 								println(b.toString());
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index cba2ebe41a..1681e0199b 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -301,8 +301,8 @@ repositories {
 dependencies {
 	compile project(path: ":OsmAnd-java", configuration: "android")
 	compile project(":eclipse-compile:design")
-	compile project(":cardview")
-	compile project(":recyclerview")
+	compile project(":eclipse-compile:cardview")
+//	compile project(":eclipse-compile:recyclerview")
 	compile fileTree(
 			dir: "libs",
 			include: ["*.jar"],
@@ -312,12 +312,13 @@ dependencies {
 					"OsmAndCore_android.jar",
 					"OsmAndCore_wrapper.jar"])
 	// compile "com.github.ksoichiro:android-observablescrollview:1.5.0"
-//	 compile "com.android.support:appcompat-v7:22.2.1"
+	//	 compile "com.android.support:appcompat-v7:22.2.1"
 	// compile "com.github.shell-software:fab:1.0.5"
+	//	compile 'com.android.support:design:22.2.1'
 	legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
 	qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
 	qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-//	compile 'com.android.support:design:22.2.1'
+
 }
diff --git a/OsmAnd/project.properties b/OsmAnd/project.properties
index 146000a0b5..1b49bef156 100644
--- a/OsmAnd/project.properties
+++ b/OsmAnd/project.properties
@@ -14,3 +14,4 @@ target=android-21
 dex.force.jumbo=true
 android.library.reference.1=../eclipse-compile/appcompat
 android.library.reference.2=../eclipse-compile/design
+android.library.reference.3=../eclipse-compile/cardview
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 408e492bc5..5987f9c401 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2058,4 +2058,10 @@
     <string name="we_really_care_about_your_opinion">Нас вельмі цікавіць ваша меркаваньне і нам важна пачуць вас.</string>
 	<string name="rendering_value_boldOutline_name">Тлусты абрыс</string>
     <string name="traffic_warning_hazard">Небясьпека</string>
-    </resources>
+    <string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Аўтаномныя мапы\nі навігацыя</string>
+<string name="dahboard_options_dialog_title">Опцыі Панэлі кіраваньня</string>
+	<string name="shared_string_card_was_hidden">Картка схавана</string>
+	<string name="shared_string_undo">Вярнуць</string>
+	<string name="shared_string_skip">Прапусьціць</string>
+	</resources>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index e936320d97..978b5989a6 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -1031,4 +1031,20 @@
 	<string name="poi_recycling_waste">Rebuig (bosses de negres)</string>
 	<string name="poi_recycling_paper_packaging">Embalatge de paper</string>
 	<string name="poi_recycling_tetrapak">Tetra Pak</string>
+	<string name="poi_recycling_hydrargyrum">Mercuri</string>
+	<string name="poi_recycling_foil">Paper d\'alumini</string>
+	<string name="poi_recycling_styrofoam">Poliestirè extrudit</string>
+	<string name="poi_recycling_hardcore">Runa</string>
+	<string name="poi_recycling_chipboard">Aglomerat</string>
+	<string name="poi_recycling_plasterboard">Plaques de guix</string>
+	<string name="poi_recycling_diapers">Bolquers</string>
+	<string name="poi_supervised_yes">Supervisat</string>
+	<string name="poi_supervised_no">No supervisat</string>
+	<string name="poi_crossing_traffic_signals">Encreuament senyalitzat</string>
+	<string name="poi_crossing_uncontrolled">Encreuament no controlat</string>
+	<string name="poi_crossing_unmarked">Encreuament no senyalitzat</string>
+
+	<string name="poi_recycling_cardboard">Cartró d\'embalar</string>
+	<string name="poi_recycling_beverage_cartons">Envasos de cartró de begudes</string>
+	<string name="poi_recycling_sheet_metal">Xapa metàl·lica</string>
 	</resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index ad342fdd83..71f43a8dc3 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -2089,4 +2089,10 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="we_really_care_about_your_opinion">"Valorem molt la vostra opinió i és important per nosaltres  disposar dels vostres comentaris."</string>
 	<string name="rendering_value_boldOutline_name">Contorn destacat</string>
     <string name="traffic_warning_hazard">Perill informat</string>
-    </resources>
+    <string name="dahboard_options_dialog_title">Opcions del tauler</string>
+	<string name="shared_string_card_was_hidden">La tarja era amagada</string>
+	<string name="shared_string_undo">Desfés</string>
+	<string name="shared_string_skip">Omet</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Mapes fora de línia\n&amp; Navegació</string>
+</resources>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index eb31f20733..e4bb26efd1 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2103,4 +2103,10 @@
     <string name="we_really_care_about_your_opinion">Vi er meget interesseret i din mening, og det er vigtigt for os at høre fra dig.</string>
 	<string name="rendering_value_boldOutline_name">Fed kontur</string>
     <string name="traffic_warning_hazard">Fare</string>
-    </resources>
+    <string name="dahboard_options_dialog_title">Betjeningspanel indstillinger</string>
+	<string name="shared_string_card_was_hidden">Kortet blev skjult</string>
+	<string name="shared_string_undo">FORTRYD</string>
+	<string name="shared_string_skip">Spring over</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Offline kort\n&amp; navigation</string>
+</resources>
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index a7def291bc..94eb3ec37d 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -1040,4 +1040,5 @@
 
 	<string name="poi_recycling_cardboard">Cartón</string>
 	<string name="poi_recycling_hardcore">Escombros</string>
+	<string name="poi_recycling_chipboard">Conglomerado</string>
 	</resources>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 77075189d3..8f0407dacf 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2018,4 +2018,10 @@
     <string name="we_really_care_about_your_opinion">Nos interesa mucho y es importante oír su opinión.</string>
 	<string name="rendering_value_boldOutline_name">Borde remarcado</string>
     <string name="traffic_warning_hazard">Advertencia de riesgo</string>
-    </resources>
+    <string name="dahboard_options_dialog_title">Opciones del panel</string>
+	<string name="shared_string_card_was_hidden">La tarjeta estaba oculta</string>
+	<string name="shared_string_undo">Deshacer</string>
+	<string name="shared_string_skip">Omitir</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Mapas y navegación sin conexión</string>
+</resources>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index 4f193e84ed..5409413da6 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -1043,4 +1043,5 @@
 	<string name="poi_crossing_unmarked">Desmarcado</string>
 
 	<string name="poi_recycling_hardcore">Escombros</string>
+	<string name="poi_recycling_chipboard">Aglomerado</string>
 	</resources>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index d8bdcb71fb..a3460432ff 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -2156,4 +2156,10 @@
     <string name="we_really_care_about_your_opinion">Nos interesa mucho y es importante para nosotros oír su opinión.</string>
 	<string name="rendering_value_boldOutline_name">Borde remarcado</string>
     <string name="traffic_warning_hazard">Advertencia de riesgo</string>
-    </resources>
+    <string name="dahboard_options_dialog_title">Opciones del panel</string>
+	<string name="shared_string_card_was_hidden">La tarjeta estaba oculta</string>
+	<string name="shared_string_undo">Deshacer</string>
+	<string name="shared_string_skip">Omitir</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Mapas y navegación fuera de línea</string>
+</resources>
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index 9dbe3ce179..f4d35985b8 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -1549,11 +1549,24 @@
     <string name="route_descr_destination">Odredište</string>
     <string name="download_wikipedia_maps">Wikipedia</string>
     <string name="close_changeset">Zatvori promjene</string>
-	<string name="lang_pms"/>
+	<string name="lang_pms">Pijemonte</string>
     <string name="storage_directory_default">Unutarnja memorija</string>
     <string name="confirm_usage_speed_cameras">U mnogim zemljama (Njemačka, Francuska, Italija, i druge) Korištenje upozorenja za nadolazeće uređaje za mjerenje brzine nije dopušteno zakonom. OsmAnd ne preuzima nikakvu odgovornost ako kršite zakon. Molimo kliknite da samo ako ste sigurni da želite koristiti ovu značajku.</string>
 	<string name="osmand_parking_overdue">zakasnio</string>
 	<string name="osmo_plugin_name">OsMo (OSM Monitoring)</string>
 	<string name="watch">Prikaži</string>
 	<string name="download_tab_local">Lokalno</string>
-	</resources>
+	<string name="traffic_warning_hazard">Opasnost</string>
+    <string name="no_updates_available">Nema dostupnih ažuriranja</string>
+    <string name="rendering_value_default13_name">Zadano (13)</string>
+	<string name="rendering_value_defaultTranslucentCyan_name">Zadana (svijetlo plava)</string>
+    <string name="rendering_value_walkingRoutesOSMC_name">Bojanje prema OSMC</string>
+    <string name="application_dir_change_warning3">Želite li da OsmAnd kopira svoje podatke na novo odredište?</string>
+    <string name="specified_directiory_not_writeable">Karte se ne mogu stvoriti u navedenoj mapi</string>
+    <string name="rendering_attr_OSMMapperAssistant_name">OSM asistent za mapiranje</string>
+	<string name="record_plugin_name">Bilježenje putovanja</string>
+	<string name="rendering_attr_roadStyle_name">Stil ceste</string>
+    <string name="points">Točke</string>
+	<string name="rendering_value_highContrastRoads_name">Visoki kontrast ceste</string>
+	<string name="routing_attr_no_new_routing_description">Nemojte koristiti pravila usmjeravanje uvedena u v1.9</string>
+    </resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 2172a15bab..d133c6d03d 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2139,4 +2139,11 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="we_really_care_about_your_opinion">Ci teniamo molto alla tua opinione, è molto importante avere un tuo rimando.</string>
 	<string name="rendering_value_boldOutline_name">Contorno in grassetto</string>
     <string name="traffic_warning_hazard">Pericolo</string>
+    <string name="dahboard_options_dialog_title">Opzioni pannello di controllo</string>
+	<string name="shared_string_card_was_hidden">La carta era nascosta</string>
+	<string name="shared_string_undo">Annulla azione</string>
+	<string name="shared_string_skip">Salta</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Mappe offline &amp; Navigazione</string>
+<string name="lang_new">Newa / Bhasa del Nepal</string>
     </resources>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 322342d256..598266de61 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -1115,7 +1115,7 @@ POIの更新は利用できません</string>
 	<string name="local_openstreetmap_delete">変更を削除する</string>
 	<string name="local_openstreetmap_descr_title">非同期OSMの編集:</string>
 	<string name="local_openstreetmap_settings">保存済みOSM POIとバグ</string>
-	<string name="animate_routing_route_not_calculated">まず、ルートを検索して下さい</string>
+	<string name="animate_routing_route_not_calculated">最初にルートを検索して下さい</string>
     <string name="animate_routing_route">"計算されたルートを使用してシミュレーション "</string>
     <string name="animate_routing_gpx">GPXファイルに保存された経路を使用してシミュレーション</string>
     <string name="shared_string_remember_my_choice">選択を記憶</string>
@@ -1694,7 +1694,7 @@ POIの更新は利用できません</string>
 	<string name="keep_informing_descr">ナビゲーション指示を繰り返す間隔の設定</string>
     <string name="arrival_distance">目的地周辺でのアナウンスタイミング</string>
     <string name="arrival_distance_descr">どのタイミングで目的地周辺のアナウンスをするか設定</string>
-    <string name="osmo_plugin_description">"このプラグインはOsMoと呼ばれる高度なライブモニタリング機能を提供します、http://osmo.mobiを参照して下さい。\n\n参加しているグループ全てのデバイス経路をリアルタイムで追跡することが出来るので、互いにコミュニケーションを取ることができます。期間を限定した追跡、または永続的な追跡のためにさまざまなオプションが付属しています。\n\n匿名のグループは簡単に作成できますが、指定された数日間いくつかの機能が制限されており、その場合遠隔操作は出来ずグループ管理者は存在しません。完全な機能のグループはウェブサイト上で別に作成する必要があり、登録ユーザーのみがそれらにアクセスすることができます。 "</string>
+    <string name="osmo_plugin_description">"このプラグインはOsMoと呼ばれる高度なライブモニタリング機能を提供します、http://osmo.mobiを参照して下さい。\n\n参加しているグループ全てのデバイス経路をリアルタイムで追跡することが出来るので、互いにコミュニケーションを取ることができます。期間を限定した追跡、または恒久的な追跡のためにさまざまなオプションが付属しています。\n\n匿名のグループは簡単に作成できますが、指定された数日間いくつかの機能が制限されており、その場合遠隔操作は出来ずグループ管理者は存在しません。完全な機能のグループはウェブサイト上で別に作成する必要があり、登録ユーザーのみがそれらにアクセスすることができます。 "</string>
     <string name="osmo_plugin_name">OsMo(OSMモニタリング)</string>
    	<string name="always_center_position_on_map">位置を常に中央表示</string>
     <string name="voice_pref_title">音声</string>
@@ -2115,4 +2115,14 @@ POIの更新は利用できません</string>
 	<string name="user_hates_app_get_feedback_long">このアプリの変更して欲しい箇所を教えて下さい。</string>
 <string name="rendering_value_walkingRoutesScopeOSMC_name">ルート範囲に応じてカラー変更</string>
     <string name="rendering_value_walkingRoutesOSMC_name">OSMCに応じてカラー変更</string>
-    </resources>
+    <string name="traffic_warning_hazard">通行注意</string>
+    <string name="rendering_value_boldOutline_name">太線</string>
+    <string name="no_updates_available">更新はありません</string>
+    <string name="download_live_updates">ライブ更新</string>
+	<string name="we_really_care_about_your_opinion">私達は常にユーザーを気に掛け、個々の意見を参考にすることを重要視しています。</string>
+	<string name="failed_to_upload">アップロードに失敗しました</string>
+	<string name="delete_change">変更を削除します</string>
+	<string name="successfully_uploaded_pattern">正常にアップロードされました {0}/{1}</string>
+	<string name="try_again">再試行</string>
+	<string name="error_message_pattern">エラー: {0}</string>
+</resources>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index cccd9a11a8..1373331dfb 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="offline_navigation_not_available">OsmAnd-ით ნავიგაცია გათიშულ რეჟიმში დროებით მიუწვდომელია.</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="offline_navigation_not_available">OsmAnd-ით ნავიგაცია გათიშულ რეჟიმში დროებით მიუწვდომელია.</string>
   <string name="left_side_navigation">მარცხენა ხელით ტარება</string>
   <string name="left_side_navigation_descr">აირჩიეთ მარცხენა მხარეს საჭის გამომყენებელი ქვეყნებისათვის</string>
   
@@ -20,7 +21,7 @@
   <string name="online_map_settings_descr">მიმდინარე და დაქეშირებული ნაწილოვანი რუკების წყაროების გამართვა</string>
   
   
-  <string name="osmand_rastermaps_plugin_description">დამატება ამსუბუქებს სხვადასხვა მიმდინარე ან ქეშირებულ ნაწილოვან რუკებს. ისინი შეიძლება მომზადდეს როგორც გათიშული რუკები და შეინახოს OsmAnd-ის დასტაში.</string>
+  <string name="osmand_rastermaps_plugin_description">"დამატება ამსუბუქებს სხვადასხვა მიმდინარე ან ქეშირებულ ნაწილოვან რუკებს. ისინი შეიძლება მომზადდეს როგორც გათიშული რუკები და შეინახოს OsmAnd-ის დასტაში. "</string>
   <string name="osmand_background_plugin_description">დამატება გაძლევთ საშუალებს დევნის ან ნავიგაციის მოწყობილობის ძილის დროს პერიოდულად GPS ჩიპის გააქტიურების საშუალებით.</string>
   <string name="osmand_accessibility_description">დამატება მართავს სპეციალური წვდომის შესაძლებლობებს.</string>
   
@@ -29,7 +30,7 @@
   <string name="osmand_development_plugin_description">დამატება გაძლევთ საშუალებას განახორციელოთ შეცდომების კონტროლი და განვითარება მახასიათებლებისა როგორიცაა ანიმირებული ნავიგაცია.</string>
   <string name="plugins_screen">დამატებათა გამმართველი</string>
   
-  <string name="prefs_plugins_descr">დამატება გაძლევთ საშუალებას გამოიყენოთ აპლიკაციისათვის თანმოყოლილი ფუნქციები როგორიცაა ნაწილოვანი რუკები, თვალის დევნება, ძილის დროის ოპერაციები და სხვა.</string>
+  <string name="prefs_plugins_descr">დამატება გაძლევთ საშუალებას გამოიყენოთ აპლიკაციისათვის თანმოყოლილი ფუნქციები როგორიცაა ნაწილოვანი რუკები, თვალის დევნება, ძილის დროის ოპერაციები და სხვა</string>
   <string name="prefs_plugins">დამატების მმართველი</string>
   <string name="tip_recent_changes_0_8_0_t">"ცვლილებები 0.8.0-ში :
 \n\t- დამატების შესაძლებლობები\n\t- რუკის გათიშულ რეჟიმში გამოყენების ახალი ფორმატი\n\t- გამოსწორებულია ბევრი შეცდომა "</string>
@@ -186,7 +187,8 @@
   <string name="tip_day_night_mode">დღე/ღამის არჩევა</string>
   
   <string name="tip_osm_improve">OSM-ს მონაცემების გაუმჯობესება</string>
-  <string name="tip_osm_improve_t">\tOsmAnd იყენებს რუკებს, რომლებიც ეყრდნობა Openstreetmap.org (OSM)-ის მონაცემებს და ასევე ანახლებს მათ. თქვენ ადვილად შეგიძლიათ შექმნათ POI-ები და ატვირთოთ ისინი. ასევე შესაძლებელია OSM-ის ხოჭოების შესახებ შეტყობინებების შექმნა მხოლოდ რამოდენიმე წკაპით!\n\tამისათვის საჭიროა შეიყვანოთ OSM-ის მომხმარებლის სახელი და პაროლი. \'პარამეტრები\' -&gt; \'მთავარი პარამეტრები\' -&gt; \'OSM-ის გამართვა\'. \n\tახალი POI-ის შესაქმნელად აირჩიეთ ფუნქცია \'POI-ის შექმნა\' კონტექსტურ მენიუში. ინფორმაციის შეყვანის შემდეგ დააჭირეთ \'ახალი POI-ის შექმნა\'.\n\tრუკის შეცდომები შეგიძლიათ მომენტალურად შეატყობინოთ OSM-ს. ეს დაეხმარება მათ ამ შეცდომების ჩასწორებაში.\n\tOSM-ის ხოჭოს დასამატებლად აირჩიეთ \'OSM-ის ხოჭოს რეპორტის გახსნა\' კონტექსტური მენიუდან. მონაცემების შეყვანის შემდეგ დააჭირეთ დამატების ღილაკს.\n\tშენიშვნა: OSM POI-ის დასამატებლად და ხოჭოების რეპორტის გასახსნელად საჭიროა ინტერნეტ-შეერთება.</string>
+  <string name="tip_osm_improve_t">"OsmAnd იყენებს რუკებს, რომლებიც ეყრდნობა Openstreetmap.org (OSM)-ის მონაცემებს და ასევე ანახლებს მათ. თქვენ ადვილად შეგიძლიათ შექმნათ POI-ები და ატვირთოთ ისინი. ასევე შესაძლებელია OSM-ის ხოჭოების შესახებ შეტყობინებების შექმნა მხოლოდ რამოდენიმე წკაპით!\n\tამისათვის საჭიროა შეიყვანოთ OSM-ის მომხმარებლის სახელი და პაროლი. \'პარამეტრები\' -&gt; \'მთავარი პარამეტრები\' -&gt; \'OSM-ის გამართვა\'.
+\n\tახალი POI-ის შესაქმნელად აირჩიეთ ფუნქცია \'POI-ის შექმნა\' კონტექსტურ მენიუში. ინფორმაციის შეყვანის შემდეგ დააჭირეთ \'ახალი POI-ის შექმნა\'.\n\tრუკის შეცდომები შეგიძლიათ მომენტალურად შეატყობინოთ OSM-ს. ეს დაეხმარება მათ ამ შეცდომების ჩასწორებაში.\n\tOSM-ის ხოჭოს დასამატებლად აირჩიეთ \'OSM-ის ხოჭოს რეპორტის გახსნა\' კონტექსტური მენიუდან. მონაცემების შეყვანის შემდეგ დააჭირეთ დამატების ღილაკს.\n\tშენიშვნა: OSM POI-ის დასამატებლად და ხოჭოების რეპორტის გასახსნელად საჭიროა ინტერნეტ-შეერთება "</string>
   <string name="download_files_not_enough_space">არასაკმარისი ადგილი %1$s მბ-ის გადმოსაწერად (თავისუფალია: %2$s).</string>
   <string name="download_files_question_space">თავისუფალი ადგილი {2} მბ! გადმოვწერო {0} ფაილი ზომით ({1} მბ)?</string>
   
@@ -1037,7 +1039,7 @@
     <string name="map_widget_av_notes">ხმოვანი/ვიდეო შენიშვნები</string>
     <string name="osmand_srtm_short_description_80_chars">OsmAnd-ის დამატება გათიშული კონტურული ხაზებისათვის</string>
     
-    <string name="osmand_srtm_long_description_1000_chars">ეს დამატება უზრუნველყოფს კონტურულ ხაზებს, რომლებიც შეიძლება ნაჩვენები იქნას OsmAnd-ის გათიშულ რუკებზე. გლობალური მონაცემები (70 გრადუს ჩრდილოეთსა და 70 გრადუს სამხრეთს შორის) ემყარება SRTM (Shuttle Radar Topography Mission) და ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer)-ის მონაცემებს, რომელიც წარმოადგენს ფოტოკამერას Terra-ზე, NASA-ს წამყვან თანამგზავრზე, რომელიც ემსახურება დედამიწის დათვალიერების სისტემას. ASTER წარმოადგენს ერთობლივ პროექტს NASA-ს, იაპონიის ეკონომიკის სამინისტროს, ვაჭრობისა და ინდუსტრიის (METI), და იაპონიის კოსმოსურ სისტემებს (J-spacesystems) შორის.</string>
+    <string name="osmand_srtm_long_description_1000_chars">"ეს დამატება უზრუნველყოფს კონტურულ ხაზებს, რომლებიც შეიძლება ნაჩვენები იქნას OsmAnd-ის გათიშულ რუკებზე. გლობალური მონაცემები (70 გრადუს ჩრდილოეთსა და 70 გრადუს სამხრეთს შორის) ემყარება SRTM (Shuttle Radar Topography Mission) და ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer)-ის მონაცემებს, რომელიც წარმოადგენს ფოტოკამერას Terra-ზე, NASA-ს წამყვან თანამგზავრზე, რომელიც ემსახურება დედამიწის დათვალიერების სისტემას. ASTER წარმოადგენს ერთობლივ პროექტს NASA-ს, იაპონიის ეკონომიკის სამინისტროს, ვაჭრობისა და ინდუსტრიის (METI), და იაპონიის კოსმოსურ სისტემებს (J-spacesystems) შორის. "</string>
     
     
     
@@ -1220,7 +1222,7 @@
     <string name="osmand_play_title_30_chars">OsmAnd რუკები &amp; ნავიგაცია</string>
 	<string name="osmand_plus_play_title_30_chars">OsmAnd+ რუკები &amp; ნავიგაცია</string>
 	<string name="support_new_features_descr">შემომწირეთ აპლიკაციაში ახალი მახასიათებლების სანახავად</string>
-	<string name="shared_string_downloading">ჩამოტვირთვა…</string>
+	<string name="shared_string_downloading">ჩამოტვირთვა</string>
 	<string name="osb_author_dialog_password">OSM პაროლი(არასავალდებულო)</string>
 	<string name="av_camera_focus">კამერის ფოკუსის ტიპი</string>
 	<string name="av_camera_focus_descr">აირჩიეთ შიდა კამერის ფოკუსის ტიპი</string>
@@ -1232,4 +1234,62 @@
 	<string name="av_camera_focus_continuous">კამერა განაგრძობს ფოკუსის დაჭერას</string>
 	<string name="av_photo_play_sound">ფოტოს გადაღებისას ხმის გამოცემა</string>
 	<string name="av_photo_play_sound_descr">აირჩიეთ ფოტოების გადაღებისას ხმის გამოსაცემად</string>
-</resources>
\ No newline at end of file
+<string name="traffic_warning_hazard">საშიშროება</string>
+    <string name="no_updates_available">განახლებები ნაპოვნი არაა</string>
+    <string name="download_live_updates">ცოცხალი განახლებები</string>
+	<string name="rendering_value_default13_name">ნაგულისხმევი (13)</string>
+	<string name="rendering_attr_currentTrackColor_name">GPX-ის ფერი</string>
+    <string name="rendering_attr_currentTrackWidth_name">GPX-ის სიგანე</string>
+    <string name="rendering_value_red_name">წითელი</string>
+    <string name="rendering_value_translucent_red_name">გამჭირვალე წითელი</string>
+    <string name="rendering_value_orange_name">ფორთოხლისფერი</string>
+    <string name="rendering_value_translucent_orange_name">გამჭირვალე ფორთოხლისფერი</string>
+    <string name="rendering_value_yellow_name">ყვითელი</string>
+    <string name="rendering_value_translucent_yellow_name">გამჭირვალე ყვითელი</string>
+    <string name="rendering_value_lightgreen_name">ღია მწვანე</string>
+    <string name="rendering_value_translucent_lightgreen_name">გამჭირვალე ღია მწვანე</string>
+    <string name="rendering_value_green_name">მწვანე</string>
+    <string name="rendering_value_translucent_green_name">გამჭირვალე მწვანე</string>
+    <string name="rendering_value_lightblue_name">ღია ლურჯი</string>
+    <string name="rendering_value_translucent_lightblue_name">გამჭირვალე ღია ლურჯი</string>
+    <string name="rendering_value_blue_name">ლურჯი</string>
+    <string name="rendering_value_translucent_blue_name">გამჭირვალე ლურჯი</string>
+    <string name="rendering_value_purple_name">მუქი წითელი</string>
+    <string name="rendering_value_translucent_purple_name">გამჭირვალე მუქლი წითელი</string>
+    <string name="restart_is_required">ცვლილებების ძალაში მთლიანად შესასვლელად საჭიროა ხელით გადატვირთოთ აპლიკაცია.</string>
+    <string name="light_theme">ღია</string>
+    <string name="dark_theme">მუქი</string>
+    <string name="lang_pms">პიემონტური</string>
+    <string name="lang_bn">ბენგალური</string>
+    <string name="lang_tl">ტაგალური</string>
+    <string name="lang_sh">სერბო-ხორვატიული</string>
+    <string name="lang_az">აზერბაიჯანული</string>
+    <string name="lang_br">ბრეტონული</string>
+    <string name="lang_sq">ალბანური</string>
+    <string name="lang_is">ისლანდიური</string>
+    <string name="lang_bpy">ბიშნუპრიული</string>
+    <string name="lang_nv">ნავაჯიური</string>
+    <string name="lang_ga">ირლანდიური</string>
+    <string name="lang_la">ლათინური</string>
+    <string name="lang_ku">ქურთული</string>
+    <string name="lang_ta">თამილური</string>
+    <string name="lang_ml">მალაიამური</string>
+    <string name="lang_lb">ლუქსემბურგული</string>
+    <string name="lang_os">ოსური</string>
+    <string name="lang_eo">ესპერანტო</string>
+    <string name="lang_es_ar">არგენტინული ესპანური</string>
+    <string name="lang_nb">ნორვეგიული ბოქმაალი</string>
+    <string name="lang_vo">ვოლაპუკური</string>
+    <string name="lang_th">ტაილანდური</string>
+    <string name="rendering_value_defaultTranslucentCyan_name">ნაგულისხმევი (გამჭირვალე მუქი წითელი)</string>
+    <string name="lang_te">ტელუგური</string>
+    <string name="lang_nn">ნორვეგიული (ნინორსკი)</string>
+    <string name="lang_new">ნევარული / ნეპალური ბასა</string>
+    <string name="lang_ms">მალაიზიური</string>
+    <string name="lang_ht">ჰაიტური</string>
+    <string name="lang_gl">გალიციური</string>
+    <string name="lang_et">ესტონური</string>
+    <string name="lang_ceb">ჩებუანური</string>
+    <string name="archive_wikipedia_data">თქვენ გაქვთ ძველი, შეუთავსებელი მონაცემები ვიკიპედიიდან. გნებავთ მათი დაარქივება?</string>
+    <string name="download_wikipedia_files">გნებავთ ვიკიპედიიდან დამატებითი მონაცემების ჩამოტვირთვა (%1$s მბ) ?</string>
+    </resources>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index c6ea507883..454d2b314b 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -441,16 +441,16 @@
   <string name="show_transport_over_map_description">Pokaż na mapie przystanki transportu publicznego</string>
   <string name="show_transport_over_map">Pokaż przystanki</string>
   <string name="hello">Program do nawigacji satelitarnej OsmAnd</string>
-  <string name="update_poi_success">Dane POI zaktualizowane ({0} zostało załadowanych)</string>
-  <string name="update_poi_error_local">Błąd podczas uaktualniania lokalnej listy POI</string>
-  <string name="update_poi_error_loading">Błąd podczas pobierania danych z serwera</string>
-  <string name="update_poi_no_offline_poi_index">Brak danych offline o POI dla tego rejonu</string>
+  <string name="update_poi_success">Uaktualniono dane POI (wczytano {0})</string>
+  <string name="update_poi_error_local">Błąd uaktualniania lokalnej listy POI</string>
+  <string name="update_poi_error_loading">Błąd pobierania danych z serwera</string>
+  <string name="update_poi_no_offline_poi_index">Brak danych offline POI dla tego rejonu</string>
   <string name="update_poi_is_not_available_for_zoom">Uaktualnianie POI jest niedostępne dla małych poziomów przybliżenia</string>
   <string name="context_menu_item_update_poi">Uaktualnij POI</string>
   <string name="context_menu_item_update_map_confirm">Uaktualnić dane lokalne przez Internet?</string>
   <string name="search_history_city">Miasto: {0}</string>
   <string name="search_history_street">Ulica: {0}, {1}</string>
-  <string name="search_history_int_streets">Przecięcie: {0} x {1} in {2}</string>
+  <string name="search_history_int_streets">Przecięcie: {0} x {1} w {2}</string>
   <string name="search_history_building">Budynek: {0}, {1}, {2}</string>
   <string name="favorite">Ulubione</string>
   <string name="shared_string_clear_all">Wyczyść wszystko</string>
@@ -509,13 +509,13 @@
   <string name="error_calculating_route_occured">Wystąpił błąd podczas obliczania trasy</string>
   <string name="empty_route_calculated">Wyznaczono pustą trasę</string>
   <string name="new_route_calculated_dist">Obliczono nową trasę, dystans</string>
-  <string name="arrived_at_destination">Dotarłeś do celu</string>
-  <string name="invalid_locations">Pozycje są niepoprawne!</string>
+  <string name="arrived_at_destination">Osiągnięto cel</string>
+  <string name="invalid_locations">Koordynaty są nieprawidłowe!</string>
   <string name="go_back_to_osmand">Wróć do mapy OsmAnd</string>
   <string name="shared_string_close">Zamknij</string>
   <string name="loading_data">Wczytywanie danych…</string>
   <string name="reading_indexes">Wczytywanie danych lokalnych…</string>
-  <string name="previous_run_crashed">Program poprzednio uległ awarii. Log z informacjami jest w {0}. Wyślij zgłoszenie i załącz ten plik.</string>
+  <string name="previous_run_crashed">Program wcześniej uległ awarii. Dziennik z informacjami znajduje się w {0}. Proszę wysłać zgłoszenie błędu i załączyć plik dziennika.</string>
   <string name="saving_gpx_tracks">Zapisywanie śladów GPX na kartę SD…</string>
   <string name="finished_task">Zakończono</string>
   
@@ -528,7 +528,7 @@
   <string name="user_password">Hasło konta OSM</string>
   <string name="osm_settings_descr">Skonfiguruj ustawienia dotyczące potrzebne do wysyłania danych do Openstreetmap.org (OSM)</string>
   
-  <string name="data_settings_descr">Ustaw język, pobierz/przeładuj dane</string>
+  <string name="data_settings_descr">Ustaw język, pobierz/wczytaj ponownie dane</string>
   <string name="data_settings">Dane</string>
   
   <string name="osm_settings">Edycja OSM</string>
@@ -546,7 +546,7 @@
   <string name="save_track_to_gpx_descrp">Zapisuje ślady do katalogu śladów podczas nawigacji</string>
   <string name="save_track_to_gpx">Zapisywanie śladu do pliku GPX podczas nawigacji</string>
   <string name="update_tile">Uaktualnij mapę</string>
-  <string name="reload_tile">Przeładuj kafelki</string>
+  <string name="reload_tile">Wczytaj ponownie kafelki</string>
   <string name="user_name_descr">Wymagane do wysyłania danych na openstreetmap.org</string>
   <string name="user_name">Nazwa użytkownika OSM</string>
   <string name="mark_point">Cel</string>
@@ -1523,7 +1523,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="shared_string_or">lub</string>
 	<string name="shared_string_remember_my_choice">Zapamiętanie wyboru</string>
     
-    <string name="animate_routing_route_not_calculated">Proszę najpierw dokonać przeliczenia trasy</string>
+    <string name="animate_routing_route_not_calculated">Proszę najpierw przeliczyć trasę</string>
     <string name="animate_routing_route">Pokaż używając obliczonej trasy </string>
     <string name="animate_routing_gpx">Pokaż używając śladu GPX</string>
     
@@ -2189,7 +2189,13 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="do_you_like_osmand">Czy lubisz OsmAnd?</string>
 	<string name="we_really_care">Naprawdę nam zależy</string>
 	<string name="rate_this_app">Oceń tę aplikację</string>
-	<string name="rate_this_app_long">Określ jakość OsmAnd w witrynie Google Play</string>
+	<string name="rate_this_app_long">Oceń OsmAnd w sklepie Google Play</string>
 	<string name="user_hates_app_get_feedback">Powiedz nam, dlaczego.</string>
 	<string name="user_hates_app_get_feedback_long">Powiedz, co zmieniłbyś w aplikacji.</string>
+<string name="no_updates_available">Brak dostępnych aktualizacji</string>
+    <string name="failed_to_upload">Nie udało się wysłać</string>
+	<string name="delete_change">Usuń zmianę</string>
+	<string name="successfully_uploaded_pattern">Wysłano {0}/{1}</string>
+	<string name="try_again">Spróbuj ponownie</string>
+	<string name="error_message_pattern">Błąd: {0}</string>
 </resources>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index ae8184ce22..5a2cec2b3b 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -1787,4 +1787,10 @@
     <string name="we_really_care_about_your_opinion">Nos preocupamos muito com sua opinião e é importante para nós ouvi-lo.</string>
 	<string name="rendering_value_boldOutline_name">Títulos com contornos</string>
     <string name="traffic_warning_hazard">Perigo</string>
-    </resources>
+    <string name="dahboard_options_dialog_title">Painel de opções</string>
+	<string name="shared_string_card_was_hidden">Cartão estava escondido</string>
+	<string name="shared_string_undo">Desfazer</string>
+	<string name="shared_string_skip">Pular</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Mapas &amp; Navegação\nOffline</string>
+</resources>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index bde239edb8..8c01bea599 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1782,7 +1782,7 @@
     <string name="download_tab_local">Локальные</string>
 	<string name="navigate_point_zone">Зона</string>
     <string name="rendering_attr_transportStops_name">Остановки транспорта</string>
-    <string name="shared_string_dismiss">Отклонить</string>
+    <string name="shared_string_dismiss">Удалить</string>
     <string name="dash_download_msg_none">Вы хотите загрузить оффлайн карты?</string>
     <string name="dash_download_msg">Загружено карт: %1$s</string>
     <string name="dash_download_new_one">Загрузить новую карту</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 0995ed349e..0de594a39b 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2052,4 +2052,8 @@
 	<string name="error_message_pattern">Errore: {0}</string>
 <string name="rendering_value_boldOutline_name">Oru in grassetu</string>
     <string name="traffic_warning_hazard">Perìgulu</string>
-    </resources>
+    <string name="dahboard_options_dialog_title">Optziones de su pannellu</string>
+	<string name="shared_string_skip">Brinca</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Mapas non in lìnia\ne Nàvigu</string>
+</resources>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index fea87d7d0d..560aef6b96 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2169,7 +2169,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 <string name="osmo_share_my_location">Zdieľať moju polohu</string>
     <string name="shared_string_logoff">Odhlásiť</string>
     <string name="rendering_value_disabled_name">Vypnuté</string>
-    <string name="rendering_value_walkingRoutesScopeOSMC_name">Zafarbenie podľa rozsahu trasy</string>
+    <string name="rendering_value_walkingRoutesScopeOSMC_name">Zafarbenie podľa dôležitosti trasy</string>
     <string name="rendering_value_walkingRoutesOSMC_name">Zafarbenie podľa OSMC</string>
     <string name="osm_edit_context_menu_delete">Odstrániť OSM zmenu</string>
     <string name="read_full_article">Prečítať celý článok (online)</string>
@@ -2252,4 +2252,10 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 	<string name="error_message_pattern">Chyba: {0}</string>
 <string name="traffic_warning_hazard">Nebezpečenstvo</string>
     <string name="rendering_value_boldOutline_name">Hrubý obrys</string>
-    </resources>
+    <string name="dahboard_options_dialog_title">Nastavenia úvodného panela</string>
+	<string name="shared_string_card_was_hidden">Karta bola skrytá</string>
+	<string name="shared_string_undo">KROK SPÄŤ</string>
+	<string name="shared_string_skip">Preskočiť</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Offline mapy\n&amp; Navigácia</string>
+</resources>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 2d3e9d2650..3edfbdb9a9 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1963,4 +1963,9 @@
 <string name="no_updates_available">Inga uppdateringar tillgängliga</string>
     <string name="we_really_care_about_your_opinion">Vi bryr oss mycket om vad du tycker och det är viktigt för oss att höra din åsikt.</string>
 	<string name="rendering_value_boldOutline_name">Fet kontur</string>
-    </resources>
+    <string name="offline_maps_and_navigation">Offline-kartor\noch navigering</string>
+<string name="shared_string_card_was_hidden">Kortet har dolts</string>
+	<string name="shared_string_undo">ÅNGRA</string>
+	<string name="shared_string_skip">Hoppa över</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	</resources>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index f7c7a864a1..ffaca91829 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -149,7 +149,7 @@
 	<string name="osmand_parking_pm">PM</string>
 	<string name="osmand_parking_am">AM</string>
 	<string name="osmand_parking_position_name">停車地點</string>
-	<string name="osmand_parking_plugin_description">停車位置外掛元件讓您記住停車地點和還剩多少停車時間（如果有時間限制）。\n位置和時間這兩者均可在 OsmAnd 操控板，地圖螢幕上的小工具看見。警報可以增加到 Android 的日曆作為提醒。</string>
+	<string name="osmand_parking_plugin_description">停車位置外掛元件讓您記住停車地點和還剩多少停車時間（如果有時間限制）。\n在地圖螢幕上，位置和時間這兩者均可見於 OsmAnd 儀表板的小工具。警報可以增加到 Android 的日曆作為提醒。</string>
 	<string name="osmand_parking_plugin_name">停車地點</string>
 	<string name="context_menu_item_add_parking_point">標記為停車地點</string>
 	<string name="context_menu_item_delete_parking_point">刪除停車標記</string>
@@ -2075,4 +2075,10 @@
     <string name="we_really_care_about_your_opinion">我們很在乎您的意見，並且聽到您的反映對我們來說是很重要的。</string>
 	<string name="rendering_value_boldOutline_name">粗外框</string>
     <string name="traffic_warning_hazard">危險</string>
-    </resources>
+    <string name="dahboard_options_dialog_title">儀表板選項</string>
+	<string name="shared_string_card_was_hidden">卡為隱藏</string>
+	<string name="shared_string_undo">復原</string>
+	<string name="shared_string_skip">跳過</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">離線地圖\n和導航</string>
+</resources>
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 8b89251afd..704e506dc0 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -45,7 +45,6 @@ import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.IntermediatePointsDialog;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
 import net.osmand.plus.audionotes.DashAudioVideoNotesFragment;
 import net.osmand.plus.dashboard.tools.DashFragmentData;
 import net.osmand.plus.dashboard.tools.DashboardSettingsDialogFragment;
@@ -58,13 +57,9 @@ import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.WaypointDialogHelper;
 import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
 import net.osmand.plus.monitoring.DashTrackFragment;
-import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.osmedit.DashOsmEditsFragment;
-import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.plus.osmo.DashOsMoFragment;
-import net.osmand.plus.osmo.OsMoPlugin;
 import net.osmand.plus.parkingpoint.DashParkingFragment;
-import net.osmand.plus.parkingpoint.ParkingPositionPlugin;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.DownloadedRegionsLayer;
 import net.osmand.plus.views.OsmandMapTileView;
@@ -92,32 +87,22 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
 	private static final DashFragmentData.ShouldShowFunction chooseAppDirShouldShow = new ChooseAppDirShouldShow();
 
 	private static final DashFragmentData[] fragmentsData = new DashFragmentData[]{
-			new DashFragmentData(DashRateUsFragment.TAG, DashRateUsFragment.class, "Rate us",
-					rateUsShouldShow, new CanNotHideFunction()),
-			new DashFragmentData(DashFirstTimeFragment.TAG, DashFirstTimeFragment.class, "First time",
-					firstTimeShouldShow, new CanNotHideFunction()),
-			new DashFragmentData(DashChooseAppDirFragment.TAG, DashChooseAppDirFragment.class, "Choose app dir",
-					chooseAppDirShouldShow, new CanNotHideFunction()),
-			new DashFragmentData(DashErrorFragment.TAG, DashErrorFragment.class, "Error",
-					errorShouldShow, new CanNotHideFunction()),
+			new DashFragmentData(DashRateUsFragment.TAG, DashRateUsFragment.class, "Rate us", rateUsShouldShow, true),
+			new DashFragmentData(DashFirstTimeFragment.TAG, DashFirstTimeFragment.class, "First time", firstTimeShouldShow, true),
+			new DashFragmentData(DashChooseAppDirFragment.TAG, DashChooseAppDirFragment.class, "Choose app dir", chooseAppDirShouldShow, true),
+			new DashFragmentData(DashErrorFragment.TAG, DashErrorFragment.class, "Error", errorShouldShow, true),
 			new DashFragmentData(DashNavigationFragment.TAG, DashNavigationFragment.class, "Navigation", defaultShouldShow),
-			new DashFragmentData(DashParkingFragment.TAG, DashParkingFragment.class, "Parking",
-					defaultShouldShow, new CanHideIfPluginEnabled(ParkingPositionPlugin.class)),
+			new DashFragmentData(DashParkingFragment.TAG, DashParkingFragment.class, "Parking", defaultShouldShow),
 			new DashFragmentData(DashWaypointsFragment.TAG, DashWaypointsFragment.class, "Waypoints", defaultShouldShow),
 			new DashFragmentData(DashSearchFragment.TAG, DashSearchFragment.class, "Search", defaultShouldShow),
 			new DashFragmentData(DashRecentsFragment.TAG, DashRecentsFragment.class, "Recent places", defaultShouldShow),
 			new DashFragmentData(DashFavoritesFragment.TAG, DashFavoritesFragment.class, "Favourites", defaultShouldShow),
-			new DashFragmentData(DashAudioVideoNotesFragment.TAG, DashAudioVideoNotesFragment.class, "Notes",
-					defaultShouldShow, new CanHideIfPluginEnabled(AudioVideoNotesPlugin.class)),
-			new DashFragmentData(DashTrackFragment.TAG, DashTrackFragment.class, "Track",
-					defaultShouldShow, new CanHideIfPluginEnabled(OsmandMonitoringPlugin.class)),
-			new DashFragmentData(DashOsMoFragment.TAG, DashOsMoFragment.class, "OsMo",
-					defaultShouldShow, new CanHideIfPluginEnabled(OsMoPlugin.class)),
-			new DashFragmentData(DashOsmEditsFragment.TAG, DashOsmEditsFragment.class, "OsmEdits",
-					defaultShouldShow, new CanHideIfPluginEnabled(OsmEditingPlugin.class)),
+			new DashFragmentData(DashAudioVideoNotesFragment.TAG, DashAudioVideoNotesFragment.class, "Notes", defaultShouldShow),
+			new DashFragmentData(DashTrackFragment.TAG, DashTrackFragment.class, "Track", defaultShouldShow),
+			new DashFragmentData(DashOsMoFragment.TAG, DashOsMoFragment.class, "OsMo", defaultShouldShow),
+			new DashFragmentData(DashOsmEditsFragment.TAG, DashOsmEditsFragment.class, "OsmEdits", defaultShouldShow),
 			new DashFragmentData(DashPluginsFragment.TAG, DashPluginsFragment.class, "Plugins", defaultShouldShow),
-			new DashFragmentData(DashSimulateFragment.TAG, DashSimulateFragment.class, "Simulate",
-					simulateShouldShow, new CanHideIfPluginEnabled(OsmandDevelopmentPlugin.class)),
+			new DashFragmentData(DashSimulateFragment.TAG, DashSimulateFragment.class, "Simulate", simulateShouldShow),
 	};
 
 	private MapActivity mapActivity;
@@ -1001,24 +986,4 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
 					&& super.shouldShow(settings, activity, tag);
 		}
 	}
-
-	private static class CanNotHideFunction implements DashFragmentData.CanHideFunction {
-		@Override
-		public boolean canHide() {
-			return false;
-		}
-	}
-
-	private static class CanHideIfPluginEnabled implements DashFragmentData.CanHideFunction {
-		private final Class<? extends  OsmandPlugin> pluginClass;
-
-		public CanHideIfPluginEnabled(Class<? extends OsmandPlugin> pluginClass) {
-			this.pluginClass = pluginClass;
-		}
-
-		@Override
-		public boolean canHide() {
-			return OsmandPlugin.getEnabledPlugin(pluginClass) != null;
-		}
-	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/tools/DashFragmentData.java b/OsmAnd/src/net/osmand/plus/dashboard/tools/DashFragmentData.java
index 7964d671a7..84224b332f 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/tools/DashFragmentData.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/tools/DashFragmentData.java
@@ -9,16 +9,16 @@ public final class DashFragmentData {
 	public final Class<? extends DashBaseFragment> fragmentClass;
 	public final String title;
 	public final ShouldShowFunction shouldShowFunction;
-	public final CanHideFunction canHideFunction;
+	public final boolean customDeletionLogic;
 
 	public DashFragmentData(String tag, Class<? extends DashBaseFragment> fragmentClass,
 							String title, ShouldShowFunction shouldShowFunction,
-							CanHideFunction canHideFunction) {
+							boolean customDeletionLogic) {
 		this.tag = tag;
 		this.fragmentClass = fragmentClass;
 		this.title = title;
 		this.shouldShowFunction = shouldShowFunction;
-		this.canHideFunction = canHideFunction;
+		this.customDeletionLogic = customDeletionLogic;
 	}
 
 	public DashFragmentData(String tag, Class<? extends DashBaseFragment> fragmentClass,
@@ -27,14 +27,10 @@ public final class DashFragmentData {
 		this.fragmentClass = fragmentClass;
 		this.title = title;
 		this.shouldShowFunction = shouldShowFunction;
-		this.canHideFunction = null;
+		customDeletionLogic = false;
 	}
 
 	public interface ShouldShowFunction {
 		boolean shouldShow(OsmandSettings settings, MapActivity activity, String tag);
 	}
-
-	public interface CanHideFunction {
-		boolean canHide();
-	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
index a93700ed9b..7df0fc7d90 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
@@ -34,8 +34,7 @@ public class DashboardSettingsDialogFragment extends DialogFragment {
 		mapActivity = (MapActivity) activity;
 		ArrayList<DashFragmentData> fragmentsList = new ArrayList<>();
 		for(DashFragmentData fragmentData : mapActivity.getDashboard().getFragmentsData()) {
-			if (fragmentData.canHideFunction == null || fragmentData.canHideFunction.canHide())
-				fragmentsList.add(fragmentData);
+			if (!fragmentData.customDeletionLogic) fragmentsList.add(fragmentData);
 		}
 		fragmentsData = fragmentsList.toArray(new DashFragmentData[fragmentsList.size()]);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIDialogProvider.java b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIDialogProvider.java
index 82c9e40d31..3ba7302529 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIDialogProvider.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIDialogProvider.java
@@ -6,11 +6,14 @@ import android.app.AlertDialog.Builder;
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.res.Resources;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.text.method.LinkMovementMethod;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -391,15 +394,15 @@ public class EditingPOIDialogProvider implements DialogProvider {
 		closeChange.setVisibility(isLocalEdit ? View.GONE : View.VISIBLE);
 
 
-//		TextView linkToOsmDoc = (TextView) view.findViewById(R.id.LinkToOsmDoc);
-//		linkToOsmDoc.setOnClickListener(new View.OnClickListener() {
-//
-//			@Override
-//			public void onClick(View v) {
-//				activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://wiki.openstreetmap.org/wiki/Map_Features")));
-//			}
-//		});
-//		linkToOsmDoc.setMovementMethod(LinkMovementMethod.getInstance());
+		TextView linkToOsmDoc = (TextView) view.findViewById(R.id.LinkToOsmDoc);
+		linkToOsmDoc.setOnClickListener(new View.OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://wiki.openstreetmap.org/wiki/Map_Features")));
+			}
+		});
+		linkToOsmDoc.setMovementMethod(LinkMovementMethod.getInstance());
 
 		final Amenity amenity = (Amenity) args.getSerializable(KEY_AMENITY);
 		final Node node = (Node) args.getSerializable(KEY_AMENITY_NODE);
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
index 387ef47950..dbbdd5820f 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
@@ -69,7 +69,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
 
 	private OsmBugsLayer osmBugsLayer;
 	private OsmEditsLayer osmEditsLayer;
-//	private EditingPOIDialogProvider poiActions;
+	private EditingPOIDialogProvider poiActions;
 
 	@Override
 	public void updateLayers(OsmandMapTileView mapView, MapActivity activity) {
@@ -120,8 +120,8 @@ public class OsmEditingPlugin extends OsmandPlugin {
 	@Override
 	public void mapActivityCreate(MapActivity activity) {
 		// Always create new actions !
-//		poiActions = new EditingPOIDialogProvider(activity, this);
-//		activity.addDialogProvider(getPoiActions(activity));
+		poiActions = new EditingPOIDialogProvider(activity, this);
+		activity.addDialogProvider(getPoiActions(activity));
 		activity.addDialogProvider(getBugsLayer(activity));
 	}
 
@@ -131,12 +131,12 @@ public class OsmEditingPlugin extends OsmandPlugin {
 		return SettingsOsmEditingActivity.class;
 	}
 
-//	public EditingPOIDialogProvider getPoiActions(MapActivity activity) {
-//		if (poiActions == null) {
-//			poiActions = new EditingPOIDialogProvider(activity, this);
-//		}
-//		return poiActions;
-//	}
+	public EditingPOIDialogProvider getPoiActions(MapActivity activity) {
+		if (poiActions == null) {
+			poiActions = new EditingPOIDialogProvider(activity, this);
+		}
+		return poiActions;
+	}
 
 	@Override
 	public void registerMapContextMenuActions(final MapActivity mapActivity,
@@ -149,11 +149,8 @@ public class OsmEditingPlugin extends OsmandPlugin {
 			public boolean onContextMenuClick(ArrayAdapter<?> adapter, int resId, int pos, boolean isChecked) {
 				if (resId == R.string.context_menu_item_create_poi) {
 					//getPoiActions(mapActivity).showCreateDialog(latitude, longitude);
-					EditPoiFragment editPoiFragment =
-							EditPoiFragment.createAddPoiInstance(latitude, longitude,
-									mapActivity.getMyApplication());
 					mapActivity.getSupportFragmentManager().beginTransaction()
-							.add(R.id.fragmentContainer, editPoiFragment, EditPoiFragment.TAG)
+							.add(R.id.fragmentContainer, new EditPoiFragment(), EditPoiFragment.TAG)
 							.addToBackStack(null)
 							.commit();
 				} else if (resId == R.string.context_menu_item_open_bug) {
@@ -162,11 +159,9 @@ public class OsmEditingPlugin extends OsmandPlugin {
 					}
 					osmBugsLayer.openBug(latitude, longitude);
 				} else if (resId == R.string.poi_context_menu_delete) {
-					// TODO implement delete
-//					getPoiActions(mapActivity).showDeleteDialog((Amenity) selectedObj);
+					getPoiActions(mapActivity).showDeleteDialog((Amenity) selectedObj);
 				} else if (resId == R.string.poi_context_menu_modify) {
-					// TODO implement edit
-//					getPoiActions(mapActivity).showEditDialog((Amenity) selectedObj);
+					getPoiActions(mapActivity).showEditDialog((Amenity) selectedObj);
 				}
 				return true;
 			}
diff --git a/eclipse-compile/cardview/.classpath b/eclipse-compile/cardview/.classpath
new file mode 100644
index 0000000000..92ab9b2c93
--- /dev/null
+++ b/eclipse-compile/cardview/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/eclipse-compile/cardview/.gitignore b/eclipse-compile/cardview/.gitignore
new file mode 100644
index 0000000000..cb2011b87e
--- /dev/null
+++ b/eclipse-compile/cardview/.gitignore
@@ -0,0 +1,4 @@
+/bin
+/gen
+/R
+/classes
diff --git a/eclipse-compile/cardview/.project b/eclipse-compile/cardview/.project
new file mode 100644
index 0000000000..105072983e
--- /dev/null
+++ b/eclipse-compile/cardview/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android-cardview</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse-compile/cardview/AndroidManifest.xml b/eclipse-compile/cardview/AndroidManifest.xml
new file mode 120000
index 0000000000..ca5aa004cc
--- /dev/null
+++ b/eclipse-compile/cardview/AndroidManifest.xml
@@ -0,0 +1 @@
+src/main/AndroidManifest.xml
\ No newline at end of file
diff --git a/cardview/build.gradle b/eclipse-compile/cardview/build.gradle
similarity index 100%
rename from cardview/build.gradle
rename to eclipse-compile/cardview/build.gradle
diff --git a/cardview/libs/android-support-v7-cardview.jar b/eclipse-compile/cardview/libs/android-support-v7-cardview.jar
similarity index 100%
rename from cardview/libs/android-support-v7-cardview.jar
rename to eclipse-compile/cardview/libs/android-support-v7-cardview.jar
diff --git a/eclipse-compile/cardview/project.properties b/eclipse-compile/cardview/project.properties
new file mode 100644
index 0000000000..17e2d080fd
--- /dev/null
+++ b/eclipse-compile/cardview/project.properties
@@ -0,0 +1,16 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-21
+android.library=true
+android.library.reference.1=../appcompat
diff --git a/eclipse-compile/cardview/res b/eclipse-compile/cardview/res
new file mode 120000
index 0000000000..c378ac05d9
--- /dev/null
+++ b/eclipse-compile/cardview/res
@@ -0,0 +1 @@
+src/main/res
\ No newline at end of file
diff --git a/cardview/src/main/AndroidManifest.xml b/eclipse-compile/cardview/src/main/AndroidManifest.xml
similarity index 100%
rename from cardview/src/main/AndroidManifest.xml
rename to eclipse-compile/cardview/src/main/AndroidManifest.xml
diff --git a/cardview/src/main/res/values/attrs.xml b/eclipse-compile/cardview/src/main/res/values/attrs.xml
similarity index 100%
rename from cardview/src/main/res/values/attrs.xml
rename to eclipse-compile/cardview/src/main/res/values/attrs.xml
diff --git a/cardview/src/main/res/values/colors.xml b/eclipse-compile/cardview/src/main/res/values/colors.xml
similarity index 100%
rename from cardview/src/main/res/values/colors.xml
rename to eclipse-compile/cardview/src/main/res/values/colors.xml
diff --git a/cardview/src/main/res/values/dimens.xml b/eclipse-compile/cardview/src/main/res/values/dimens.xml
similarity index 100%
rename from cardview/src/main/res/values/dimens.xml
rename to eclipse-compile/cardview/src/main/res/values/dimens.xml
diff --git a/cardview/src/main/res/values/styles.xml b/eclipse-compile/cardview/src/main/res/values/styles.xml
similarity index 100%
rename from cardview/src/main/res/values/styles.xml
rename to eclipse-compile/cardview/src/main/res/values/styles.xml
diff --git a/cardview/src/main/resources/.readme b/eclipse-compile/cardview/src/main/resources/.readme
similarity index 100%
rename from cardview/src/main/resources/.readme
rename to eclipse-compile/cardview/src/main/resources/.readme
diff --git a/eclipse-compile/design/.classpath b/eclipse-compile/design/.classpath
index bb77a7f28f..92ab9b2c93 100644
--- a/eclipse-compile/design/.classpath
+++ b/eclipse-compile/design/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/androidTest/java"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
diff --git a/eclipse-compile/design/.gitignore b/eclipse-compile/design/.gitignore
index 455a9fb758..d94c11bf1b 100644
--- a/eclipse-compile/design/.gitignore
+++ b/eclipse-compile/design/.gitignore
@@ -1,3 +1,4 @@
 /build
 /R
 /bin
+/gen
diff --git a/eclipse-compile/design/bin/AndroidManifest.xml b/eclipse-compile/design/bin/AndroidManifest.xml
deleted file mode 100644
index 012c7bf894..0000000000
--- a/eclipse-compile/design/bin/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.support.design">
-    <uses-sdk android:minSdkVersion="7"/>
-    <application/>
-</manifest>
diff --git a/eclipse-compile/design/bin/jarlist.cache b/eclipse-compile/design/bin/jarlist.cache
deleted file mode 100644
index 0565465f22..0000000000
--- a/eclipse-compile/design/bin/jarlist.cache
+++ /dev/null
@@ -1,3 +0,0 @@
-# cache for current jar dependency. DO NOT EDIT.
-# format is <lastModified> <length> <SHA-1> <path>
-# Encoding is UTF-8
diff --git a/eclipse-compile/design/gen/.gitignore b/eclipse-compile/design/gen/.gitignore
deleted file mode 100644
index 3015774bfa..0000000000
--- a/eclipse-compile/design/gen/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/android/
diff --git a/eclipse-compile/design/gen/android/support/design/BuildConfig.java b/eclipse-compile/design/gen/android/support/design/BuildConfig.java
deleted file mode 100644
index 454f6da7a2..0000000000
--- a/eclipse-compile/design/gen/android/support/design/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package android.support.design;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/recyclerview/.gitignore b/eclipse-compile/recyclerview/.gitignore
similarity index 100%
rename from recyclerview/.gitignore
rename to eclipse-compile/recyclerview/.gitignore
diff --git a/recyclerview/build.gradle b/eclipse-compile/recyclerview/build.gradle
similarity index 100%
rename from recyclerview/build.gradle
rename to eclipse-compile/recyclerview/build.gradle
diff --git a/settings.gradle b/settings.gradle
index 7c72cf7a1a..1472966a6f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,8 @@
-include ':OsmAnd-java', ':eclipse-compile:design', ':recyclerview', ":cardview"
-include ':OsmAnd'
+include ':OsmAnd-java'
+include ':eclipse-compile:cardview'
+include ':eclipse-compile:design'
 include ':eclipse-compile:appcompat'
+include ':OsmAnd'
 include ':plugins:OsmAnd-AddressPlugin'
 include ':plugins:Osmand-ParkingPlugin'
 include ':plugins:Osmand-Sherpafy'