Merge branch 'master' into release

Conflicts:
	DroidPlanner/src/org/droidplanner/activities/ConfigurationActivity.java
	DroidPlanner/src/org/droidplanner/activities/helpers/HelpActivity.java

Author: arthurbenemann

ChangeLog.md

@@ -1,4 +1,28 @@
+## Droidplanner v2.0.1
+* Cleaning minor bugs (#581)
+* Fixed typo errors(#589)
+* Improved Radio setup (#593,#596)
+* Removing unused assets (#594,#601)
+* Small mavlink library fix (#585)
+* Improved Guided mode (#595)
+* Rescrict disctribution to tablets only (#597)
+* Dialog for BlueTooth device selection(#598)
+* Fixed typos on source-code (#605)
+
 ## Droidplanner v2.0.0
+* Renamed package to org.droidplanner
+* Redesing of the mission handling code
+* Completely redesigned graphical user interface
+* Easy to use Home, Land, and Loiter buttons
+* New Artificial Horizon
+* Added telemetry to the ActionBar
+* Mode detail fragment
+* New guided mode with changeable altitude
+* New planning screen for quick mission generation
+* Easy and powerful mission editing tools
+* New mission listing fragment
+* Drone Setup screen with multiple tabs like:Radio,Checklist,Parameters
+* Improved BlueTooth Connection
 
 ## Droidplanner v1.2.0
 * Planning: renamed column header - #348
@@ -28,7 +52,7 @@
 * Reduce the chance of unintentionally deleting waypoints while scrolling
 
 ## Droidplanner v1.0.0
-* No new changes to the codebase, just setting a milestone 
+* No new changes to the codebase, just setting a milestone
 
 ## Droidplanner v0.16.0
 * Bluetooth Support
@@ -104,7 +128,7 @@
 ## Droidplanner v0.11.0
 * New Chart screen
 * HUD code clean-up
-* Activitys clean-up
+* Activities clean-up
 * All markers are using the markerManager
 * Colorful markers in the planning screen
 

DroidPlanner/AndroidManifest.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.droidplanner"
-          android:versionCode="56"
+          android:versionCode="57"
           android:versionName="please run version.sh to get the version name">
 
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="18" />
 
+    <supports-screens
+        android:requiresSmallestWidthDp="540"/>
+
     <permission
         android:name=".permission.MAPS_RECEIVE"
         android:protectionLevel="signature" />
@@ -69,9 +72,9 @@
 
         <service android:name=".service.MAVLinkService" >
         </service>
-	
+
 		<activity
-		    android:name=".activitys.FlightActivity"
+		    android:name=".activities.FlightActivity"
 		    android:launchMode="singleTask" >
 
             <!-- Launcher Intent -->
@@ -91,14 +94,14 @@
                 android:resource="@xml/device_filter" />
         </activity>
         <activity
-            android:name=".activitys.EditorActivity"
+            android:name=".activities.EditorActivity"
             android:label="@string/editor"
-            android:parentActivityName=".activitys.FlightActivity" >
+            android:parentActivityName=".activities.FlightActivity" >
 
             <!-- Parent activity meta-data to support API level 7+ -->
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activitys.FlightActivity" />
+                android:value=".activities.FlightActivity" />
 
             <!-- Intent for opening mission files -->
             <intent-filter>
@@ -110,26 +113,26 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activitys.ConfigurationActivity"
+            android:name=".activities.ConfigurationActivity"
             android:windowSoftInputMode="adjustPan"
             android:theme="@style/Theme.PageIndicatorDefaults"
-            android:label="@string/configuration"
-            android:parentActivityName=".activitys.FlightActivity" >
+            android:label="@string/menu_drone_setup"
+            android:parentActivityName=".activities.FlightActivity" >
 
             <!-- Parent activity meta-data to support API level 7+ -->
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activitys.FlightActivity" />
+                android:value=".activities.FlightActivity" />
         </activity>
-        <activity android:name=".activitys.SettingsActivity"
+        <activity android:name=".activities.SettingsActivity"
                   android:label="@string/settings"
-                  android:parentActivityName=".activitys.FlightActivity">
+                  android:parentActivityName=".activities.FlightActivity">
 
             <!-- Parent activity meta-data to support API level 7+ -->
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activitys.FlightActivity" />
+                android:value=".activities.FlightActivity" />
         </activity>
     </application>
 
-</manifest>
+</manifest>