Merge branch 'master' into beta

Author: arthurbenemann

Android/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
           package="org.droidplanner"
-          android:versionCode="98"
+          android:versionCode="99"
           android:versionName="please run version.sh to get the version name">
 
     <uses-sdk
@@ -102,7 +102,8 @@
             android:label="@string/editor"
             android:launchMode="singleTop"
             android:theme="@style/CustomActionBarTheme.Transparent"
-            android:parentActivityName=".android.activities.FlightActivity" >
+            android:parentActivityName=".android.activities.FlightActivity"
+            android:windowSoftInputMode="adjustNothing">
 
             <!-- Parent activity meta-data to support API level 7+ -->
             <meta-data

Android/build.gradle

@@ -8,7 +8,6 @@ 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.google.guava:guava:17.0'
 
     compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:0.4.0@aar'){
         transitive=true