Update the changelog for version 4.0

Android/build.gradle

@@ -21,10 +21,10 @@ dependencies {
     compile 'com.github.gabrielemariotti.changeloglib:changelog:2.0.0'
 
     //DroneKit-Android client lib
-//    compile 'com.o3dr.android:dronekit-android:3.0.0-alpha7'
+    compile 'com.o3dr.android:dronekit-android:3.0.0-beta1'
     //Comment line above, and uncomment line below to use your local version of the dronekit-android client lib
     //Don't forget to uncomment the lines in the settings.gradle file as well.
-     compile project(':ClientLib')
+//     compile project(':ClientLib')
 
     compile 'me.grantland:autofittextview:0.2.1'
     compile(name:'shimmer-android-release', ext:'aar')

Android/res/raw/changelog.xml

@@ -8,9 +8,26 @@
         chg:changeLogFileResourceId="@raw/custom_changelog"
         in your View component in layout file -->
 
-    <changelogversion versionName="4.0.0" changeDate="May 19, 2016">
+    <changelogversion versionName="4.0.0" changeDate="August 21, 2016">
         <changelogimprovement>Introducing [b]standalone[/b] mode - Tower can now be used without 3DR Services</changelogimprovement>
+        <changelogimprovement>Add support for Baidu Map</changelogimprovement>
+        <changelogimprovement>Add support for compass calibration for Solo and ArduCopter v3.4 or higher</changelogimprovement>
+        <changelogimprovement>Add an improved version of the vehicle history</changelogimprovement>
+        <changelogimprovement>Add ability to export the vehicle flight path as a mission</changelogimprovement>
+        <changelogimprovement>Add ability to export the vehicle flight history as a mission</changelogimprovement>
         <changelogimprovement>Add weather widget</changelogimprovement>
+        <changelogimprovement>Deprecated '.dpwp' mission file for '.txt' mission file to improve compatibility with other GCS</changelogimprovement>
+        <changelogimprovment>Add ability to lock the copter yaw during a survey mission</changelogimprovment>
+        <changelogimprovment>Add ability to start camera trigger after the first waypoint in a survey mission</changelogimprovment>
+
+        <changelogtext>Fix mission waypoint reordering</changelogtext>
+        <changelogtext>Save automatically last (spline) survey preferences</changelogtext>
+        <changelogtext>Fix invalid altitude frame for Follow-Me and Guided mode</changelogtext>
+        <changelogtext>Fix parameters editing for plane vehicles</changelogtext>
+        <changelogtext>Fix Takeoff mission waypoint for plane vehicles</changelogtext>
+        <changelogtext>Improve mission length calculation</changelogtext>
+
+        <changelogtext>Improve portuguese translation</changelogtext>
     </changelogversion>
 
     <!--<changelogversion versionName="3.2.1" changeDate="May 12,2016">-->

settings.gradle

@@ -3,11 +3,12 @@ include ':Android'
 
 //Uncomment block below to link to your local version of the dronekit-android client lib.
 //Don't forget to uncomment the lines in the Android/build.gradle file as well.
-
+/*
 //Linking to the dronekit-android project to improve development flow
 include ':ClientLib'
 include ':Mavlink'
 
 def dkAndroidLibPath = '../dronekit-android' //Edit this value to point to your 'dronekit-android' project directory
 project(':ClientLib').projectDir = new File("$dkAndroidLibPath/ClientLib")
 project(':Mavlink').projectDir = new File("$dkAndroidLibPath/dependencyLibs/Mavlink")
+*/