Merge branch 'master' of https://github.com/osmandapp/Osmand

OsmAnd/build.gradle

@@ -294,8 +294,8 @@ repositories {
 }
 
 dependencies {
-    compile project(path: ":eclipse-compile:appcompat", configuration: "android")
 	compile project(path: ":OsmAnd-java", configuration: "android")
+    compile project(":eclipse-compile:appcompat")
 	compile fileTree(
 			dir: "libs",
 			include: ["*.jar"],

OsmAnd/project.properties

@@ -15,4 +15,3 @@ dex.force.jumbo=true
 android.library.reference.1=../eclipse-compile/appcompat
 android.library.reference.2=../eclipse-compile/observable
 android.library.reference.2=../eclipse-compile/observable
-android.library.reference.3=../eclipse-compile/fab

OsmAnd/res/layout/osmo_create_group.xml

@@ -30,7 +30,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="@string/osmo_grop_name_length_alert"
-			android:textColor="@color/fab_material_red_500"/>
+			android:textColor="@color/osmbug_closed"/>
 
 		<TextView
 			android:layout_width="wrap_content"

eclipse-compile/appcompat/build.gradle

@@ -0,0 +1,26 @@
+apply plugin: 'com.android.library'
+dependencies {
+    compile files('libs/android-support-v4.jar')
+}
+
+android {
+	compileSdkVersion 21
+	buildToolsVersion "21.1.2"
+
+	defaultConfig {
+		minSdkVersion 9
+		targetSdkVersion 21
+	}
+	sourceSets {
+		main {
+			manifest.srcFile "AndroidManifest.xml"
+			aidl.srcDirs = ["src"]
+			java.srcDirs = ["src"]
+			resources.srcDirs = ["src"]
+			renderscript.srcDirs = ["src"]
+			res.srcDirs = ["res"]
+			assets.srcDirs = ["assets"]
+		}
+	}
+
+}

settings.gradle

@@ -1,5 +1,6 @@
 include ':OsmAnd-java'
 include ':OsmAnd'
+include ':eclipse-compile:appcompat'
 include ':plugins:OsmAnd-AddressPlugin'
 include ':plugins:Osmand-ParkingPlugin'
 include ':plugins:Osmand-Sherpafy'