Menu options
Merge branch 'master' of https://github.com/Mavproxyuser/NoTauLabsNag

Conflicts:
	androidgcs-release.apk
Merge branch 'master' of https://github.com/Mavproxyuser/NoTauLabsNag