Merge pull request #28 from Ktar5/master

build.gradle

@@ -80,7 +80,11 @@ project(":core") {
     apply plugin: "java"
 
     dependencies {
-        compile 'com.github.anuken:ucore:7938cb4bf9'
+        if(new File('../uCore-master').exists()){
+            compile project(":uCore")
+        }else{
+            compile 'com.github.anuken:ucore:7938cb4bf9'
+        }
         compile "com.badlogicgames.gdx:gdx:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx-ai:1.8.1"
     }

settings.gradle

@@ -1 +1,6 @@
 include 'desktop', 'html', 'core', 'android'
+
+if (new File(settingsDir, '../uCore-master').exists()) {
+    include ':uCore'
+    project(':uCore').projectDir = new File(settingsDir, '../uCore-master')
+}