project properties is missing for command line compile
Merge branch 'master' of https://github.com/Mavproxyuser/NoTauLabsNag
Revert "add TauLabs fix to Retry firmware IAP until success"

This reverts commit bb5a66aa80b55596c8e205edbf858339c8840e75.

Conflicts:
	androidgcs/src/org/openpilot_nonag/uavtalk/Telemetry.java