Merge branch 'master' into release

Conflicts:
	Android/AndroidManifest.xml

Author: arthurbenemann

Android/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.droidplanner"
-          android:versionCode="74"
+          android:versionCode="75"
           android:versionName="please run version.sh to get the version name">
 
     <uses-sdk
@@ -72,6 +72,8 @@
         <service android:name=".android.communication.service.MAVLinkService" >
         </service>
 
+        <service android:name=".android.communication.service.UploaderService" />
+
 		<activity
 		    android:name=".android.activities.FlightActivity"
 		    android:launchMode="singleTask" >

Android/build.gradle

@@ -4,6 +4,7 @@ dependencies {
     compile 'com.android.support:support-v4:19.+'
     compile files('libs/droneapi-java-0.1-SNAPSHOT.jar')
     compile files('libs/protobuf-java-2.5.0.jar')
+    compile files('libs/jeromq-0.3.4.jar')
 
     compile project(':Core')
     compile files('libs/usbseriallibrary.jar')