Merge branch 'master' of https://github.com/bendikv/flowlayoutmanager into bendikv-master

# Conflicts:
#	build.gradle

Author: simonebortolin

.idea/.name

@@ -17,9 +17,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    dexOptions {
-        incremental true
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -33,7 +30,9 @@ dependencies {
     compile(group: 'com.android.support', name: 'appcompat-v7', version: supportLibVersion)
     compile(group: 'com.android.support', name: 'recyclerview-v7', version: supportLibVersion)
     compile(group: 'com.android.support', name: 'recyclerview-v7', version: supportLibVersion)
-    compile 'com.xiaofeng.android:flowlayoutmanager:1.2.3.2'
+
+    compile project(":flowlayoutmanager")
+
     compile 'us.feras.mdv:markdownview:1.1.0'
     compile 'com.android.support:support-v4:26.1.0'
 }

.idea/gradle.xml

@@ -28,7 +28,7 @@ subprojects {
     ext.playServiceVersion = "8.4.0"
     ext.androidBuildToolVersion = "26.0.2"
     ext.androidCompileSdkVersion = 26
-    ext.androidMinSdkVersion = 16
+    ext.androidMinSdkVersion = 15
     ext.androidTargetSdkVersion = 26
 }