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

Conflicts:
	Android/project.properties
	Android/res/drawable-hdpi/ic_loiter.png
	Android/res/drawable-hdpi/ic_pause.png
	Android/res/drawable-mdpi/ic_loiter.png
	Android/res/drawable-mdpi/ic_pause.png
	Android/res/drawable-xhdpi/.DS_Store
	Android/res/drawable-xhdpi/ic_loiter.png
	Android/res/drawable-xhdpi/ic_pause.png
	Android/res/drawable/ic_action_quad.xml
	Android/res/drawable/ic_navigate.xml
	Android/src/org/droidplanner/android/maps/providers/google_map/GoogleMapFragment.java
	Android/src/org/droidplanner/android/notifications/EmergencyBeepNotificationProvider.java
	AndroidLib/res/drawable-hdpi/ic_action_quad_connected.png
	AndroidLib/res/drawable-hdpi/ic_action_quad_disconnect.png
	AndroidLib/res/drawable-hdpi/ic_loiter.png
	AndroidLib/res/drawable-land/mission_control_bg.xml
	AndroidLib/res/drawable-mdpi/ic_action_quad_connected.png
	AndroidLib/res/drawable-mdpi/ic_action_quad_disconnect.png
	AndroidLib/res/drawable-mdpi/ic_loiter.png
	AndroidLib/res/drawable-port/mission_control_bg.xml
	AndroidLib/res/drawable-sw540dp/mission_control_bg.xml
	AndroidLib/res/drawable-xhdpi/ic_action_quad_connected.png
	AndroidLib/res/drawable-xhdpi/ic_action_quad_disconnect.png
	AndroidLib/res/drawable-xhdpi/ic_loiter.png
	AndroidLib/res/drawable-xxhdpi/ic_action_quad_connected.png
	AndroidLib/res/drawable-xxhdpi/ic_action_quad_disconnect.png
	AndroidLib/res/drawable/flight_control_button_selector.xml
	AndroidLib/res/drawable/ic_action_quad.xml