Merge branch 'master' of https://github.com/DroidPlanner/droidplanner into glass

Conflicts:
	Android/src/org/droidplanner/android/communication/connection/MAVLinkConnection.java
	Android/src/org/droidplanner/android/communication/service/MAVLinkService.java
	Android/src/org/droidplanner/android/utils/Constants.java
	Android/src/org/droidplanner/android/utils/DroidplannerPrefs.java
	gradle/wrapper/gradle-wrapper.properties