Merge branch 'master' into beta

Conflicts:
	Android/AndroidManifest.xml
	Android/res/layout/activity_drawer_navigation_ui.xml
	Android/res/layout/fragment_mode_circle.xml

Author: arthurbenemann

.gitignore

@@ -28,3 +28,9 @@ proguard/
 #Android Studio files
 *.iml
 .idea/
+
+# Eclipse files
+.metadata
+
+# Mac OSX files
+.DS_Store

.travis.yml

@@ -8,8 +8,8 @@ android:
 
 before_script:
     - echo yes | android update sdk -u -a -t tools
-    - echo yes | android update sdk -u -a -t build-tools-20.0.0,build-tools-19.1.0
-    - echo yes | android update sdk -u -a -t android-20,android-19
+    - echo yes | android update sdk -u -a -t build-tools-21.0.1,build-tools-20.0.0,build-tools-19.1.0
+    - echo yes | android update sdk -u -a -t android-21,android-20,android-19
     - echo yes | android update sdk -u -a -t extra-google-m2repository
     - echo yes | android update sdk -u -a -t extra-android-m2repository
     - echo yes | android update sdk -u -a -t extra-android-support,extra-google-google_play_services

Android/.classpath

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="src" path="/Core"/>
-	<classpathentry exported="true" kind="src" path="/Mavlink"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>

Android/AndroidManifest.xml

@@ -2,12 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
           package="org.droidplanner"
-          android:versionCode="104"
+          android:versionCode="105"
           android:versionName="please run version.sh to get the version name">
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
     <supports-screens
         android:requiresSmallestWidthDp="320"/>
@@ -134,6 +134,12 @@
                 android:value=".android.activities.SettingsActivity"/>
         </activity>
 
+        <activity
+                    android:name=".android.activities.LocatorActivity"
+                    android:label="@string/locator"
+                    android:launchMode="singleTop"
+                    android:theme="@style/CustomActionBarTheme.Transparent"          />
+
         <receiver android:name=".android.communication.service.NetworkConnectivityReceiver"
             android:enabled="false">
             <intent-filter>

Android/assets/CameraInfo/GoPro Hero 4 Black.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cameraInfo>
+    <Name>GoPro Hero 4 Black</Name>
+    <SensorWidth>6.17</SensorWidth>
+    <SensorHeight>4.55</SensorHeight>
+    <SensorResolution>12.0</SensorResolution>
+    <FocalLength>14</FocalLength>
+</cameraInfo>

Android/build.gradle

@@ -5,7 +5,6 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:20.0.0'
     compile files('libs/droneapi-java.jar')
     compile 'com.google.android.gms:play-services:5.0.89'
     compile 'com.sothree.slidinguppanel:library:2.0.2'
@@ -17,25 +16,29 @@ dependencies {
         transitive=true
     }
 
+    compile 'com.android.support:support-v4:20.0.0'
+
+    compile project(':Core')
+    compile project(':Mavlink')
+    compile project(':Libraries:HorizontalVariableListView:HorizontalVariableListView')
+
     compile files('libs/usbseriallibrary.jar')
     compile files('libs/j2xx.jar')
     compile files('libs/protobuf-java-2.5.0.jar')
     compile files('libs/jeromq-0.3.4.jar')
 
-    compile project(':Core')
-    compile project(':Mavlink')
-    compile project(':Libraries:HorizontalVariableListView:HorizontalVariableListView')
     compile project(':Libraries:PebbleKit')
     compile project(':Libraries:usb-serial-for-android:UsbSerialLibrary')
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion 21
+    buildToolsVersion "21.0.1"
 
     defaultConfig {
+        applicationId 'org.droidplanner'
         minSdkVersion 14
-        targetSdkVersion 19
+        targetSdkVersion 21
         versionName getGitVersion()
     }
 

Android/libs/droneapi-java.jar

@@ -11,12 +11,13 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-21
 android.library.reference.1=../Libraries/usb-serial-for-android/UsbSerialLibrary
 android.library.reference.2=../Libraries/HorizontalVariableListView/HorizontalVariableListView
-android.library.reference.3=../Mavlink
-android.library.reference.4=../Core
-android.library.reference.5=../Libraries/google-play-services_lib
-android.library.reference.6=../Libraries/PebbleKit
-android.library.reference.7=../Libraries/mapbox-android-sdk/0.4.0
-android.library.reference.8=../Libraries/AndroidSlidingUpPanel-2.0.2/library
+android.library.reference.3=../Libraries/google-play-services_lib
+android.library.reference.4=../Libraries/PebbleKit
+android.library.reference.5=../Libraries/mapbox-android-sdk/0.4.0
+android.library.reference.6=../Libraries/AndroidSlidingUpPanel-2.0.2/library
+android.library.reference.7=../Libraries/EllipsoidFit/EllipsoidFit
+android.library.reference.8=../Mavlink
+android.library.reference.9=../Core