Merge remote-tracking branch 'origin/master'

# Conflicts:
#	flowlayoutmanager/src/main/java/com/xiaofeng/flowlayoutmanager/FlowLayoutManager.java

Author: simonebortolin

flowlayoutmanager/build.gradle

@@ -12,6 +12,10 @@ project.ext {
     siteUrl = 'https://github.com/xiaofeng-han/AndroidLibs'
 }
 
+repositories {
+    jcenter()
+}
+
 group = 'com.xiaofeng.android'
 version = libVersion
 
@@ -35,9 +39,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    dexOptions {
-        incremental true
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -51,7 +52,13 @@ dependencies {
     compile(group: 'com.android.support', name: 'recyclerview-v7', version: supportLibVersion)
     androidTestCompile 'com.android.support:support-annotations:26.1.0'
     androidTestCompile 'com.android.support.test:runner:1.0.1'
+
 }
 
 Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.10'
+}