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

Conflicts:
	Android/AndroidManifest.xml
	Android/res/xml/preferences.xml
	Android/src/org/droidplanner/android/activities/helpers/SuperUI.java
	Android/src/org/droidplanner/android/communication/connection/MAVLinkConnection.java
	Android/src/org/droidplanner/android/fragments/SettingsFragment.java
	Android/src/org/droidplanner/android/utils/Utils.java