Merge branch 'master' of github.com:AriaLyy/Aria

Aria/build.gradle

@@ -26,8 +26,8 @@ dependencies {
   testCompile 'junit:junit:4.12'
   compile 'com.android.support:appcompat-v7:23.1.1'
   compile project(':AriaAnnotations')
-  compile 'com.arialyy.aria:aria-ftp-plug:1.0.4'
+//  compile 'com.arialyy.aria:aria-ftp-plug:1.0.4'
 
-//    compile project(':AriaFtpPlug')
+    compile project(':AriaFtpPlug')
 }
 apply from: 'bintray-release.gradle'

app/src/main/AndroidManifest.xml

@@ -20,7 +20,7 @@
     <!--android:name=".download.group.DownloadGroupActivity"-->
           <!--android:name=".MainActivity"-->
     <activity
-          android:name=".download.SingleTaskActivity"
+          android:name=".upload.FtpUploadActivity"
         android:label="@string/app_name">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>